File tree Expand file tree Collapse file tree 3 files changed +8
-6
lines changed
src/bootstrap/src/core/config Expand file tree Collapse file tree 3 files changed +8
-6
lines changed Original file line number Diff line number Diff line change @@ -314,7 +314,7 @@ impl Config {
314
314
skip_all
315
315
)
316
316
) ]
317
- pub ( super ) fn parse_inner (
317
+ pub ( crate ) fn parse_inner (
318
318
mut flags : Flags ,
319
319
get_toml : impl Fn ( & Path ) -> Result < TomlConfig , toml:: de:: Error > ,
320
320
) -> Config {
Original file line number Diff line number Diff line change @@ -10,12 +10,14 @@ use clap::CommandFactory;
10
10
use serde:: Deserialize ;
11
11
12
12
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 } ;
14
15
use crate :: ChangeId ;
15
16
use crate :: core:: build_steps:: clippy:: { LintConfig , get_clippy_rules_in_order} ;
16
17
use crate :: core:: build_steps:: llvm;
17
18
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 } ;
19
21
use crate :: utils:: tests:: git:: git_test;
20
22
21
23
pub ( crate ) fn parse ( config : & str ) -> Config {
Original file line number Diff line number Diff line change @@ -280,7 +280,7 @@ impl<T> Merge for Option<T> {
280
280
#[ serde( deny_unknown_fields, rename_all = "kebab-case" ) ]
281
281
pub ( crate ) struct TomlConfig {
282
282
#[ serde( flatten) ]
283
- pub ( super ) change_id : ChangeIdWrapper ,
283
+ pub ( crate ) change_id : ChangeIdWrapper ,
284
284
pub ( super ) build : Option < Build > ,
285
285
pub ( super ) install : Option < Install > ,
286
286
pub ( super ) llvm : Option < Llvm > ,
@@ -304,9 +304,9 @@ pub enum ChangeId {
304
304
/// that if deserialization fails due to other fields, we can still provide the changelogs
305
305
/// to allow developers to potentially find the reason for the failure in the logs..
306
306
#[ derive( Deserialize , Default ) ]
307
- pub ( super ) struct ChangeIdWrapper {
307
+ pub ( crate ) struct ChangeIdWrapper {
308
308
#[ serde( alias = "change-id" , default , deserialize_with = "deserialize_change_id" ) ]
309
- pub ( super ) inner : Option < ChangeId > ,
309
+ pub ( crate ) inner : Option < ChangeId > ,
310
310
}
311
311
312
312
fn deserialize_change_id < ' de , D : Deserializer < ' de > > (
You can’t perform that action at this time.
0 commit comments