Skip to content

Commit

Permalink
Remove now unused context arg
Browse files Browse the repository at this point in the history
  • Loading branch information
Urgau committed May 6, 2022
1 parent cf496db commit 6f2fae1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/cargo/core/compiler/context/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
let mut unstable_opts = false;
let mut args = compiler::extern_args(&self, unit, &mut unstable_opts)?;
args.extend(compiler::lto_args(&self, unit));
args.extend(compiler::features_args(&self, unit));
args.extend(compiler::features_args(unit));
args.extend(compiler::check_cfg_args(&self, unit));

let script_meta = self.find_build_script_metadata(unit);
Expand Down
6 changes: 3 additions & 3 deletions src/cargo/core/compiler/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ fn rustdoc(cx: &mut Context<'_, '_>, unit: &Unit) -> CargoResult<Work> {
paths::create_dir_all(&doc_dir)?;

rustdoc.arg("-o").arg(&doc_dir);
rustdoc.args(&features_args(cx, unit));
rustdoc.args(&features_args(unit));
rustdoc.args(&check_cfg_args(cx, unit));

add_error_format_and_color(cx, &mut rustdoc);
Expand Down Expand Up @@ -966,7 +966,7 @@ fn build_base_args(
cmd.arg("--cfg").arg("test");
}

cmd.args(&features_args(cx, unit));
cmd.args(&features_args(unit));
cmd.args(&check_cfg_args(cx, unit));

let meta = cx.files().metadata(unit);
Expand Down Expand Up @@ -1042,7 +1042,7 @@ fn build_base_args(
}

/// All active features for the unit passed as --cfg
fn features_args(_cx: &Context<'_, '_>, unit: &Unit) -> Vec<OsString> {
fn features_args(unit: &Unit) -> Vec<OsString> {
let mut args = Vec::with_capacity(unit.features.len() * 2);

for feat in &unit.features {
Expand Down

0 comments on commit 6f2fae1

Please sign in to comment.