Skip to content

Rollup of 8 pull requests #99165

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 19 commits into from
Jul 12, 2022
Merged

Rollup of 8 pull requests #99165

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
34e9e6d
Fix duplicated type annotation suggestion
danobi Jul 9, 2022
f0a99f9
Fixup diagnostic-derive test
danobi Jul 9, 2022
6c44357
fix(doctest): treat fatal parse errors as incomplete attributes
notriddle Jul 11, 2022
033a025
Don't rerun the build script for the compiler each time on linux
jyn514 Jul 11, 2022
0c39762
Use fake substs to check for `Self: Sized` predicates on method recei…
compiler-errors Jul 11, 2022
88f2140
Do not suggest same trait over again
compiler-errors Jul 11, 2022
e3d84b2
clippy argument support
Milo123459 Jul 11, 2022
992346d
Fix rustdoc -Zhelp and -Chelp options
GuillaumeGomez Jul 8, 2022
b65d3a6
Add tests for -Chelp and -Zhelp
GuillaumeGomez Jul 8, 2022
29c128a
compiletest: trim edition before passing as flag
fee1-dead Jul 11, 2022
5c6560f
Fix sized check ICE in intrisicck
compiler-errors Jul 10, 2022
601c5a2
Rollup merge of #97210 - Milo123459:clippy-args, r=jyn514
matthiaskrgr Jul 11, 2022
c431e6f
Rollup merge of #99055 - GuillaumeGomez:rustdoc-help-options, r=jyn514
matthiaskrgr Jul 11, 2022
d89c183
Rollup merge of #99075 - danobi:dup_type_hint_sugg, r=petrochenkov
matthiaskrgr Jul 11, 2022
7151aaf
Rollup merge of #99124 - compiler-errors:issue-99122, r=oli-obk
matthiaskrgr Jul 11, 2022
24d241a
Rollup merge of #99142 - notriddle:notriddle/doctest-multiline-crate-…
matthiaskrgr Jul 11, 2022
1679d1c
Rollup merge of #99145 - jyn514:dont-rerun-build-script, r=wesleywiser
matthiaskrgr Jul 11, 2022
5e223dc
Rollup merge of #99146 - compiler-errors:issue-61525, r=lcnr
matthiaskrgr Jul 11, 2022
c05e277
Rollup merge of #99161 - fee1-dead-contrib:compile-test-edition-trim,…
matthiaskrgr Jul 11, 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
Prev Previous commit
Next Next commit
Fix rustdoc -Zhelp and -Chelp options
  • Loading branch information
@GuillaumeGomez
GuillaumeGomez committed Jul 11, 2022
commit 992346d7bd2d15bb0b1ce39b76e294c91aa70b44
22 changes: 11 additions & 11 deletions src/librustdoc/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,17 @@ impl Options {
return Err(0);
}

let z_flags = matches.opt_strs("Z");
if z_flags.iter().any(|x| *x == "help") {
print_flag_list("-Z", config::DB_OPTIONS);
return Err(0);
}
let c_flags = matches.opt_strs("C");
if c_flags.iter().any(|x| *x == "help") {
print_flag_list("-C", config::CG_OPTIONS);
return Err(0);
}

let color = config::parse_color(matches);
let config::JsonConfig { json_rendered, json_unused_externs, .. } =
config::parse_json(matches);
Expand All @@ -343,17 +354,6 @@ impl Options {
// check for deprecated options
check_deprecated_options(matches, &diag);

let z_flags = matches.opt_strs("Z");
if z_flags.iter().any(|x| *x == "help") {
print_flag_list("-Z", config::DB_OPTIONS);
return Err(0);
}
let c_flags = matches.opt_strs("C");
if c_flags.iter().any(|x| *x == "help") {
print_flag_list("-C", config::CG_OPTIONS);
return Err(0);
}

if matches.opt_strs("passes") == ["list"] {
println!("Available passes for running rustdoc:");
for pass in passes::PASSES {
Expand Down