Skip to content

Commit 8f73fe9

Browse files
committed
compiler: run python3 ./x.py fmt
This fixes a build issue with formatting as part of #83800. Signed-off-by: Sean Cross <[email protected]>
1 parent 6f1ac8d commit 8f73fe9

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

compiler/rustc_session/src/config.rs

+7-2
Original file line numberDiff line numberDiff line change
@@ -927,8 +927,13 @@ pub fn build_configuration(sess: &Session, mut user_cfg: CrateConfig) -> CrateCo
927927
user_cfg
928928
}
929929

930-
pub fn build_target_config(opts: &Options, target_override: Option<Target>, sysroot: &PathBuf) -> Target {
931-
let target_result = target_override.map_or_else(|| Target::search(&opts.target_triple, sysroot), Ok);
930+
pub fn build_target_config(
931+
opts: &Options,
932+
target_override: Option<Target>,
933+
sysroot: &PathBuf,
934+
) -> Target {
935+
let target_result =
936+
target_override.map_or_else(|| Target::search(&opts.target_triple, sysroot), Ok);
932937
let target = target_result.unwrap_or_else(|e| {
933938
early_error(
934939
opts.error_format,

compiler/rustc_target/src/spec/mod.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -1791,11 +1791,8 @@ impl Target {
17911791

17921792
// Additionally look in the sysroot under `lib/rustlib/<triple>/target.json`
17931793
// as a fallback.
1794-
let p = sysroot
1795-
.join("lib")
1796-
.join("rustlib")
1797-
.join(&target_triple)
1798-
.join("target.json");
1794+
let p =
1795+
sysroot.join("lib").join("rustlib").join(&target_triple).join("target.json");
17991796
if p.is_file() {
18001797
return load_file(&p);
18011798
}

0 commit comments

Comments
 (0)