about summary refs log tree commit diff
path: root/src/librustdoc/passes/check_code_block_syntax.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-09-14 02:19:28 +0000
committerbors <bors@rust-lang.org>2019-09-14 02:19:28 +0000
commitfdd48565d0c8a9e6fedd8c6db951ee46577b5f54 (patch)
tree5d5b9d1cae0f42ae984aa492c94d820461e88145 /src/librustdoc/passes/check_code_block_syntax.rs
parentd097af105526a8defe413c64d79766333bb2085b (diff)
parente0862784a1550dc1e07249c8967179a09b091141 (diff)
downloadrust-fdd48565d0c8a9e6fedd8c6db951ee46577b5f54.tar.gz
rust-fdd48565d0c8a9e6fedd8c6db951ee46577b5f54.zip
Auto merge of #64438 - cuviper:beta-rollup, r=Mark-Simulacrum
[beta] Rollup backports

Cherry-picked:

- Permit unwinding through FFI by default #62603
- pprust: Do not print spaces before some tokens #63897
- Account for doc comments coming from proc macros without spans #63930
- Support "soft" feature-gating using a lint #64066
- Update xLTO compatibility table in rustc book. #64092
- Include compiler-rt in the source tarball #64240
- Update LLVM submodule #64317

r? @Mark-Simulacrum
Diffstat (limited to 'src/librustdoc/passes/check_code_block_syntax.rs')
-rw-r--r--src/librustdoc/passes/check_code_block_syntax.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustdoc/passes/check_code_block_syntax.rs b/src/librustdoc/passes/check_code_block_syntax.rs
index 357e17d2d1b..67aa014a788 100644
--- a/src/librustdoc/passes/check_code_block_syntax.rs
+++ b/src/librustdoc/passes/check_code_block_syntax.rs
@@ -69,7 +69,7 @@ impl<'a, 'tcx> SyntaxChecker<'a, 'tcx> {
                 // We couldn't calculate the span of the markdown block that had the error, so our
                 // diagnostics are going to be a bit lacking.
                 let mut diag = self.cx.sess().struct_span_warn(
-                    super::span_of_attrs(&item.attrs),
+                    super::span_of_attrs(&item.attrs).unwrap_or(item.source.span()),
                     "doc comment contains an invalid Rust code block",
                 );