rust: bump 1.72.1 and fix errors

https://rust-lang.github.io/rust-clippy/master/index.html#non_minimal_cfg https://rust-lang.github.io/rust-clippy/master/index.html#unwrap_or_default https://rust-lang.github.io/rust-clippy/master/index.html#needless_borrows_for_generic_args https://rust-lang.github.io/rust-clippy/master/index.html#reserve_after_initializatio https://rust-lang.github.io/rust-clippy/master/index.html#/arc_with_non_send_sync https://rust-lang.github.io/rust-clippy/master/index.html#useless_vec Signed-off-by: Yadong Ding <ding_yadong@foxmail.com>
BraveY · Dec 29, 2023 · f085879 · f085879
1 parent cf76edb
commit f085879
Show file tree

Hide file tree

Showing 33 changed files with 68 additions and 72 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -42,10 +42,10 @@ jobs:
       with:
         cache-on-failure: true
         shared-key: Linux-cargo-amd64
+    - uses: dsherret/rust-toolchain-file@v1
     - name: Build Nydus
       run: |
-        rustup component add rustfmt clippy
-        make
+        make release
     - name: Upload Nydus Binaries
       uses: actions/upload-artifact@v3
       with:

diff --git a/.github/workflows/convert.yml b/.github/workflows/convert.yml
@@ -44,10 +44,10 @@ jobs:
       with:
         cache-on-failure: true
         shared-key: Linux-cargo-amd64
+    - uses: dsherret/rust-toolchain-file@v1
     - name: Build Nydus
       run: |
-        rustup component add rustfmt clippy
-        make
+        make release
     - name: Upload Nydus Binaries
       uses: actions/upload-artifact@v3
       with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,12 +25,12 @@ jobs:
       with:
         cache-on-failure: true
         shared-key: ${{ runner.os }}-cargo-${{ matrix.arch }}
+    - uses: dsherret/rust-toolchain-file@v1
     - name: Build nydus-rs
       run: |
         declare -A rust_target_map=( ["amd64"]="x86_64-unknown-linux-musl" ["arm64"]="aarch64-unknown-linux-musl" ["ppc64le"]="powerpc64le-unknown-linux-gnu" ["riscv64"]="riscv64gc-unknown-linux-gnu")
         RUST_TARGET=${rust_target_map[${{ matrix.arch }}]}
         cargo install --locked --version 0.2.4 cross
-        rustup component add rustfmt clippy
         make -e RUST_TARGET_STATIC=$RUST_TARGET -e CARGO=cross static-release
         sudo mv target/$RUST_TARGET/release/nydusd nydusd
         sudo mv target/$RUST_TARGET/release/nydus-image .
@@ -59,6 +59,7 @@ jobs:
       with:
         cache-on-failure: true
         shared-key: ${{ runner.os }}-cargo-${{ matrix.arch }}
+    - uses: dsherret/rust-toolchain-file@v1
     - name: build
       run: |
         if [[ "${{matrix.arch}}" == "amd64" ]]; then
@@ -68,7 +69,6 @@ jobs:
         fi
         cargo install --version 0.2.4 cross
         rustup target add ${RUST_TARGET}
-        rustup component add rustfmt clippy
         make -e RUST_TARGET_STATIC=$RUST_TARGET -e CARGO=cross static-release
         sudo mv target/$RUST_TARGET/release/nydusd nydusd
         sudo cp -r misc/configs .

diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
@@ -53,12 +53,12 @@ jobs:
         cache-on-failure: true
         shared-key: ${{ runner.os }}-cargo-${{ matrix.arch }}
         save-if: ${{ github.ref == 'refs/heads/master' }}
+    - uses: dsherret/rust-toolchain-file@v1
     - name: Build Nydus
       run: |
         declare -A rust_target_map=( ["amd64"]="x86_64-unknown-linux-musl" ["arm64"]="aarch64-unknown-linux-musl" ["ppc64le"]="powerpc64le-unknown-linux-gnu" ["riscv64"]="riscv64gc-unknown-linux-gnu")
         RUST_TARGET=${rust_target_map[${{ matrix.arch }}]}
         cargo install --locked --version 0.2.4 cross
-        rustup component add rustfmt clippy
         make -e RUST_TARGET_STATIC=$RUST_TARGET -e CARGO=cross static-release
         sudo mv target/$RUST_TARGET/release/nydusd .
         sudo mv target/$RUST_TARGET/release/nydus-image .
@@ -84,6 +84,7 @@ jobs:
         cache-on-failure: true
         shared-key: ${{ runner.os }}-cargo-${{ matrix.arch }}
         save-if: ${{ github.ref == 'refs/heads/master' }}
+    - uses: dsherret/rust-toolchain-file@v1
     - name: build
       run: |
         if [[ "${{matrix.arch}}" == "amd64" ]]; then
@@ -93,7 +94,6 @@ jobs:
         fi
         cargo install --version 0.2.4 cross
         rustup target add ${RUST_TARGET}
-        rustup component add rustfmt clippy
         make -e RUST_TARGET_STATIC=$RUST_TARGET -e CARGO=cross static-release
 
   nydus-integration-test:

diff --git a/api/src/error.rs b/api/src/error.rs
@@ -11,7 +11,7 @@ pub fn make_error(
     _file: &str,
     _line: u32,
 ) -> std::io::Error {
-    #[cfg(all(feature = "error-backtrace"))]
+    #[cfg(feature = "error-backtrace")]
     {
         if let Ok(val) = std::env::var("RUST_BACKTRACE") {
             if val.trim() != "0" {

diff --git a/builder/src/core/context.rs b/builder/src/core/context.rs
@@ -903,7 +903,7 @@ impl BlobManager {
                 let iv = crypt::Cipher::generate_random_iv()?;
                 let cipher_ctx = CipherContext::new(key, iv, false, ctx.cipher)?;
                 (
-                    ctx.cipher.new_cipher().ok().unwrap_or(Default::default()),
+                    ctx.cipher.new_cipher().ok().unwrap_or_default(),
                     Some(cipher_ctx),
                 )
             }

diff --git a/builder/src/core/node.rs b/builder/src/core/node.rs
@@ -223,7 +223,7 @@ impl Node {
         chunk_data_buf: &mut [u8],
     ) -> Result<u64> {
         let mut reader = if self.is_reg() {
-            let file = File::open(&self.path())
+            let file = File::open(self.path())
                 .with_context(|| format!("failed to open node file {:?}", self.path()))?;
             Some(file)
         } else {

diff --git a/builder/src/core/tree.rs b/builder/src/core/tree.rs
@@ -19,6 +19,7 @@
 use std::ffi::OsString;
 use std::os::unix::ffi::OsStrExt;
 use std::path::{Path, PathBuf};
+use std::rc::Rc;
 use std::sync::{Arc, Mutex, MutexGuard};
 
 use anyhow::{bail, Result};
@@ -34,7 +35,7 @@ use crate::core::overlay::OVERLAYFS_WHITEOUT_OPAQUE;
 use crate::{BuildContext, ChunkDict};
 
 /// Type alias for tree internal node.
-pub type TreeNode = Arc<Mutex<Node>>;
+pub type TreeNode = Rc<Mutex<Node>>;
 
 /// An in-memory tree structure to maintain information and topology of filesystem nodes.
 #[derive(Clone)]
@@ -52,7 +53,7 @@ impl Tree {
     pub fn new(node: Node) -> Self {
         let name = node.name().as_bytes().to_vec();
         Tree {
-            node: Arc::new(Mutex::new(node)),
+            node: Rc::new(Mutex::new(node)),
             name,
             children: Vec::new(),
         }
@@ -81,7 +82,7 @@ impl Tree {
 
     /// Set `Node` associated with the tree node.
     pub fn set_node(&mut self, node: Node) {
-        self.node = Arc::new(Mutex::new(node));
+        self.node = Rc::new(Mutex::new(node));
     }
 
     /// Get mutex guard to access the associated `Node` object.

diff --git a/builder/src/core/v6.rs b/builder/src/core/v6.rs
@@ -86,17 +86,12 @@ impl Node {
 
     /// Update whether compact mode can be used for this inode or not.
     pub fn v6_set_inode_compact(&mut self) {
-        if self.info.v6_force_extended_inode
+        self.v6_compact_inode = !(self.info.v6_force_extended_inode
             || self.inode.uid() > u16::MAX as u32
             || self.inode.gid() > u16::MAX as u32
             || self.inode.nlink() > u16::MAX as u32
             || self.inode.size() > u32::MAX as u64
-            || self.path().extension() == Some(OsStr::new("pyc"))
-        {
-            self.v6_compact_inode = false;
-        } else {
-            self.v6_compact_inode = true;
-        }
+            || self.path().extension() == Some(OsStr::new("pyc")));
     }
 
     /// Layout the normal inode (except directory inode) into the meta blob.

diff --git a/misc/musl-static/Dockerfile b/misc/musl-static/Dockerfile
@@ -1,4 +1,4 @@
-FROM clux/muslrust:1.68.2
+FROM clux/muslrust:1.72.1
 
 ARG RUST_TARGET=x86_64-unknown-linux-musl
 

diff --git a/rafs/src/lib.rs b/rafs/src/lib.rs
@@ -326,7 +326,7 @@ mod tests {
         let bootstrap = OpenOptions::new()
             .read(true)
             .write(false)
-            .open(&path)
+            .open(path)
             .unwrap();
         let mut rs = RafsSuper {
             mode: RafsMode::Direct,

diff --git a/rafs/src/metadata/direct_v6.rs b/rafs/src/metadata/direct_v6.rs
@@ -1301,7 +1301,7 @@ impl RafsInodeExt for OndiskInodeWrapper {
     /// It depends on Self::validate() to ensure valid memory layout.
     fn name(&self) -> OsString {
         assert!(self.name.is_some());
-        self.name.clone().unwrap_or_else(OsString::new)
+        self.name.clone().unwrap_or_default()
     }
 
     /// Get file name size of the inode.

diff --git a/rafs/src/metadata/inode.rs b/rafs/src/metadata/inode.rs
@@ -583,10 +583,10 @@ impl InodeWrapper {
         if let Self::Ref(i) = self {
             let i = i.clone();
             if self.is_v6() {
-                *self = Self::V6(RafsV6Inode::from(i.deref().deref()));
+                *self = Self::V6(RafsV6Inode::from(i.deref()));
             } else {
                 assert!(self.is_v5());
-                *self = Self::V5(RafsV5Inode::from(i.deref().deref()));
+                *self = Self::V5(RafsV5Inode::from(i.deref()));
             }
         }
     }

diff --git a/rafs/src/metadata/layout/v6.rs b/rafs/src/metadata/layout/v6.rs
@@ -2473,8 +2473,7 @@ mod tests {
 
         let targets = vec![target1, target2, target3, target4, target5];
 
-        let mut entries: Vec<RafsV6XattrEntry> = Vec::new();
-        entries.reserve(targets.len());
+        let mut entries: Vec<RafsV6XattrEntry> = Vec::with_capacity(targets.len());
         for _i in 0..targets.len() {
             let mut entry = RafsV6XattrEntry::new();
             reader.read_exact(entry.as_mut()).unwrap();

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,2 +1,3 @@
 [toolchain]
-channel = "1.68.2"
+channel = "1.72.1"
+components = ["rustfmt", "clippy"]
diff --git a/service/src/blob_cache.rs b/service/src/blob_cache.rs
@@ -586,7 +586,7 @@ mod tests {
     fn test_blob_cache_entry() {
         let tmpdir = TempDir::new().unwrap();
         let path = tmpdir.as_path().join("bootstrap1");
-        std::fs::write(&path, "metadata").unwrap();
+        std::fs::write(path, "metadata").unwrap();
         let cfg = create_factory_config();
         let content = cfg.replace("/tmp/nydus", tmpdir.as_path().to_str().unwrap());
         let mut entry: BlobCacheEntry = serde_json::from_str(&content).unwrap();
@@ -629,7 +629,7 @@ mod tests {
     fn test_invalid_blob_id() {
         let tmpdir = TempDir::new().unwrap();
         let path = tmpdir.as_path().join("bootstrap1");
-        std::fs::write(&path, "metadata").unwrap();
+        std::fs::write(path, "metadata").unwrap();
         let config = create_factory_config();
         let content = config.replace("/tmp/nydus", tmpdir.as_path().to_str().unwrap());
         let mut entry: BlobCacheEntry = serde_json::from_str(&content).unwrap();

diff --git a/service/src/block_device.rs b/service/src/block_device.rs
@@ -15,6 +15,7 @@ use std::cmp::{max, min};
 use std::fs::OpenOptions;
 use std::io::Result;
 use std::path::PathBuf;
+use std::rc::Rc;
 use std::sync::{Arc, Mutex};
 use std::thread;
 use std::thread::JoinHandle;
@@ -36,8 +37,8 @@ const BLOCK_DEVICE_EXPORT_BATCH_SIZE: usize = 0x80000;
 
 enum BlockRange {
     Hole,
-    MetaBlob(Arc<MetaBlob>),
-    DataBlob(Arc<DataBlob>),
+    MetaBlob(Rc<MetaBlob>),
+    DataBlob(Rc<DataBlob>),
 }
 
 /// A block device composed up from a RAFSv6 image.
@@ -93,7 +94,7 @@ impl BlockDevice {
         };
         let is_tarfs_mode = meta_blob_config.is_tarfs_mode();
         let meta_blob = MetaBlob::new(meta_blob_config.path())?;
-        let meta_blob = Arc::new(meta_blob);
+        let meta_blob = Rc::new(meta_blob);
         let blocks = if is_tarfs_mode {
             meta_blob.blocks() * 8
         } else {
@@ -171,7 +172,7 @@ impl BlockDevice {
                     blob_info.blob_id()
                 ))
             })?;
-            ranges.update(&range, BlockRange::DataBlob(Arc::new(data_blob)));
+            ranges.update(&range, BlockRange::DataBlob(Rc::new(data_blob)));
             pos = extra_info.mapped_blkaddr + blocks as u32;
         }
 
@@ -307,7 +308,7 @@ impl BlockDevice {
         verity: bool,
     ) -> Result<()> {
         let block_device = BlockDevice::new(blob_entry)?;
-        let block_device = Arc::new(block_device);
+        let block_device = Rc::new(block_device);
         let blocks = block_device.blocks();
         let blob_id = block_device.meta_blob_id();
 
@@ -358,7 +359,7 @@ impl BlockDevice {
                     e
                 ))
             })?;
-        let output_file = Arc::new(tokio_uring::fs::File::from_std(output_file));
+        let output_file = Rc::new(tokio_uring::fs::File::from_std(output_file));
 
         let mut verity_offset = 0;
         let generator = if verity {
@@ -420,15 +421,15 @@ impl BlockDevice {
                                 e
                             ))
                         })?;
-                    let file = Arc::new(tokio_uring::fs::File::from_std(output_file));
+                    let file = Rc::new(tokio_uring::fs::File::from_std(output_file));
                     let block_device =
                         BlockDevice::new_with_cache_manager(id, mgr).map_err(|e| {
                             eother!(format!(
                                 "block_device: failed to create block device object, {}",
                                 e
                             ))
                         })?;
-                    let device = Arc::new(block_device);
+                    let device = Rc::new(block_device);
 
                     tokio_uring::start(async move {
                         Self::do_export(device, file, pos, count, generator).await
@@ -462,8 +463,7 @@ impl BlockDevice {
             let root_digest: String = root_digest
                 .data
                 .iter()
-                .map(|v| format!("{:02x}", v))
-                .collect();
+                .fold(String::new(), |acc, v| acc + &format!("{:02x}", v));
             println!(
                 "dm-verity options: --no-superblock --format=1 -s \"\" --hash=sha256 --data-block-size={} --hash-block-size=4096 --data-blocks {} --hash-offset {} {}",
                 block_device.block_size(), blocks, verity_offset, root_digest
@@ -474,8 +474,8 @@ impl BlockDevice {
     }
 
     async fn do_export(
-        block_device: Arc<BlockDevice>,
-        output_file: Arc<tokio_uring::fs::File>,
+        block_device: Rc<BlockDevice>,
+        output_file: Rc<tokio_uring::fs::File>,
         start: u32,
         mut blocks: u32,
         generator: Option<Arc<Mutex<VerityGenerator>>>,

diff --git a/service/src/fs_cache.rs b/service/src/fs_cache.rs
@@ -808,7 +808,7 @@ impl FsCacheHandler {
             }
         }
 
-        env::set_current_dir(&cwd_old)?;
+        env::set_current_dir(cwd_old)?;
         if res {
             Ok(())
         } else {
@@ -879,7 +879,7 @@ impl FsCacheHandler {
     }
 
     fn inuse(&self, cookie_dir: &Path, cookie_name: &str) -> Result<bool> {
-        env::set_current_dir(&cookie_dir)?;
+        env::set_current_dir(cookie_dir)?;
         let msg = format!("inuse {}", cookie_name);
         let ret = unsafe {
             libc::write(
@@ -902,7 +902,7 @@ impl FsCacheHandler {
     }
 
     fn cull(&self, cookie_dir: &Path, cookie_name: &str) -> Result<()> {
-        env::set_current_dir(&cookie_dir)?;
+        env::set_current_dir(cookie_dir)?;
         let msg = format!("cull {}", cookie_name);
         let ret = unsafe {
             libc::write(

diff --git a/src/bin/nydus-image/main.rs b/src/bin/nydus-image/main.rs
@@ -219,7 +219,7 @@ fn prepare_cmd_args(bti_string: &'static str) -> App {
                         .long("bootstrap")
                         .short('B')
                         .help("File path to save the generated RAFS metadata blob")
-                        .required_unless_present_any(&["blob-dir", "blob-inline-meta"])
+                        .required_unless_present_any(["blob-dir", "blob-inline-meta"])
                         .conflicts_with("blob-inline-meta"),
                 )
                 .arg(
@@ -233,7 +233,7 @@ fn prepare_cmd_args(bti_string: &'static str) -> App {
                         .long("blob")
                         .short('b')
                         .help("File path to save the generated RAFS data blob")
-                        .required_unless_present_any(&["type", "blob-dir"]),
+                        .required_unless_present_any(["type", "blob-dir"]),
                 )
                 .arg(
                     Arg::new("blob-inline-meta")

diff --git a/src/bin/nydus-image/unpack/pax.rs b/src/bin/nydus-image/unpack/pax.rs
@@ -560,7 +560,7 @@ impl PAXUtil {
         let max_len = header.as_old().linkname.len();
         if path.as_os_str().len() <= max_len {
             return header
-                .set_link_name(&path)
+                .set_link_name(path)
                 .with_context(|| "fail to set short link for pax header")
                 .map(|_| None);
         }