Skip to content

Commit 8632234

Browse files
authored
Merge pull request #1043 from mulkieran/edition-2024
Edition 2024
2 parents 4c32de1 + 4c80bdb commit 8632234

13 files changed

Lines changed: 49 additions & 43 deletions

File tree

‎Cargo.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ readme = "README.md"
99
categories = ["os::linux-apis", "api-bindings"]
1010
keywords = ["Linux", "device", "mapper", "libdm", "storage"]
1111
license = "MPL-2.0"
12-
edition = "2021"
12+
edition = "2024"
1313
rust-version = "1.87.0" # LOWEST SUPPORTED RUST TOOLCHAIN
1414
exclude = [".clippy.toml", ".githooks/*", ".gitignore", ".github/*", "Makefile"]
1515

@@ -76,6 +76,7 @@ future_incompatible = { level = "deny", priority = 1 }
7676
unused = { level = "deny", priority = 2}
7777
rust_2018_idioms = { level = "deny", priority = 3 }
7878
nonstandard_style = { level = "deny", priority = 4 }
79+
rust-2024-compatibility = { level = "allow", priority = 5 }
7980

8081
[lints.clippy]
8182
all = { level = "deny" }

‎src/cachedev.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ use std::{
1111

1212
use crate::{
1313
consts::IEC,
14-
core::{DevId, Device, DeviceInfo, DmName, DmOptions, DmUuid, DM},
14+
core::{DM, DevId, Device, DeviceInfo, DmName, DmOptions, DmUuid},
1515
lineardev::{LinearDev, LinearDevTargetParams},
1616
result::{DmError, DmResult, ErrorEnum},
1717
shared::{
18-
device_create, device_exists, device_match, get_status, get_status_line_fields,
19-
make_unexpected_value_error, parse_device, parse_value, DmDevice, TargetLine, TargetParams,
20-
TargetTable, TargetTypeBuf,
18+
DmDevice, TargetLine, TargetParams, TargetTable, TargetTypeBuf, device_create,
19+
device_exists, device_match, get_status, get_status_line_fields,
20+
make_unexpected_value_error, parse_device, parse_value,
2121
},
2222
units::{DataBlocks, MetaBlocks, Sectors},
2323
};

‎src/core/dm.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use std::{
1212
};
1313

1414
use nix::{errno, libc::ioctl as nix_ioctl};
15-
use retry::{delay::Fixed, retry_with_index, Error as RetryError, OperationResult};
15+
use retry::{Error as RetryError, OperationResult, delay::Fixed, retry_with_index};
1616
use semver::Version;
1717

1818
use crate::{

‎src/core/dm_udev_sync.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ pub trait UdevSyncAction {
1616
#[cfg(not(target_os = "android"))]
1717
pub mod sync_semaphore {
1818
use nix::libc::{
19-
c_int,
20-
key_t,
21-
sembuf,
22-
semctl as libc_semctl,
23-
semget as libc_semget,
24-
semop as libc_semop,
2519
EEXIST,
2620
ENOMEM,
2721
ENOSPC,
@@ -31,19 +25,25 @@ pub mod sync_semaphore {
3125
IPC_EXCL,
3226
IPC_NOWAIT,
3327
IPC_RMID,
28+
c_int,
29+
key_t,
30+
sembuf,
31+
semctl as libc_semctl,
32+
semget as libc_semget,
33+
semop as libc_semop,
3434
};
3535

36-
use nix::unistd::{access, AccessFlags};
36+
use nix::unistd::{AccessFlags, access};
3737

3838
use rand::RngExt;
39-
use retry::{delay::NoDelay, retry, OperationResult};
39+
use retry::{OperationResult, delay::NoDelay, retry};
4040
use std::{io, path::Path, sync::LazyLock};
4141

4242
use crate::core::sysvsem::seminfo;
4343

4444
use crate::{
4545
core::dm_flags::{DmFlags, DmUdevFlags},
46-
core::sysvsem::{semun, GETVAL, SEM_INFO, SETVAL},
46+
core::sysvsem::{GETVAL, SEM_INFO, SETVAL, semun},
4747
core::{dm_ioctl as dmi, errors},
4848
result::{DmError, DmResult},
4949
};
@@ -385,7 +385,7 @@ pub mod sync_semaphore {
385385
#[cfg(test)]
386386
mod tests {
387387
use super::*;
388-
use crate::{core::dm_flags::DmUdevFlags, DmOptions};
388+
use crate::{DmOptions, core::dm_flags::DmUdevFlags};
389389

390390
// SysV IPC key value for testing ("DMRS" in ASCII characters)
391391
const IPC_TEST_KEY: i32 = 0x444d5253;

‎src/core/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ mod types;
1717
mod util;
1818

1919
pub use self::{
20-
device::{devnode_to_devno, Device},
20+
device::{Device, devnode_to_devno},
2121
deviceinfo::DeviceInfo,
2222
dm::DM,
2323
dm_flags::{DmFlags, DmUdevFlags},

‎src/core/sysvsem.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
// License, v. 2.0. If a copy of the MPL was not distributed with this
33
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
44

5-
pub use devicemapper_sys::{seminfo, semun, GETVAL, SEM_INFO, SETVAL};
5+
pub use devicemapper_sys::{GETVAL, SEM_INFO, SETVAL, seminfo, semun};

‎src/lib.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,23 +117,23 @@ pub use crate::{
117117
},
118118
consts::IEC,
119119
core::{
120-
devnode_to_devno, errors, DevId, Device, DeviceInfo, DmFlags, DmName, DmNameBuf, DmOptions,
121-
DmUdevFlags, DmUuid, DmUuidBuf, DM,
120+
DM, DevId, Device, DeviceInfo, DmFlags, DmName, DmNameBuf, DmOptions, DmUdevFlags, DmUuid,
121+
DmUuidBuf, devnode_to_devno, errors,
122122
},
123123
lineardev::{
124124
FlakeyFeatureArg, FlakeyTargetParams, LinearDev, LinearDevTargetParams,
125125
LinearDevTargetTable, LinearTargetParams,
126126
},
127127
result::{DmError, DmResult, ErrorEnum},
128128
shared::{
129-
device_exists, message, DmDevice, TargetLine, TargetParams, TargetTable, TargetType,
130-
TargetTypeBuf,
129+
DmDevice, TargetLine, TargetParams, TargetTable, TargetType, TargetTypeBuf, device_exists,
130+
message,
131131
},
132132
thindev::{ThinDev, ThinDevTargetTable, ThinDevWorkingStatus, ThinStatus, ThinTargetParams},
133133
thindevid::ThinDevId,
134134
thinpooldev::{
135135
ThinPoolDev, ThinPoolDevTargetTable, ThinPoolNoSpacePolicy, ThinPoolStatus,
136136
ThinPoolStatusSummary, ThinPoolTargetParams, ThinPoolUsage, ThinPoolWorkingStatus,
137137
},
138-
units::{Bytes, DataBlocks, MetaBlocks, Sectors, SECTOR_SIZE},
138+
units::{Bytes, DataBlocks, MetaBlocks, SECTOR_SIZE, Sectors},
139139
};

‎src/lineardev.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
use std::{collections::HashSet, fmt, path::PathBuf, str::FromStr};
66

77
use crate::{
8-
core::{DevId, Device, DeviceInfo, DmName, DmOptions, DmUuid, DM},
8+
core::{DM, DevId, Device, DeviceInfo, DmName, DmOptions, DmUuid},
99
result::{DmError, DmResult, ErrorEnum},
1010
shared::{
11-
device_create, device_exists, device_match, parse_device, parse_value, DmDevice,
12-
TargetLine, TargetParams, TargetTable, TargetTypeBuf,
11+
DmDevice, TargetLine, TargetParams, TargetTable, TargetTypeBuf, device_create,
12+
device_exists, device_match, parse_device, parse_value,
1313
},
1414
units::Sectors,
1515
};
@@ -583,7 +583,7 @@ mod tests {
583583
use std::{clone::Clone, fs::OpenOptions, path::Path};
584584

585585
use crate::{
586-
core::{devnode_to_devno, Device, DmFlags},
586+
core::{Device, DmFlags, devnode_to_devno},
587587
testing::{blkdev_size, test_name, test_with_spec},
588588
};
589589

‎src/shared.rs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use std::{
1313
};
1414

1515
use crate::{
16-
core::{devnode_to_devno, DevId, Device, DeviceInfo, DmFlags, DmName, DmOptions, DmUuid, DM},
16+
core::{DM, DevId, Device, DeviceInfo, DmFlags, DmName, DmOptions, DmUuid, devnode_to_devno},
1717
result::{DmError, DmResult, ErrorEnum},
1818
units::Sectors,
1919
};
@@ -245,7 +245,11 @@ pub fn get_status(status_lines: &[(u64, u64, String, String)]) -> DmResult<Strin
245245
format!(
246246
"Incorrect number of lines for status; expected 1, found {} in status result \"{}\"",
247247
length,
248-
status_lines.iter().map(|(s, l, t, v)| format!("{s} {l} {t} {v}")).collect::<Vec<String>>().join(", ")
248+
status_lines
249+
.iter()
250+
.map(|(s, l, t, v)| format!("{s} {l} {t} {v}"))
251+
.collect::<Vec<String>>()
252+
.join(", ")
249253
),
250254
));
251255
}

‎src/testing/loopbacked.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use tempfile::{self, TempDir};
1515
use crate::{
1616
consts::IEC,
1717
testing::{logger::init_logger, test_lib::clean_up},
18-
units::{Bytes, Sectors, SECTOR_SIZE},
18+
units::{Bytes, SECTOR_SIZE, Sectors},
1919
};
2020

2121
/// Write buf at offset length times.

0 commit comments

Comments
 (0)