Merge commit '266e96785a' into sync_cg_clif-2022-10-23

2022-10-23 16:22:55 +02:00 · 2022-10-23 16:22:55 +02:00 · e54a13f18b
commit e54a13f18b
parent 9be2f35a4c 266e96785a
45 changed files with 1041 additions and 634 deletions
--- a/compiler/rustc_codegen_cranelift/build_system/config.rs
+++ b/compiler/rustc_codegen_cranelift/build_system/config.rs
@ -1,4 +1,5 @@
-use std::{fs, process};
+use std::fs;
+use std::process;

 fn load_config_file() -> Vec<(String, Option<String>)> {
    fs::read_to_string("config.txt")