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 {
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 {
Original file line number Diff line number Diff line change @@ -10,12 +10,14 @@ use clap::CommandFactory;
1010use serde:: Deserialize ;
1111
1212use 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 } ;
1415use crate :: ChangeId ;
1516use crate :: core:: build_steps:: clippy:: { LintConfig , get_clippy_rules_in_order} ;
1617use crate :: core:: build_steps:: llvm;
1718use 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 } ;
1921use crate :: utils:: tests:: git:: git_test;
2022
2123pub ( 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> {
280280#[ serde( deny_unknown_fields, rename_all = "kebab-case" ) ]
281281pub ( 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
312312fn deserialize_change_id < ' de , D : Deserializer < ' de > > (
You can’t perform that action at this time.
0 commit comments