Skip to content

Commit 2a48155

Browse files
committed
Auto merge of rust-lang#118235 - psumbera:bootstrap-main-t, r=Mark-Simulacrum
Fix build on Solaris after rust-lang#117815.
2 parents 37b2813 + 879aff9 commit 2a48155

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/bootstrap/src/bin/main.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ use std::{
1414
io::{self, IsTerminal},
1515
};
1616

17-
#[cfg(all(any(unix, windows), not(target_os = "solaris")))]
18-
use bootstrap::t;
19-
use bootstrap::{find_recent_config_change_ids, Build, Config, Subcommand, CONFIG_CHANGE_HISTORY};
17+
use bootstrap::{
18+
find_recent_config_change_ids, t, Build, Config, Subcommand, CONFIG_CHANGE_HISTORY,
19+
};
2020

2121
fn main() {
2222
let args = env::args().skip(1).collect::<Vec<_>>();

0 commit comments

Comments
 (0)