Skip to content

Rollup of 7 pull requests #91792

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
merged 19 commits into from
Dec 11, 2021
Merged

Rollup of 7 pull requests #91792

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
6e7ec0c
Simplify collect_in_band_defs.
cjgillot Nov 12, 2021
72b6f70
Use collect_in_band_defs for async lifetime captures.
cjgillot Nov 29, 2021
8576ab4
Store impl_trait_fn inside OpaqueTyOrigin.
cjgillot Nov 30, 2021
54ff721
Simplify match.
cjgillot Dec 7, 2021
e36da67
rustdoc: Show type layout for type aliases
camelid Dec 9, 2021
769a707
Improve the readability of `List<T>`.
nnethercote Dec 7, 2021
258fd89
Add deprecation warning for --passes
inashivb Dec 9, 2021
e472fea
Add test for deprecation warning for --passes
inashivb Dec 9, 2021
2b6987d
Update src/test/rustdoc-ui/issue-91713.rs
inashivb Dec 9, 2021
7d18a45
give more help in the unaligned_references lint
RalfJung Dec 9, 2021
c78fb62
Improve std::iter::zip example.
Dec 9, 2021
8fafb77
Correct since attribute for feature
maxwase Dec 11, 2021
1de7815
Rollup merge of #91617 - nnethercote:improve-List-readability, r=lcnr
matthiaskrgr Dec 11, 2021
7083f8e
Rollup merge of #91640 - cjgillot:in-band-collect, r=oli-obk
matthiaskrgr Dec 11, 2021
33ebf4d
Rollup merge of #91682 - camelid:alias-layout, r=jyn514
matthiaskrgr Dec 11, 2021
94ac197
Rollup merge of #91711 - andrewbanchich:improve-zip-example, r=Mark-S…
matthiaskrgr Dec 11, 2021
ceae1dd
Rollup merge of #91717 - inashivb:issue-91713, r=jyn514
matthiaskrgr Dec 11, 2021
bc0269d
Rollup merge of #91718 - RalfJung:unaligned_references, r=nagisa
matthiaskrgr Dec 11, 2021
bb23d82
Rollup merge of #91782 - maxwase:is_symlink_since_attribute, r=jyn514
matthiaskrgr Dec 11, 2021
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
Add deprecation warning for --passes
  • Loading branch information
@inashivb
inashivb committed Dec 9, 2021
commit 258fd8974e66ae4e5bb243954bcf856ddd9204d4
26 changes: 13 additions & 13 deletions src/librustdoc/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,19 @@ impl Options {
return Err(0);
}

let color = config::parse_color(matches);
let config::JsonConfig { json_rendered, json_unused_externs, .. } =
config::parse_json(matches);
let error_format = config::parse_error_format(matches, color, json_rendered);

let codegen_options = CodegenOptions::build(matches, error_format);
let debugging_opts = DebuggingOptions::build(matches, error_format);

let diag = new_handler(error_format, None, &debugging_opts);

// check for deprecated options
check_deprecated_options(matches, &diag);

if matches.opt_strs("passes") == ["list"] {
println!("Available passes for running rustdoc:");
for pass in passes::PASSES {
Expand Down Expand Up @@ -359,19 +372,6 @@ impl Options {
return Err(0);
}

let color = config::parse_color(matches);
let config::JsonConfig { json_rendered, json_unused_externs, .. } =
config::parse_json(matches);
let error_format = config::parse_error_format(matches, color, json_rendered);

let codegen_options = CodegenOptions::build(matches, error_format);
let debugging_opts = DebuggingOptions::build(matches, error_format);

let diag = new_handler(error_format, None, &debugging_opts);

// check for deprecated options
check_deprecated_options(matches, &diag);

let mut emit = Vec::new();
for list in matches.opt_strs("emit") {
for kind in list.split(',') {
Expand Down