Auto merge of #502 - Amanieu:fix-clippy2, r=Amanieu

Fix clippy warnings These were causing CI failures.
rust-lang · Feb 12, 2024 · 6b4419d · 6b4419d
2 parents f2e6212 + 7c41f5d
commit 6b4419d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -58,7 +58,7 @@ jobs:
           thumbv6m-none-eabi,
           x86_64-pc-windows-gnu,
         ]
-        channel: [1.63.0, nightly]
+        channel: [1.72.0, nightly]
         include:
         - os: macos-latest
           target: x86_64-apple-darwin
@@ -68,10 +68,10 @@ jobs:
           channel: nightly
         - os: macos-latest
           target: x86_64-apple-darwin
-          channel: 1.63.0
+          channel: 1.72.0
         - os: windows-latest
           target: x86_64-pc-windows-msvc
-          channel: 1.63.0
+          channel: 1.72.0
         - os: ubuntu-latest
           target: x86_64-unknown-linux-gnu
           channel: beta

diff --git a/ci/run.sh b/ci/run.sh
@@ -16,9 +16,6 @@ if [ "${CHANNEL}" = "nightly" ]; then
     FEATURES="${FEATURES},nightly"
     export RUSTFLAGS="$RUSTFLAGS -D warnings"
 fi
-if [ "${CHANNEL}" = "1.63.0" ]; then
-    cargo update --package allocator-api2 --precise 0.2.9
-fi
 
 CARGO=cargo
 if [ "${CROSS}" = "1" ]; then

diff --git a/src/lib.rs b/src/lib.rs
@@ -37,6 +37,7 @@
 #![warn(missing_docs)]
 #![warn(rust_2018_idioms)]
 #![cfg_attr(feature = "nightly", warn(fuzzy_provenance_casts))]
+#![cfg_attr(feature = "nightly", allow(internal_features))]
 
 #[cfg(test)]
 #[macro_use]

diff --git a/src/map.rs b/src/map.rs
@@ -6805,7 +6805,7 @@ mod test_map {
         assert_eq!(m2.len(), 2);
     }
 
-    thread_local! { static DROP_VECTOR: RefCell<Vec<i32>> = RefCell::new(Vec::new()) }
+    thread_local! { static DROP_VECTOR: RefCell<Vec<i32>> = const { RefCell::new(Vec::new()) } }
 
     #[derive(Hash, PartialEq, Eq)]
     struct Droppable {
@@ -8524,7 +8524,7 @@ mod test_map {
     #[test]
     #[should_panic = "panic in clone"]
     fn test_clone_from_memory_leaks() {
-        use ::alloc::vec::Vec;
+        use alloc::vec::Vec;
 
         struct CheckedClone {
             panic_in_clone: bool,

diff --git a/src/set.rs b/src/set.rs
@@ -2820,7 +2820,7 @@ mod test_set {
                 assert_eq!(last_i, 49);
             }
 
-            for _ in &s {
+            if !s.is_empty() {
                 panic!("s should be empty!");
             }
 
@@ -2834,6 +2834,7 @@ mod test_set {
         use core::hash;
 
         #[derive(Debug)]
+        #[allow(dead_code)]
         struct Foo(&'static str, i32);
 
         impl PartialEq for Foo {