Merge pull request #1618 from HuijingHei/bump-rust

Cargo.toml: bump MSRV to 1.84.1

Author: prestist

.github/workflows/rust.yml

@@ -17,7 +17,7 @@ env:
   CARGO_TERM_COLOR: always
   RUST_BACKTRACE: 1
   # Pinned toolchain for linting
-  ACTIONS_LINTS_TOOLCHAIN: 1.77.2
+  ACTIONS_LINTS_TOOLCHAIN: 1.84.1
 
 defaults:
   run:

Cargo.lock

@@ -3,7 +3,7 @@ name = "coreos-installer"
 repository = "https://github.com/coreos/coreos-installer"
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.75.0"
+rust-version = "1.84.1"
 exclude = ["/.cci.jenkinsfile", "/.github", "/.gitignore", "/Dockerfile"]
 authors = [ "Benjamin Gilbert <bgilbert@redhat.com>" ]
 description = "Installer for Fedora CoreOS and RHEL CoreOS"

Cargo.toml

@@ -19,7 +19,8 @@ Internal changes:
 Packaging changes:
 
 - Update container to Fedora 41
-- Require `byte-unit` ≥ 5.1.6 
+- Require `byte-unit` ≥ 5.1.6
+- Require Rust ≥ 1.84.1
 
 ## coreos-installer 0.23.0 (2024-11-12)
 

docs/release-notes.md

@@ -84,7 +84,7 @@ impl Serializer {
 // - String/number primitives => add option argument, then value
 // https://serde.rs/impl-serializer.html
 // https://docs.serde.rs/serde/trait.Serializer.html
-impl<'a> ser::Serializer for &'a mut Serializer {
+impl ser::Serializer for &mut Serializer {
     type Ok = ();
     type Error = SerializeError;
     type SerializeSeq = Self;
@@ -260,7 +260,7 @@ impl<'a> ser::Serializer for &'a mut Serializer {
     }
 }
 
-impl<'a> ser::SerializeSeq for &'a mut Serializer {
+impl ser::SerializeSeq for &mut Serializer {
     type Ok = ();
     type Error = SerializeError;
 
@@ -276,7 +276,7 @@ impl<'a> ser::SerializeSeq for &'a mut Serializer {
     }
 }
 
-impl<'a> ser::SerializeStruct for &'a mut Serializer {
+impl ser::SerializeStruct for &mut Serializer {
     type Ok = ();
     type Error = SerializeError;
 

src/cmdline/serializer.rs

@@ -462,7 +462,7 @@ impl<'a, R: Read> ProgressReader<'a, R> {
     }
 }
 
-impl<'a, R: Read> Read for ProgressReader<'a, R> {
+impl<R: Read> Read for ProgressReader<'_, R> {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
         let count = self.source.read(buf)?;
         self.position += count as u64;
@@ -494,7 +494,7 @@ impl<'a, R: Read> Read for ProgressReader<'a, R> {
     }
 }
 
-impl<'a, R: Read> Drop for ProgressReader<'a, R> {
+impl<R: Read> Drop for ProgressReader<'_, R> {
     fn drop(&mut self) {
         // if we reported progress using CRs, log final newline
         if self.tty {

src/download.rs

@@ -371,14 +371,14 @@ pub struct IsoFsWalkIterator<'a> {
     dirpath: PathBuf,
 }
 
-impl<'a> Iterator for IsoFsWalkIterator<'a> {
+impl Iterator for IsoFsWalkIterator<'_> {
     type Item = Result<(String, DirectoryRecord)>;
     fn next(&mut self) -> Option<Self::Item> {
         self.walk_iterator_next().transpose()
     }
 }
 
-impl<'a> IsoFsWalkIterator<'a> {
+impl IsoFsWalkIterator<'_> {
     // This is simply split out of next() above for easier error-handling
     fn walk_iterator_next(&mut self) -> Result<Option<(String, DirectoryRecord)>> {
         while let Some(ref mut current_dir) = self.current_dir {

src/iso9660.rs

@@ -169,7 +169,7 @@ mod ffi {
         pub fn new() -> Self {
             let mut r: Self = unsafe { zeroed() };
             r.fm_extent_count = EXTENT_COUNT as u32;
-            r.fm_length = std::u64::MAX;
+            r.fm_length = u64::MAX;
             r
         }
     }

src/osmet/fiemap.rs

@@ -39,6 +39,7 @@ pub(crate) struct Range {
 ///   - ECKD (Extended Count Key Data) - is regular DASD of type 3390
 ///   - FBA (Fixed Block Access) - is used for emulated device that represents a real SCSI device
 ///   - Virt - ECKD on LPAR/zKVM as virtio-device
+///
 /// Only ECKD disks require `dasdfmt, fdasd` linux tools to be configured.
 enum DasdType {
     Eckd,

src/s390x/dasd.rs

@@ -80,7 +80,7 @@ fn partition_ranges(device: &mut File, first_mb: &[u8]) -> Result<(Vec<Range>, V
             out_offset: start_track * blocks_per_track * bytes_per_block,
             length: blocks * bytes_per_block,
         });
-        let end_track = start_track + (blocks + blocks_per_track - 1) / blocks_per_track - 1;
+        let end_track = start_track + blocks.div_ceil(blocks_per_track) - 1;
 
         if idx == last {
             entries.push(format!("[{start_track}, last, native]"));