Skip to content

Commit 1e57d7a

Browse files
committed
named-profiles: when -Z unstable-options not specified, don't validate --profile
Fixes #7488.
1 parent a429e8c commit 1e57d7a

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

src/cargo/util/command_prelude.rs

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -322,14 +322,22 @@ pub trait ArgMatchesExt {
322322
}
323323

324324
if self._is_present("release") {
325-
match specified_profile {
326-
None | Some(ProfileKind::Release) => Ok(ProfileKind::Release),
327-
_ => failure::bail!("Conflicting usage of --profile and --release"),
325+
if !config.cli_unstable().unstable_options {
326+
Ok(ProfileKind::Release)
327+
} else {
328+
match specified_profile {
329+
None | Some(ProfileKind::Release) => Ok(ProfileKind::Release),
330+
_ => failure::bail!("Conflicting usage of --profile and --release"),
331+
}
328332
}
329333
} else if self._is_present("debug") {
330-
match specified_profile {
331-
None | Some(ProfileKind::Dev) => Ok(ProfileKind::Dev),
332-
_ => failure::bail!("Conflicting usage of --profile and --debug"),
334+
if !config.cli_unstable().unstable_options {
335+
Ok(ProfileKind::Dev)
336+
} else {
337+
match specified_profile {
338+
None | Some(ProfileKind::Dev) => Ok(ProfileKind::Dev),
339+
_ => failure::bail!("Conflicting usage of --profile and --debug"),
340+
}
333341
}
334342
} else {
335343
Ok(specified_profile.unwrap_or(default))

0 commit comments

Comments
 (0)