Merge commit '97e504549371d7640cf011d266e3c17394fdddac' into sync_cg_clif-2021-12-20

2021-12-20 18:56:35 +01:00
parent 84f962a89b 97e5045493
commit 3426a730ff
36 changed files with 1017 additions and 532 deletions
--- a/compiler/rustc_codegen_cranelift/src/debuginfo/object.rs
+++ b/compiler/rustc_codegen_cranelift/src/debuginfo/object.rs
@@ -1,5 +1,3 @@
-use std::convert::{TryFrom, TryInto};
-
 use rustc_data_structures::fx::FxHashMap;

 use cranelift_module::FuncId;