diff options
| author | bors <bors@rust-lang.org> | 2019-10-14 10:00:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-14 10:00:51 +0000 |
| commit | 446e5e57b667c841ba3ebb4b41b44fb98bd3af4b (patch) | |
| tree | b6cc0036da62d65162168901c85cf368d8ed440d /src/test/ui/static | |
| parent | d28a9c38fe14396e86ae274c7847e20ee0f78ca9 (diff) | |
| parent | a73e0731f45577bb6b760fe5d8d328de2021a74f (diff) | |
| download | rust-446e5e57b667c841ba3ebb4b41b44fb98bd3af4b.tar.gz rust-446e5e57b667c841ba3ebb4b41b44fb98bd3af4b.zip | |
Auto merge of #65399 - Centril:rollup-6lzj0w5, r=Centril
Rollup of 7 pull requests Successful merges: - #65215 (Add long error explanation for E0697) - #65292 (Print lifetimes with backticks) - #65362 (syntax: consolidate function parsing in item.rs) - #65363 (Remove implicit dependencies on syntax::pprust) - #65379 (refactor session::config::build_session_options_and_crate_config) - #65392 (Move `Nonterminal::to_tokenstream` to parser & don't rely directly on parser in lowering) - #65395 (Add some tests for fixed ICEs) Failed merges: r? @ghost
Diffstat (limited to 'src/test/ui/static')
| -rw-r--r-- | src/test/ui/static/static-closures.stderr | 1 | ||||
| -rw-r--r-- | src/test/ui/static/static-lifetime.stderr | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/test/ui/static/static-closures.stderr b/src/test/ui/static/static-closures.stderr index ced78c03e09..99235e26e15 100644 --- a/src/test/ui/static/static-closures.stderr +++ b/src/test/ui/static/static-closures.stderr @@ -6,3 +6,4 @@ LL | static || {}; error: aborting due to previous error +For more information about this error, try `rustc --explain E0697`. diff --git a/src/test/ui/static/static-lifetime.stderr b/src/test/ui/static/static-lifetime.stderr index 8516ac07b6c..bda325dc011 100644 --- a/src/test/ui/static/static-lifetime.stderr +++ b/src/test/ui/static/static-lifetime.stderr @@ -4,7 +4,7 @@ error[E0478]: lifetime bound not satisfied LL | impl<'a, A: Clone> Arbitrary for ::std::borrow::Cow<'a, A> {} | ^^^^^^^^^ | -note: lifetime parameter instantiated with the lifetime 'a as defined on the impl at 3:6 +note: lifetime parameter instantiated with the lifetime `'a` as defined on the impl at 3:6 --> $DIR/static-lifetime.rs:3:6 | LL | impl<'a, A: Clone> Arbitrary for ::std::borrow::Cow<'a, A> {} |