diff options
| author | Dylan DPC <99973273+Dylan-DPC@users.noreply.github.com> | 2023-05-20 12:20:59 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-20 12:20:59 +0530 |
| commit | fa11c9e8ca4e8bf6d1e7d916bb7c0da934d3ded3 (patch) | |
| tree | f2c873ba1aae2db17d37239a7bab125bd0488b0e /src | |
| parent | 2294d81fb3998706784c277154caa772d2bff03c (diff) | |
| parent | 04265621f9a82cfc2fc2278b935dcc5d4a1c39b7 (diff) | |
| download | rust-fa11c9e8ca4e8bf6d1e7d916bb7c0da934d3ded3.tar.gz rust-fa11c9e8ca4e8bf6d1e7d916bb7c0da934d3ded3.zip | |
Rollup merge of #111606 - jyn514:nightly-diagnostics, r=lcnr
very minor cleanups - add `must_use` to `early_error_no_abort` this was already being used at its only callsite, but this ensures that new code remembers to use it if it's called in the future. found this while investigating https://github.com/rust-lang/rust/issues/110090. - remove outdated and incorrect comment in `builder.rs`. `doc_rust_lang_org_channel` doesn't exist in rustdoc, it gets it from an env var instead: https://github.com/rust-lang/rust/blob/b275d2c30b6e88cc48747f349f7137076d450658/src/librustdoc/clean/utils.rs#L569-L573
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/builder.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 5c37fab5470..cf7c6596c02 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -942,7 +942,6 @@ impl<'a> Builder<'a> { self.run_step_descriptions(&Builder::get_step_descriptions(Kind::Doc), paths); } - /// NOTE: keep this in sync with `rustdoc::clean::utils::doc_rust_lang_org_channel`, or tests will fail on beta/stable. pub fn doc_rust_lang_org_channel(&self) -> String { let channel = match &*self.config.channel { "stable" => &self.version, |