Skip to content

Commit 20ec12f

Browse files
committed
rustfmt: update to edition 2024
We can delete rustfmt.toml as the style version defaults to the crate's rust edition.
1 parent e232214 commit 20ec12f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+199
-180
lines changed

rustfmt.toml

Lines changed: 0 additions & 2 deletions
This file was deleted.

uefi-macros/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ extern crate proc_macro;
77
use proc_macro::TokenStream;
88

99
use proc_macro2::TokenStream as TokenStream2;
10-
use quote::{quote, quote_spanned, TokenStreamExt};
10+
use quote::{TokenStreamExt, quote, quote_spanned};
1111
use syn::spanned::Spanned;
1212
use syn::{
13-
parse_macro_input, parse_quote, parse_quote_spanned, Error, Expr, ExprLit, ExprPath, ItemFn,
14-
ItemStruct, Lit, Visibility,
13+
Error, Expr, ExprLit, ExprPath, ItemFn, ItemStruct, Lit, Visibility, parse_macro_input,
14+
parse_quote, parse_quote_spanned,
1515
};
1616

1717
macro_rules! err {
@@ -74,7 +74,7 @@ pub fn unsafe_protocol(args: TokenStream, input: TokenStream) -> TokenStream {
7474
expr,
7575
"macro input must be either a string literal or path to a constant"
7676
)
77-
.into()
77+
.into();
7878
}
7979
};
8080

uefi-raw/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pub mod time;
3434
mod status;
3535

3636
pub use status::Status;
37-
pub use uguid::{guid, Guid};
37+
pub use uguid::{Guid, guid};
3838

3939
use core::ffi::c_void;
4040
use core::fmt::{self, Debug, Formatter};

uefi-raw/src/protocol/block.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: MIT OR Apache-2.0
22

3-
use crate::{guid, Boolean, Guid, Status};
3+
use crate::{Boolean, Guid, Status, guid};
44
use core::ffi::c_void;
55

66
/// Logical block address.

uefi-raw/src/protocol/console.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
pub mod serial;
44

5-
use crate::{guid, Boolean, Char16, Event, Guid, PhysicalAddress, Status};
5+
use crate::{Boolean, Char16, Event, Guid, PhysicalAddress, Status, guid};
66
use bitflags::bitflags;
77
use core::ptr;
88

uefi-raw/src/protocol/console/serial.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: MIT OR Apache-2.0
22

3-
use crate::{guid, Guid, Status};
3+
use crate::{Guid, Status, guid};
44
use bitflags::bitflags;
55

66
bitflags! {

uefi-raw/src/protocol/device_path.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
mod device_path_gen;
44

5-
use crate::{guid, Boolean, Char16, Guid};
5+
use crate::{Boolean, Char16, Guid, guid};
66

77
pub use device_path_gen::{acpi, bios_boot_spec, end, hardware, media, messaging};
88

uefi-raw/src/protocol/device_path/device_path_gen.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#![allow(missing_debug_implementations)]
1111
use crate::protocol::device_path;
1212
use crate::table::boot::MemoryType;
13-
use crate::{guid, Guid, IpAddress};
13+
use crate::{Guid, IpAddress, guid};
1414
use bitflags::bitflags;
1515
use device_path::DevicePathProtocol as DevicePathHeader;
1616
#[cfg(doc)]

uefi-raw/src/protocol/disk.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: MIT OR Apache-2.0
22

3-
use crate::{guid, Event, Guid, Status};
3+
use crate::{Event, Guid, Status, guid};
44
use core::ffi::c_void;
55

66
#[derive(Debug)]

uefi-raw/src/protocol/driver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: MIT OR Apache-2.0
22

33
use crate::protocol::device_path::DevicePathProtocol;
4-
use crate::{guid, Guid, Handle, Status};
4+
use crate::{Guid, Handle, Status, guid};
55

66
#[derive(Debug)]
77
#[repr(C)]

0 commit comments

Comments
 (0)