Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[docs+fmt] fix-up doc warnings (from CI) and set rustfmt edition #749

Merged
merged 2 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions crates/rgb-frame/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ impl Frame {
/// contents initalized via the `populate` function.
///
/// The responsibility is left to the caller to properly initalize the
/// entire [MaybeUninit<u8>] slice provided to the `populate` argument. The
/// entire [`MaybeUninit<u8>`] slice provided to the `populate` argument. The
/// stride length of that buffer is provided as the second argument.
pub fn new_uninit<F>(spec: Spec, populate: F) -> Self
where
Expand Down Expand Up @@ -154,22 +154,22 @@ impl Frame {
#[repr(u32)]
#[strum(serialize_all = "UPPERCASE")]
pub enum FourCC {
/// x:R:G:B [31:0] little endian
/// x:R:G:B `\[` 31:0 `\]` little endian
XR24 = 0x34325258,
/// R:G:B:x [31:0] little endian
/// R:G:B:x `\[` 31:0 `\]` little endian
RX24 = 0x34325852,
/// x:B:G:R [31:0] little endian
/// x:B:G:R `\[` 31:0 `\]` little endian
XB24 = 0x34325842,
/// B:G:R:x [31:0] little endian
/// B:G:R:x `\[` 31:0 `\]` little endian
BX24 = 0x34324258,

/// A:R:G:B [31:0] little endian
/// A:R:G:B `\[` 31:0 `\]` little endian
AR24 = 0x34325241,
/// R:G:B:A [31:0] little endian
/// R:G:B:A `\[` 31:0 `\]` little endian
RA24 = 0x34324152,
/// A:B:G:R [31:0] little endian
/// A:B:G:R `\[` 31:0 `\]` little endian
AB24 = 0x34324142,
/// B:G:R:A [31:0] little endian
/// B:G:R:A `\[` 31:0 `\]` little endian
BA24 = 0x34324241,
}
impl FourCC {
Expand Down
2 changes: 1 addition & 1 deletion lib/propolis-client/src/support.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ pub enum WSClientOffset {
}

/// This is a trivial abstraction wrapping the websocket connection returned
/// by [crate::generated::Client::instance_serial], providing the additional
/// by [crate::Client::instance_serial], providing the additional
/// functionality of connecting to the new propolis-server when an instance
/// is migrated (thus providing the illusion of the connection being
/// seamlessly maintained through migration)
Expand Down
2 changes: 1 addition & 1 deletion lib/propolis/src/cpuid.rs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ impl From<Set> for Vec<bhyve_api::vcpu_cpuid_entry> {
}
}

/// Convert a [vcpu_cpuid_entry](bhyve_api::vcpu_cpuid_entry) into an ([Ident],
/// Convert a [vcpu_cpuid_entry] into an ([Ident],
/// [Entry]) tuple, suitable for insertion into a [Set].
///
/// This would be implemented as a [From] trait if rust let us.
Expand Down
2 changes: 1 addition & 1 deletion lib/propolis/src/firmware/smbios/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use table::{Table, Type127};
mod bits;
pub mod table;

/// Collection of SMBIOS [table](table) instances, which will be rendered out
/// Collection of SMBIOS [table] instances, which will be rendered out
/// into two blocks of raw bytes representing the SMBIOS Entry Point and
/// SMBIOS Structure Table.
pub struct Tables {
Expand Down
2 changes: 1 addition & 1 deletion lib/propolis/src/vmm/machine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ impl Machine {
}

/// Destroy the `Machine` and its associated resources. Returns the
/// underlying [VmmHdl](crate::vmm::VmmHdl) for the caller to do further
/// underlying [VmmHdl] for the caller to do further
/// cleanup, such as destroy the kernel VMM instance.
pub fn destroy(mut self) -> Arc<VmmHdl> {
self.do_destroy().expect("machine not already destroyed")
Expand Down
1 change: 1 addition & 0 deletions rustfmt.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
# ---------------------------------------------------------------------------
max_width = 80
use_small_heuristics = "max"
edition = "2021"
Loading