bootstrap: Rename profile = user to profile = dist

@cuviper

config.user.toml currently says:

rust/src/bootstrap/defaults/config.user.toml

    
           # These defaults are meant for users and distro maintainers building from source, without intending to make multiple changes.

"users" is so ambiguous as to be meaningless. What I originally intended was something like "people building from source once and installing it locally", like Gentoo users or something. I think "dist" is a much better name for this profile: it makes it more clear why CI uses the profile and it hopefully will make it easier for distros to find and understand.

cc @cuviper - you said in https://rust-lang.zulipchat.com/#narrow/stream/233931-t-compiler.2Fmajor-changes/topic/Redesign.20bootstrap.20stages.20compiler-team.23619/near/351408631 this would be helpful, do you still think that? The only other name I can think of is something like install but I'm not sure that's a good description of what CI is doing with the profile.

Mentoring instructions: I want to do this in a backwards compatible way, so that old config files keep working seamlessly. To do this you'll need to add a way to add aliases to profiles. Take a look around

rust/src/bootstrap/config.rs

Lines 994 to 1002 in 5e2969e

    
           if let Some(include) = &toml.profile { 
        
               let mut include_path = config.src.clone(); 
        
               include_path.push("src"); 
        
               include_path.push("bootstrap"); 
        
               include_path.push("defaults"); 
        
               include_path.push(format!("config.{}.toml", include)); 
        
               let included_toml = get_toml(&include_path); 
        
               toml.merge(included_toml); 
        
           }

and change it to treat user the same as dist. Then rename the relevant places around

rust/src/bootstrap/setup.rs

Line 23 in a90e7d4

User,

Please add a test in src/bootstrap/config/tests.rs once you're done.

rust-lang#112074

@Swarnlataaa

@AnakinSkywalkeer you should talk to @Swarnlataaa - they have #112078 open but it's broken, I'm not sure of the status.

Rollup merge of rust-lang#112166 - AnakinSkywalkeer:master, r=clubby789

this wasn't done properly #112166 (comment)

@AnakinSkywalkeer Hi! Are you planning to continue working on this issue?

Rollup merge of rust-lang#113068 - clubby789:bootstrap-user-to-dist, …

Navigation Menu

Repository navigation

bootstrap: Rename `profile = user` to `profile = dist` #112074

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

	if let Some(include) = &toml.profile {
	let mut include_path = config.src.clone();
	include_path.push("src");
	include_path.push("bootstrap");
	include_path.push("defaults");
	include_path.push(format!("config.{}.toml", include));
	let included_toml = get_toml(&include_path);
	toml.merge(included_toml);
	}

bootstrap: Rename profile = user to profile = dist #112074

Description

Activity

jyn514 commented on May 29, 2023

jyn514 commented on May 31, 2023

jyn514 commented on Jun 3, 2023

zephaniahong commented on Jun 23, 2023

Metadata

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

Issue actions

bootstrap: Rename `profile = user` to `profile = dist` #112074