about summary refs log tree commit diff
path: root/compiler/rustc_codegen_llvm/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-06-19 00:25:25 +0000
committerbors <bors@rust-lang.org>2022-06-19 00:25:25 +0000
commit3b98c08288528c243973a54934e4be75bcf20c31 (patch)
treecbfd0796bbc2b1be86a2c0770bf56eff1061993b /compiler/rustc_codegen_llvm/src
parent8e430bfa9a6a9d81b25bddf6325069d217dc6f3f (diff)
parent267fe3bf81f0ef2200fb55f12e130d05b1a71aa5 (diff)
downloadrust-3b98c08288528c243973a54934e4be75bcf20c31.tar.gz
rust-3b98c08288528c243973a54934e4be75bcf20c31.zip
Auto merge of #98242 - matthiaskrgr:rollup-qbbkwtf, r=matthiaskrgr
Rollup of 5 pull requests

Successful merges:

 - #97511 (Don't build the compiler before building rust-demangler)
 - #98165 (once cell renamings)
 - #98207 (Update cargo)
 - #98229 (Add new eslint checks)
 - #98230 (Fix weird js condition)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
-rw-r--r--compiler/rustc_codegen_llvm/src/debuginfo/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/mod.rs b/compiler/rustc_codegen_llvm/src/debuginfo/mod.rs
index 0910e7c94ea..71699b5cf38 100644
--- a/compiler/rustc_codegen_llvm/src/debuginfo/mod.rs
+++ b/compiler/rustc_codegen_llvm/src/debuginfo/mod.rs
@@ -36,9 +36,9 @@ use rustc_target::abi::Size;
 
 use libc::c_uint;
 use smallvec::SmallVec;
+use std::cell::OnceCell;
 use std::cell::RefCell;
 use std::iter;
-use std::lazy::OnceCell;
 use tracing::debug;
 
 mod create_scope_map;