diff options
| author | bors <bors@rust-lang.org> | 2020-12-19 07:23:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-12-19 07:23:41 +0000 |
| commit | e461b8137f8f7277147e3ec8ec0b7f0f31d32d0b (patch) | |
| tree | d929dd3bd4250c409cd6e5d06e5afef1d859fa5a /compiler/rustc_errors/src | |
| parent | 3d9ada686fb42bd036b3a4916526f413f1d5d1f8 (diff) | |
| parent | b27c78390c4c2cce26b3a48646895e09d0e9420d (diff) | |
| download | rust-e461b8137f8f7277147e3ec8ec0b7f0f31d32d0b.tar.gz rust-e461b8137f8f7277147e3ec8ec0b7f0f31d32d0b.zip | |
Auto merge of #80180 - JohnTitor:rollup-a31s996, r=JohnTitor
Rollup of 7 pull requests Successful merges: - #78083 (Stabilize or_insert_with_key) - #79211 (Add the "async" and "promise" doc aliases to `core::future::Future`) - #79612 (Switch some links in compiler/ to intra-doc links) - #80068 (Add `&mut` as an alias for 'reference' primitive) - #80129 (docs: Edit rustc_ast::token::Token) - #80133 (Suppress `CONST_ITEM_MUTATION` lint if a dereference occurs anywhere) - #80155 (Fix typo) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/diagnostic.rs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/compiler/rustc_errors/src/diagnostic.rs b/compiler/rustc_errors/src/diagnostic.rs index 538e1a59ab8..e61476bf23e 100644 --- a/compiler/rustc_errors/src/diagnostic.rs +++ b/compiler/rustc_errors/src/diagnostic.rs @@ -138,8 +138,6 @@ impl Diagnostic { /// /// This span is *not* considered a ["primary span"][`MultiSpan`]; only /// the `Span` supplied when creating the diagnostic is primary. - /// - /// [`MultiSpan`]: ../rustc_span/struct.MultiSpan.html pub fn span_label<T: Into<String>>(&mut self, span: Span, label: T) -> &mut Self { self.span.push_span_label(span, label.into()); self |