From 258fd8974e66ae4e5bb243954bcf856ddd9204d4 Mon Sep 17 00:00:00 2001 From: Shivani Bhardwaj Date: Thu, 9 Dec 2021 23:05:08 +0530 Subject: [PATCH 1/3] Add deprecation warning for --passes --- src/librustdoc/config.rs | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/librustdoc/config.rs b/src/librustdoc/config.rs index 04bcade156a9d..2c917e0f49687 100644 --- a/src/librustdoc/config.rs +++ b/src/librustdoc/config.rs @@ -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 { @@ -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(',') { From e472fea0789f202c0a1019e08b7fa041d36c355b Mon Sep 17 00:00:00 2001 From: Shivani Bhardwaj Date: Thu, 9 Dec 2021 23:46:13 +0530 Subject: [PATCH 2/3] Add test for deprecation warning for --passes --- src/test/rustdoc-ui/issue-91713.rs | 2 ++ src/test/rustdoc-ui/issue-91713.stderr | 4 ++++ src/test/rustdoc-ui/issue-91713.stdout | 31 ++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 src/test/rustdoc-ui/issue-91713.rs create mode 100644 src/test/rustdoc-ui/issue-91713.stderr create mode 100644 src/test/rustdoc-ui/issue-91713.stdout diff --git a/src/test/rustdoc-ui/issue-91713.rs b/src/test/rustdoc-ui/issue-91713.rs new file mode 100644 index 0000000000000..a7f8270e4be88 --- /dev/null +++ b/src/test/rustdoc-ui/issue-91713.rs @@ -0,0 +1,2 @@ +// check-pass +// compile-flags: --passes list diff --git a/src/test/rustdoc-ui/issue-91713.stderr b/src/test/rustdoc-ui/issue-91713.stderr new file mode 100644 index 0000000000000..70c22b3c01e9e --- /dev/null +++ b/src/test/rustdoc-ui/issue-91713.stderr @@ -0,0 +1,4 @@ +warning: the `passes` flag is deprecated + | + = note: see issue #44136 for more information + diff --git a/src/test/rustdoc-ui/issue-91713.stdout b/src/test/rustdoc-ui/issue-91713.stdout new file mode 100644 index 0000000000000..d0372d4945f3a --- /dev/null +++ b/src/test/rustdoc-ui/issue-91713.stdout @@ -0,0 +1,31 @@ +Available passes for running rustdoc: +check_doc_test_visibility - run various visibility-related lints on doctests + strip-hidden - strips all `#[doc(hidden)]` items from the output + unindent-comments - removes excess indentation on comments in order for markdown to like it + strip-private - strips all private items from a crate which cannot be seen externally, implies strip-priv-imports + strip-priv-imports - strips all private import statements (`use`, `extern crate`) from a crate + propagate-doc-cfg - propagates `#[doc(cfg(...))]` to child items +collect-intra-doc-links - resolves intra-doc links +check-code-block-syntax - validates syntax inside Rust code blocks + collect-trait-impls - retrieves trait impls for items in the crate +calculate-doc-coverage - counts the number of items with and without documentation +check-invalid-html-tags - detects invalid HTML tags in doc comments + check-bare-urls - detects URLs that are not hyperlinks + +Default passes for rustdoc: + collect-trait-impls + unindent-comments +check_doc_test_visibility + strip-hidden (when not --document-hidden-items) + strip-private (when not --document-private-items) + strip-priv-imports (when --document-private-items) +collect-intra-doc-links +check-code-block-syntax +check-invalid-html-tags + propagate-doc-cfg + check-bare-urls + +Passes run with `--show-coverage`: + strip-hidden (when not --document-hidden-items) + strip-private (when not --document-private-items) +calculate-doc-coverage From 2b6987d91fda4d47415914acc54afc26be837ac2 Mon Sep 17 00:00:00 2001 From: Shivani Bhardwaj <57791542+inashivb@users.noreply.github.com> Date: Fri, 10 Dec 2021 00:08:24 +0530 Subject: [PATCH 3/3] Update src/test/rustdoc-ui/issue-91713.rs Co-authored-by: Joshua Nelson --- src/test/rustdoc-ui/issue-91713.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/rustdoc-ui/issue-91713.rs b/src/test/rustdoc-ui/issue-91713.rs index a7f8270e4be88..b7057d868c275 100644 --- a/src/test/rustdoc-ui/issue-91713.rs +++ b/src/test/rustdoc-ui/issue-91713.rs @@ -1,2 +1,3 @@ // check-pass // compile-flags: --passes list +// error-pattern: the `passes` flag is deprecated