Skip to content

Commit 4250ea3

Browse files
committed
Correct the config test imports
1 parent ad21211 commit 4250ea3

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

src/bootstrap/src/core/config/parsing.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ impl Config {
314314
skip_all
315315
)
316316
)]
317-
pub(super) fn parse_inner(
317+
pub(crate) fn parse_inner(
318318
mut flags: Flags,
319319
get_toml: impl Fn(&Path) -> Result<TomlConfig, toml::de::Error>,
320320
) -> Config {

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::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/config/toml.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ impl<T> Merge for Option<T> {
280280
#[serde(deny_unknown_fields, rename_all = "kebab-case")]
281281
pub(crate) struct TomlConfig {
282282
#[serde(flatten)]
283-
pub(super) change_id: ChangeIdWrapper,
283+
pub(crate) change_id: ChangeIdWrapper,
284284
pub(super) build: Option<Build>,
285285
pub(super) install: Option<Install>,
286286
pub(super) llvm: Option<Llvm>,
@@ -304,9 +304,9 @@ pub enum ChangeId {
304304
/// that if deserialization fails due to other fields, we can still provide the changelogs
305305
/// to allow developers to potentially find the reason for the failure in the logs..
306306
#[derive(Deserialize, Default)]
307-
pub(super) struct ChangeIdWrapper {
307+
pub(crate) struct ChangeIdWrapper {
308308
#[serde(alias = "change-id", default, deserialize_with = "deserialize_change_id")]
309-
pub(super) inner: Option<ChangeId>,
309+
pub(crate) inner: Option<ChangeId>,
310310
}
311311

312312
fn deserialize_change_id<'de, D: Deserializer<'de>>(

0 commit comments

Comments
 (0)