diff options
| author | bors <bors@rust-lang.org> | 2023-11-25 00:04:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-11-25 00:04:04 +0000 |
| commit | 2a48155aec535e140b10cb2553673ced43c6e148 (patch) | |
| tree | 85938f549386ee5e19e5adaaf005e48f4517e242 | |
| parent | 37b2813a7be580ef59048a6bd08444c79e5cc97f (diff) | |
| parent | 879aff9cf0419b3e0c1b656f8d9b780d641ea9a9 (diff) | |
| download | rust-2a48155aec535e140b10cb2553673ced43c6e148.tar.gz rust-2a48155aec535e140b10cb2553673ced43c6e148.zip | |
Auto merge of #118235 - psumbera:bootstrap-main-t, r=Mark-Simulacrum
Fix build on Solaris after #117815.
| -rw-r--r-- | src/bootstrap/src/bin/main.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bootstrap/src/bin/main.rs b/src/bootstrap/src/bin/main.rs index 35010bea818..7e6fdb7092d 100644 --- a/src/bootstrap/src/bin/main.rs +++ b/src/bootstrap/src/bin/main.rs @@ -14,9 +14,9 @@ use std::{ io::{self, IsTerminal}, }; -#[cfg(all(any(unix, windows), not(target_os = "solaris")))] -use bootstrap::t; -use bootstrap::{find_recent_config_change_ids, Build, Config, Subcommand, CONFIG_CHANGE_HISTORY}; +use bootstrap::{ + find_recent_config_change_ids, t, Build, Config, Subcommand, CONFIG_CHANGE_HISTORY, +}; fn main() { let args = env::args().skip(1).collect::<Vec<_>>(); |