Allow deprecated NonZero aliases in rust-analyzer.

rust-lang · May 1, 2024 · 364d54e · 364d54e
1 parent a1160ba
commit 364d54e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/tools/rust-analyzer/crates/hir-ty/src/layout/tests.rs b/src/tools/rust-analyzer/crates/hir-ty/src/layout/tests.rs
@@ -440,9 +440,12 @@ fn tuple() {
 
 #[test]
 fn non_zero_and_non_null() {
+    use core::ptr::NonNull;
+    #[allow(deprecated)]
+    use core::num::NonZeroU8;
+
     size_and_align! {
         minicore: non_zero, non_null, option;
-        use core::{num::NonZeroU8, ptr::NonNull};
         struct Goal(Option<NonZeroU8>, Option<NonNull<i32>>);
     }
 }

diff --git a/src/tools/rust-analyzer/crates/salsa/src/intern_id.rs b/src/tools/rust-analyzer/crates/salsa/src/intern_id.rs
@@ -1,4 +1,5 @@
 use std::fmt;
+#[allow(deprecated)]
 use std::num::NonZeroU32;
 
 /// The "raw-id" is used for interned keys in salsa -- it is basically

diff --git a/src/tools/rust-analyzer/crates/salsa/src/revision.rs b/src/tools/rust-analyzer/crates/salsa/src/revision.rs
@@ -1,3 +1,4 @@
+#[allow(deprecated)]
 use std::num::NonZeroU32;
 use std::sync::atomic::{AtomicU32, Ordering};