about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSean Cross <sean@xobs.io>2021-04-03 15:00:10 +0800
committerSean Cross <sean@xobs.io>2021-04-03 15:00:10 +0800
commit8f73fe91f5db7de6e42ad7824a00b9729d2925b2 (patch)
tree9056378f9f44c4e3e8de88912b37ceae5e1c1074
parent6f1ac8d756a7a7c22641020926458058a51d5dd3 (diff)
downloadrust-8f73fe91f5db7de6e42ad7824a00b9729d2925b2.tar.gz
rust-8f73fe91f5db7de6e42ad7824a00b9729d2925b2.zip
compiler: run `python3 ./x.py fmt`
This fixes a build issue with formatting as part of #83800.

Signed-off-by: Sean Cross <sean@xobs.io>
-rw-r--r--compiler/rustc_session/src/config.rs9
-rw-r--r--compiler/rustc_target/src/spec/mod.rs7
2 files changed, 9 insertions, 7 deletions
diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs
index f3da9a1bda1..65be14e3510 100644
--- a/compiler/rustc_session/src/config.rs
+++ b/compiler/rustc_session/src/config.rs
@@ -927,8 +927,13 @@ pub fn build_configuration(sess: &Session, mut user_cfg: CrateConfig) -> CrateCo
     user_cfg
 }
 
-pub fn build_target_config(opts: &Options, target_override: Option<Target>, sysroot: &PathBuf) -> Target {
-    let target_result = target_override.map_or_else(|| Target::search(&opts.target_triple, sysroot), Ok);
+pub fn build_target_config(
+    opts: &Options,
+    target_override: Option<Target>,
+    sysroot: &PathBuf,
+) -> Target {
+    let target_result =
+        target_override.map_or_else(|| Target::search(&opts.target_triple, sysroot), Ok);
     let target = target_result.unwrap_or_else(|e| {
         early_error(
             opts.error_format,
diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
index 27653d3c331..72b2d089ebc 100644
--- a/compiler/rustc_target/src/spec/mod.rs
+++ b/compiler/rustc_target/src/spec/mod.rs
@@ -1791,11 +1791,8 @@ impl Target {
 
                 // Additionally look in the sysroot under `lib/rustlib/<triple>/target.json`
                 // as a fallback.
-                let p = sysroot
-                    .join("lib")
-                    .join("rustlib")
-                    .join(&target_triple)
-                    .join("target.json");
+                let p =
+                    sysroot.join("lib").join("rustlib").join(&target_triple).join("target.json");
                 if p.is_file() {
                     return load_file(&p);
                 }