X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=vendor%2Fcrossbeam-epoch%2Fsrc%2Fdefault.rs;h=b7797ce96033f915c212d1cfa4671eff09127c15;hb=6a06907d49497be0fa370db58eb5d712226c42d0;hp=1deac2114eb13c88d831154f8769c165e8938a16;hpb=5869c6ff7a3bf934f0bcc4de49608749c877a3d5;p=rustc.git

diff --git a/vendor/crossbeam-epoch/src/default.rs b/vendor/crossbeam-epoch/src/default.rs
index 1deac2114e..b7797ce960 100644
--- a/vendor/crossbeam-epoch/src/default.rs
+++ b/vendor/crossbeam-epoch/src/default.rs
@@ -6,7 +6,7 @@
 
 use crate::collector::{Collector, LocalHandle};
 use crate::guard::Guard;
-use lazy_static::lazy_static;
+use crate::primitive::{lazy_static, thread_local};
 
 lazy_static! {
     /// The global data for the default garbage collector.
@@ -45,7 +45,7 @@ where
         .unwrap_or_else(|_| f(&COLLECTOR.register()))
 }
 
-#[cfg(test)]
+#[cfg(all(test, not(crossbeam_loom)))]
 mod tests {
     use crossbeam_utils::thread;