Skip to content

Commit 6ec7ec9

Browse files
committed
correct the imports in flags, tests and download
1 parent edada36 commit 6ec7ec9

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

src/bootstrap/src/core/config/flags.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ use tracing::instrument;
1212
use crate::core::build_steps::perf::PerfArgs;
1313
use crate::core::build_steps::setup::Profile;
1414
use crate::core::builder::{Builder, Kind};
15-
use crate::core::config::{Config, TargetSelectionList, target_selection_list};
15+
use crate::core::config::Config;
16+
use crate::core::config::target_selection::{TargetSelectionList, target_selection_list};
1617
use crate::{Build, DocTests};
1718

1819
#[derive(Copy, Clone, Default, Debug, ValueEnum)]

src/bootstrap/src/core/config/tests.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ use clap::CommandFactory;
1010
use serde::Deserialize;
1111

1212
use super::flags::Flags;
13-
use super::{ChangeIdWrapper, Config, RUSTC_IF_UNCHANGED_ALLOWED_PATHS};
13+
use super::toml::change_id::ChangeIdWrapper;
14+
use super::{Config, RUSTC_IF_UNCHANGED_ALLOWED_PATHS};
1415
use crate::ChangeId;
1516
use crate::core::build_steps::clippy::{LintConfig, get_clippy_rules_in_order};
1617
use crate::core::build_steps::llvm;
1718
use crate::core::build_steps::llvm::LLVM_INVALIDATION_PATHS;
18-
use crate::core::config::{LldMode, Target, TargetSelection, TomlConfig};
19+
use crate::core::config::toml::TomlConfig;
20+
use crate::core::config::{LldMode, Target, TargetSelection};
1921
use crate::utils::tests::git::git_test;
2022

2123
pub(crate) fn parse(config: &str) -> Config {

src/bootstrap/src/core/download.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,7 @@ download-rustc = false
727727
use build_helper::git::PathFreshness;
728728

729729
use crate::core::build_steps::llvm::detect_llvm_freshness;
730-
use crate::core::config::check_incompatible_options_for_ci_llvm;
730+
use crate::core::config::toml::llvm::check_incompatible_options_for_ci_llvm;
731731

732732
if !self.llvm_from_ci {
733733
return;

0 commit comments

Comments
 (0)