Skip to content

Commit e7be01a

Browse files
authored
Merge pull request #248 from mulkieran/edition-2024
Edition 2024
2 parents e6b5990 + 7801e02 commit e7be01a

10 files changed

Lines changed: 21 additions & 19 deletions

File tree

‎Cargo.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "libblkid-rs"
33
version = "0.4.2"
44
authors = ["John Baublitz <jbaublitz@redhat.com>"]
5-
edition = "2021"
5+
edition = "2024"
66
rust-version = "1.87.0" # LOWEST SUPPORTED RUST TOOLCHAIN
77
description = "High level bindings for libblkid"
88
license = "MPL-2.0"
@@ -33,6 +33,7 @@ future_incompatible = { level = "deny", priority = 1 }
3333
unused = { level = "deny", priority = 2}
3434
rust_2018_idioms = { level = "deny", priority = 3 }
3535
nonstandard_style = { level = "deny", priority = 4 }
36+
rust-2024-compatibility = { level = "deny", priority = 5}
3637

3738
[lints.clippy]
3839
all = { level = "deny" }

‎src/deprecated.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
use std::{ffi::CString, ptr};
66

77
use crate::{
8+
Result,
89
consts::{BlkidProbreqFlags, BlkidUsageFlags},
910
err::BlkidErr,
1011
probe::BlkidProbe,
11-
Result,
1212
};
1313

1414
impl BlkidProbe {

‎src/encode.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::ffi::CString;
66

77
use libc::{c_char, c_int};
88

9-
use crate::{err::BlkidErr, Result};
9+
use crate::{Result, err::BlkidErr};
1010

1111
// Shared code for encoding methods
1212
fn string_shared<F>(string: &str, closure: F) -> Result<String>

‎src/err.rs‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ impl Display for BlkidErr {
6161
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
6262
match *self {
6363
BlkidErr::Null(ref e) => write!(f, "Null error during string conversion: {e}"),
64-
BlkidErr::BytesWithNull(ref e) => write!(f, "Null error when converting from slice: {e}"),
64+
BlkidErr::BytesWithNull(ref e) => {
65+
write!(f, "Null error when converting from slice: {e}")
66+
}
6567
BlkidErr::IntoString(ref e) => write!(f, "Could not convert C string to string: {e}"),
6668
BlkidErr::PositiveReturnCode => {
6769
write!(f, "Positive return code found when <= 0 was expected")
@@ -72,7 +74,10 @@ impl Display for BlkidErr {
7274
BlkidErr::IO(ref e) => write!(f, "An IO error occurred: {e}"),
7375
BlkidErr::Uuid(ref e) => write!(f, "A UUID error occurred: {e}"),
7476
BlkidErr::Other(ref s) => write!(f, "{s}"),
75-
BlkidErr::LibErr(code) => write!(f, "libblkid returned an error code indicating an operation could not be completed successfully: {code}"),
77+
BlkidErr::LibErr(code) => write!(
78+
f,
79+
"libblkid returned an error code indicating an operation could not be completed successfully: {code}"
80+
),
7681
}
7782
}
7883
}

‎src/lib.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,16 @@ pub use crate::{
5050
cache::BlkidCache,
5151
consts::*,
5252
dev::{BlkidDev, BlkidDevIter},
53-
devno::{maj_t, min_t, BlkidDevno},
53+
devno::{BlkidDevno, maj_t, min_t},
5454
encode::{encode_string, safe_string},
5555
err::{BlkidErr, Result},
5656
partition::{BlkidPartition, BlkidPartlist, BlkidParttable},
5757
probe::{
58-
get_partition_name, get_superblock_name, is_known_fs_type, is_known_partition_type,
59-
BlkidProbe,
58+
BlkidProbe, get_partition_name, get_superblock_name, is_known_fs_type,
59+
is_known_partition_type,
6060
},
61-
tag::{parse_tag_string, BlkidTagIter},
61+
tag::{BlkidTagIter, parse_tag_string},
6262
topology::BlkidTopology,
63-
utils::{evaluate_spec, evaluate_tag, send_uevent, BlkidSectors},
63+
utils::{BlkidSectors, evaluate_spec, evaluate_tag, send_uevent},
6464
version::{get_library_version, parse_version_string},
6565
};

‎src/macros.rs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,7 @@ macro_rules! errno_ptr {
4444
macro_rules! option_ptr {
4545
($ret_expr:expr) => {{
4646
let ptr = $ret_expr;
47-
if ptr.is_null() {
48-
None
49-
} else {
50-
Some(ptr)
51-
}
47+
if ptr.is_null() { None } else { Some(ptr) }
5248
}};
5349
}
5450

‎src/partition.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ use std::{ffi::CStr, marker::PhantomData};
77
use uuid::Uuid;
88

99
use crate::{
10+
Result,
1011
devno::BlkidDevno,
1112
err::BlkidErr,
1213
utils::{BlkidBytes, BlkidSectors},
13-
Result,
1414
};
1515

1616
/// A handle for working with partition tables.

‎src/probe.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use std::{
1010
};
1111

1212
use crate::{
13+
Result,
1314
consts::{
1415
BlkidFltr, BlkidFullprobeRet, BlkidProbeRet, BlkidProbreqFlags, BlkidSafeprobeRet,
1516
BlkidSublksFlags, BlkidUsageFlags,
@@ -18,7 +19,6 @@ use crate::{
1819
err::BlkidErr,
1920
partition::BlkidPartlist,
2021
topology::BlkidTopology,
21-
Result,
2222
};
2323

2424
/// A structure for probing block devices.

‎src/tag.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use std::{
99

1010
use libc::c_char;
1111

12-
use crate::{err::BlkidErr, Result};
12+
use crate::{Result, err::BlkidErr};
1313

1414
/// Iterator for tags associated with a device
1515
pub struct BlkidTagIter(libblkid_rs_sys::blkid_tag_iterate);

‎src/utils.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use std::{
1010

1111
use either::Either;
1212

13-
use crate::{cache::BlkidCache, err::BlkidErr, Result};
13+
use crate::{Result, cache::BlkidCache, err::BlkidErr};
1414

1515
const SECTOR_SIZE: libblkid_rs_sys::blkid_loff_t = 512;
1616

0 commit comments

Comments
 (0)