diff options
| author | bors <bors@rust-lang.org> | 2019-01-04 19:39:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-04 19:39:24 +0000 |
| commit | f381a962550436f74dd6e9021e4df2fdefb96cfa (patch) | |
| tree | 77fa25a202ad750cac637116d2d01a9298b81d70 /src/test/rustdoc-ui | |
| parent | d6d32ac25df2984f66b6abd14c1096880e04179a (diff) | |
| parent | 0a6fb8473872b2a6dd7fe66697f90dceac667ec4 (diff) | |
| download | rust-f381a962550436f74dd6e9021e4df2fdefb96cfa.tar.gz rust-f381a962550436f74dd6e9021e4df2fdefb96cfa.zip | |
Auto merge of #56897 - euclio:parse-fatal, r=estebank
make `panictry!` private to libsyntax This commit completely removes usage of the `panictry!` macro from outside libsyntax. The macro causes parse errors to be fatal, so using it in libsyntax_ext caused parse failures *within* a syntax extension to be fatal, which is probably not intended. Furthermore, this commit adds spans to diagnostics emitted by empty extensions if they were missing, à la #56491.
Diffstat (limited to 'src/test/rustdoc-ui')
| -rw-r--r-- | src/test/rustdoc-ui/failed-doctest-output.stdout | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/rustdoc-ui/failed-doctest-output.stdout b/src/test/rustdoc-ui/failed-doctest-output.stdout index 54830dceb8f..9fd46e94f03 100644 --- a/src/test/rustdoc-ui/failed-doctest-output.stdout +++ b/src/test/rustdoc-ui/failed-doctest-output.stdout @@ -12,7 +12,7 @@ error[E0425]: cannot find value `no` in this scope 3 | no | ^^ not found in this scope -thread '$DIR/failed-doctest-output.rs - OtherStruct (line 17)' panicked at 'couldn't compile the test', src/librustdoc/test.rs:316:13 +thread '$DIR/failed-doctest-output.rs - OtherStruct (line 17)' panicked at 'couldn't compile the test', src/librustdoc/test.rs:321:13 note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace. ---- $DIR/failed-doctest-output.rs - SomeStruct (line 11) stdout ---- @@ -21,7 +21,7 @@ thread '$DIR/failed-doctest-output.rs - SomeStruct (line 11)' panicked at 'test thread 'main' panicked at 'oh no', $DIR/failed-doctest-output.rs:3:1 note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace. -', src/librustdoc/test.rs:351:17 +', src/librustdoc/test.rs:356:17 failures: |