Skip to content

Commit

Permalink
Auto merge of #12285 - weihanglo:remove-jobserver-per-rustc, r=ehuss
Browse files Browse the repository at this point in the history
fix: remove `-Zjobserver-per-rustc` again

It was accidentally added back in cfffda9
  • Loading branch information
bors committed Jun 19, 2023
2 parents 1fa8da2 + 51326c8 commit b81b251
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions src/cargo/core/features.rs
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,6 @@ unstable_cli_options!(
features: Option<Vec<String>> = (HIDDEN),
gitoxide: Option<GitoxideFeatures> = ("Use gitoxide for the given git interactions, or all of them if no argument is given"),
host_config: bool = ("Enable the [host] section in the .cargo/config.toml file"),
jobserver_per_rustc: bool = (HIDDEN),
lints: bool = ("Pass `[lints]` to the linting tools"),
minimal_versions: bool = ("Resolve minimal dependency versions instead of maximum"),
msrv_policy: bool = ("Enable rust-version aware policy within cargo"),
Expand Down Expand Up @@ -1111,7 +1110,6 @@ impl CliUnstable {
)?
}
"host-config" => self.host_config = parse_empty(k, v)?,
"jobserver-per-rustc" => self.jobserver_per_rustc = parse_empty(k, v)?,
"lints" => self.lints = parse_empty(k, v)?,
"next-lockfile-bump" => self.next_lockfile_bump = parse_empty(k, v)?,
"minimal-versions" => self.minimal_versions = parse_empty(k, v)?,
Expand Down

0 comments on commit b81b251

Please sign in to comment.