Commit b8e1df0

committed

rustfmt: fixes for device_path_gen for 2024 edition

1 parent 83412b6 commit b8e1df0Copy full SHA for b8e1df0

File tree

+13

-5

lines changed

+13

-5

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,8 @@`
	`1`	+# We keep this file explicitley to ensure that direct invocations of `rustfmt`
	`2`	+# also use the proper style edition. Unlike `cargo fmt`, which forwards the
	`3`	+# Rust edition specified in Cargo.toml to `rustfmt`, `rustfmt` still defaults to
	`4`	+# the 2021 edition and is unaware of `Cargo.toml`.
	`5`	`+#`
	`6`	+# We use a direct invocation of `rustfmt` in our device path generation code.
	`7`	`+`
	`8`	`+style_edition = "2024"`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`#![allow(missing_debug_implementations)]`
`11`	`11`	`use crate::protocol::device_path;`
`12`	`12`	`use crate::table::boot::MemoryType;`
`13`		`-use crate::{guid,Guid, IpAddress};`
	`13`	`+use crate::{Guid, IpAddress, guid};`
`14`	`14`	`use bitflags::bitflags;`
`15`	`15`	`use device_path::DevicePathProtocol as DevicePathHeader;`
`16`	`16`	`#[cfg(doc)]`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ use crate::proto::device_path::{`
`15`	`15`	`self, DevicePathHeader, DevicePathNode, DeviceSubType, DeviceType, NodeConversionError,`
`16`	`16`	`};`
`17`	`17`	`use crate::proto::network::IpAddress;`
`18`		`-use crate::{guid,Guid};`
	`18`	`+use crate::{Guid, guid};`
`19`	`19`	`use bitflags::bitflags;`
`20`	`20`	`use core::mem::{size_of, size_of_val};`
`21`	`21`	`use core::ptr::addr_of;`
`@@ -3647,10 +3647,10 @@ impl TryFrom<&DevicePathNode> for DevicePathNodeEnum<'_> {`
`3647`	`3647`	`/// Build device paths from their component nodes.`
`3648`	`3648`	`pub mod build {`
`3649`	`3649`	`use super::*;`
	`3650`	`+ use crate::CStr16;`
`3650`	`3651`	`use crate::proto::device_path::build::{BuildError, BuildNode};`
`3651`	`3652`	`use crate::proto::device_path::{DeviceSubType, DeviceType};`
`3652`		`- use crate::CStr16;`
`3653`		`- use core::mem::{size_of_val, MaybeUninit};`
	`3653`	`+ use core::mem::{MaybeUninit, size_of_val};`
`3654`	`3654`	/// Device path build nodes for [`DeviceType::END`].
`3655`	`3655`	`pub mod end {`
`3656`	`3656`	`use super::*;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ fn gen_uefi_code_as_string(groups: &[NodeGroup]) -> Result<String> {`
`73`	`73`	`let code = quote!(`
`74`	`74`	`use bitflags::bitflags;`
`75`	`75`	`use crate::data_types::UnalignedSlice;`
`76`		`- use crate::{guid,Guid};`
	`76`	`+ use crate::{Guid, guid};`
`77`	`77`	`use crate::polyfill::maybe_uninit_slice_as_mut_ptr;`
`78`	`78`	`use crate::proto::device_path::{`
`79`	`79`	`self, DevicePathHeader, DevicePathNode, DeviceSubType, DeviceType,`

Comments

(0)