Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add --profile empty support #2974

Closed
wants to merge 3 commits into from
Closed

Add --profile empty support #2974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9530adc
(profiles): Add support for `empty` profile
kinnison Apr 1, 2022
5bbd665
(tests): Ensure --profile empty works
kinnison Apr 1, 2022
60f279c
(test): We offer 'empty' now in the installer
kinnison Apr 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/dist/dist.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,7 @@ pub(crate) struct Manifest<'a>(temp::File<'a>, String);

#[derive(Debug, Clone, Copy, Hash, Eq, PartialEq)]
pub enum Profile {
Empty,
Minimal,
Default,
Complete,
Expand All @@ -508,6 +509,7 @@ impl FromStr for Profile {

fn from_str(name: &str) -> Result<Self> {
match name {
"empty" | "e" => Ok(Self::Empty),
"minimal" | "m" => Ok(Self::Minimal),
"default" | "d" | "" => Ok(Self::Default),
"complete" | "c" => Ok(Self::Complete),
Expand All @@ -522,7 +524,7 @@ impl FromStr for Profile {

impl Profile {
pub(crate) fn names() -> &'static [&'static str] {
&["minimal", "default", "complete"]
&["empty", "minimal", "default", "complete"]
}

pub(crate) fn default_name() -> &'static str {
Expand Down Expand Up @@ -579,6 +581,7 @@ impl fmt::Display for ToolchainDesc {
impl fmt::Display for Profile {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match *self {
Self::Empty => write!(f, "empty"),
Self::Minimal => write!(f, "minimal"),
Self::Default => write!(f, "default"),
Self::Complete => write!(f, "complete"),
Expand Down Expand Up @@ -813,8 +816,8 @@ fn try_update_from_dist_<'a>(
));

let profile_components = match profile {
Some(Profile::Empty) | None => Vec::new(),
Some(profile) => m.get_profile_components(profile, &toolchain.target)?,
None => Vec::new(),
};

let mut all_components: HashSet<Component> = profile_components.into_iter().collect();
Expand Down Expand Up @@ -854,6 +857,7 @@ fn try_update_from_dist_<'a>(
let changes = Changes {
explicit_add_components,
remove_components: Vec::new(),
permit_empty: profile == Some(Profile::Empty),
};

*fetched = m.date.clone();
Expand Down
3 changes: 2 additions & 1 deletion src/dist/manifestation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ pub struct Manifestation {
pub struct Changes {
pub explicit_add_components: Vec<Component>,
pub remove_components: Vec<Component>,
pub permit_empty: bool,
}

impl Changes {
Expand Down Expand Up @@ -118,7 +119,7 @@ impl Manifestation {
let mut update =
Update::build_update(self, new_manifest, &changes, &config, notify_handler)?;

if update.nothing_changes() {
if update.nothing_changes() && !changes.permit_empty {
return Ok(UpdateStatus::Unchanged);
}

Expand Down
2 changes: 2 additions & 0 deletions src/toolchain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,7 @@ impl<'a> DistributableToolchain<'a> {
let changes = Changes {
explicit_add_components: vec![component],
remove_components: vec![],
permit_empty: false,
};

desc.manifestation.update(
Expand Down Expand Up @@ -855,6 +856,7 @@ impl<'a> DistributableToolchain<'a> {
let changes = Changes {
explicit_add_components: vec![],
remove_components: vec![component],
permit_empty: false,
};

desc.manifestation.update(
Expand Down
4 changes: 2 additions & 2 deletions tests/cli-inst-interactive.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ fn installer_shows_default_profile() {
println!("-- stderr --\n {}", out.stderr);
assert!(out.stdout.contains(
r"
Profile (which tools and data to install)? (minimal/default/complete) [default]
Profile (which tools and data to install)? (empty/minimal/default/complete) [default]
"
));
});
Expand All @@ -234,7 +234,7 @@ fn installer_shows_default_profile_when_set_in_args() {
println!("-- stderr --\n {}", out.stderr);
assert!(out.stdout.contains(
r"
Profile (which tools and data to install)? (minimal/default/complete) [minimal]
Profile (which tools and data to install)? (empty/minimal/default/complete) [minimal]
"
));
});
Expand Down
132 changes: 132 additions & 0 deletions tests/cli-v2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1536,3 +1536,135 @@ fn regression_2601() {
);
});
}

#[test]
fn empty_profile_can_be_installed() {
setup(&|config| {
expect_ok(
config,
&[
"rustup",
"toolchain",
"install",
"--profile",
"empty",
"nightly",
],
);
// In theory there should be no installed components, but the toolchain should be present
expect_ok_ex(
config,
&[
"rustup",
"component",
"list",
"--installed",
"--toolchain",
"nightly",
],
"",
"",
);
});
}

#[test]
fn empty_profile_can_be_uninstalled() {
setup(&|config| {
expect_ok(
config,
&[
"rustup",
"toolchain",
"install",
"--profile",
"empty",
"nightly",
],
);
// In theory there should be no installed components, but the toolchain should be present
expect_ok(config, &["rustup", "toolchain", "uninstall", "nightly"]);
});
}

#[test]
fn empty_profile_can_manipulate_components() {
setup(&|config| {
expect_ok(
config,
&[
"rustup",
"toolchain",
"install",
"--profile",
"empty",
"nightly",
],
);
// In theory there should be no installed components, but the toolchain should be present
expect_ok_ex(
config,
&[
"rustup",
"component",
"list",
"--installed",
"--toolchain",
"nightly",
],
"",
"",
);
// Install rust-src and check for it
expect_ok(
config,
&[
"rustup",
"component",
"add",
"--toolchain",
"nightly",
"rust-src",
],
);
expect_ok_ex(
config,
&[
"rustup",
"component",
"list",
"--installed",
"--toolchain",
"nightly",
],
"rust-src\n",
"",
);

// Remove rust-src and check we're back to blank
expect_ok(
config,
&[
"rustup",
"component",
"remove",
"--toolchain",
"nightly",
"rust-src",
],
);
expect_ok_ex(
config,
&[
"rustup",
"component",
"list",
"--installed",
"--toolchain",
"nightly",
],
"",
"",
);
});
}
1 change: 1 addition & 0 deletions tests/dist.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,7 @@ fn update_from_dist(
let changes = Changes {
explicit_add_components: add_components,
remove_components: remove.to_owned(),
permit_empty: false,
};

manifestation.update(
Expand Down