Skip to content

Don't overwrite existing rustdoc args with --document-private-items #8449

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

Merged
bors merged 3 commits into from
Jul 6, 2020
Merged

Don't overwrite existing rustdoc args with --document-private-items #8449

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb95188
Don't overwrite existing `rustdoc` args with --document-private-items
jyn514 Jul 4, 2020
0a975e9
Use a stable rustdoc option for testing
jyn514 Jul 4, 2020
1d1b344
Use entry API instead of a match
jyn514 Jul 4, 2020
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
9 changes: 7 additions & 2 deletions src/cargo/ops/cargo_compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,8 +475,13 @@ pub fn create_bcx<'a, 'cfg>(
extra_args = Some(args);
}

if let Some(args) = extra_args {
extra_compiler_args.insert(unit.clone(), args.clone());
if let Some(mut args) = extra_args {
match extra_compiler_args.get_mut(&unit) {
None => {
extra_compiler_args.insert(unit.clone(), args);
}
Some(existing) => existing.append(&mut args),
}
}
}
}
Expand Down
13 changes: 13 additions & 0 deletions tests/testsuite/rustdoc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,19 @@ fn rustdoc_args() {
.run();
}

#[cargo_test]
fn rustdoc_binary_args_passed() {
let p = project().file("src/main.rs", "").build();

p.cargo("rustdoc -v")
.arg("--")
.arg("--theme")
.arg("dark")
.with_stderr_contains("[RUNNING] `rustdoc [..] --theme dark[..]`")
.with_status(101)
.run();
}

#[cargo_test]
fn rustdoc_foo_with_bar_dependency() {
let foo = project()
Expand Down