Skip to content

Commit 3c6f6f0

Browse files
committed
Fix tidy checks
1 parent 6e4d023 commit 3c6f6f0

File tree

4 files changed

+24
-9
lines changed

4 files changed

+24
-9
lines changed

src/librustc_target/spec/aarch64_uwp_windows_msvc.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,14 @@ pub fn target() -> TargetResult {
99
// FIXME: this shouldn't be panic=abort, it should be panic=unwind
1010
base.panic_strategy = PanicStrategy::Abort;
1111

12-
let lib_root_path = env::var("VCToolsInstallDir").expect("VCToolsInstallDir not found in env");
12+
let lib_root_path = env::var("VCToolsInstallDir")
13+
.expect("VCToolsInstallDir not found in env");
14+
1315
base.pre_link_args.get_mut(&LinkerFlavor::Msvc).unwrap()
14-
.push(format!("{}{}{}", "/LIBPATH:".to_string(), lib_root_path, "lib\\arm64\\store".to_string()));
16+
.push(format!("{}{}{}",
17+
"/LIBPATH:".to_string(),
18+
lib_root_path,
19+
"lib\\arm64\\store".to_string()));
1520

1621
Ok(Target {
1722
llvm_target: "aarch64-pc-windows-msvc".to_string(),

src/librustc_target/spec/i686_uwp_windows_msvc.rs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,14 @@ pub fn target() -> TargetResult {
77
base.max_atomic_width = Some(64);
88
base.has_elf_tls = true;
99

10-
let lib_root_path = env::var("VCToolsInstallDir").expect("VCToolsInstallDir not found in env");
10+
let lib_root_path = env::var("VCToolsInstallDir")
11+
.expect("VCToolsInstallDir not found in env");
12+
1113
base.pre_link_args.get_mut(&LinkerFlavor::Msvc).unwrap()
12-
.push(format!("{}{}{}", "/LIBPATH:".to_string(), lib_root_path, "lib\\x86\\store".to_string()));
14+
.push(format!("{}{}{}",
15+
"/LIBPATH:".to_string(),
16+
lib_root_path,
17+
"lib\\x86\\store".to_string()));
1318

1419
Ok(Target {
1520
llvm_target: "i686-pc-windows-msvc".to_string(),
@@ -24,4 +29,4 @@ pub fn target() -> TargetResult {
2429
linker_flavor: LinkerFlavor::Msvc,
2530
options: base,
2631
})
27-
}
32+
}

src/librustc_target/spec/windows_uwp_msvc_base.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ pub fn opts() -> TargetOptions {
3030

3131
.. Default::default()
3232
}
33-
}
33+
}

src/librustc_target/spec/x86_64_uwp_windows_msvc.rs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,14 @@ pub fn target() -> TargetResult {
77
base.max_atomic_width = Some(64);
88
base.has_elf_tls = true;
99

10-
let lib_root_path = env::var("VCToolsInstallDir").expect("VCToolsInstallDir not found in env");
10+
let lib_root_path = env::var("VCToolsInstallDir")
11+
.expect("VCToolsInstallDir not found in env");
12+
1113
base.pre_link_args.get_mut(&LinkerFlavor::Msvc).unwrap()
12-
.push(format!("{}{}{}", "/LIBPATH:".to_string(), lib_root_path, "lib\\x64\\store".to_string()));
14+
.push(format!("{}{}{}",
15+
"/LIBPATH:".to_string(),
16+
lib_root_path,
17+
"lib\\x64\\store".to_string()));
1318

1419
Ok(Target {
1520
llvm_target: "x86_64-pc-windows-msvc".to_string(),
@@ -24,4 +29,4 @@ pub fn target() -> TargetResult {
2429
linker_flavor: LinkerFlavor::Msvc,
2530
options: base,
2631
})
27-
}
32+
}

0 commit comments

Comments
 (0)