diff options
| author | bors <bors@rust-lang.org> | 2019-06-18 19:04:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-06-18 19:04:15 +0000 |
| commit | 04a3dd8a872633ca1e4c217d11f741cc35cb19a5 (patch) | |
| tree | c8d89b1c1dc99017ffbeb443e2f1e5deb6ddbd2a /src/test | |
| parent | 673cf7de44b5a98092b5bc7cf2906e866383a65d (diff) | |
| parent | 2be847b2f95414690538bea48138a6738b47b43a (diff) | |
| download | rust-04a3dd8a872633ca1e4c217d11f741cc35cb19a5.tar.gz rust-04a3dd8a872633ca1e4c217d11f741cc35cb19a5.zip | |
Auto merge of #61891 - eddyb:lifetime-cleanups, r=oli-obk
rustc: remove 'x: 'y bounds (except where necessary or from comments/strings). This PR removes all lifetime-lifetime "outlives" bounds (e.g. `'tcx: 'a`) bounds except a few necessary ones (see the `reintroduce lifetime bounds where necessary` commit). Some of these bounds kept around otherwise-unused lifetimes (e.g. `<'a, 'tcx: 'a>` followed by uses of `'tcx` but not `'a`) - these lifetimes (i.e. `'a`) were then removed. (maybe they should be considered unused by the lint? cc @matthewjasper @zackmdavis) r? @oli-obk cc @rust-lang/compiler
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/ui/pattern/const-pat-ice.rs | 1 | ||||
| -rw-r--r-- | src/test/ui/pattern/const-pat-ice.stderr | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/test/ui/pattern/const-pat-ice.rs b/src/test/ui/pattern/const-pat-ice.rs index b866c7fa6cc..06558767882 100644 --- a/src/test/ui/pattern/const-pat-ice.rs +++ b/src/test/ui/pattern/const-pat-ice.rs @@ -2,6 +2,7 @@ // rustc-env:RUST_BACKTRACE=0 // normalize-stderr-test "note: rustc 1.* running on .*" -> "note: rustc VERSION running on TARGET" // normalize-stderr-test "note: compiler flags: .*" -> "note: compiler flags: FLAGS" +// normalize-stderr-test "/_match.rs:[0-9]+:[0-9]+" -> "/_match.rs:LL:CC" // This is a repro test for an ICE in our pattern handling of constants. diff --git a/src/test/ui/pattern/const-pat-ice.stderr b/src/test/ui/pattern/const-pat-ice.stderr index 7ddeac4abca..7a0f14425b7 100644 --- a/src/test/ui/pattern/const-pat-ice.stderr +++ b/src/test/ui/pattern/const-pat-ice.stderr @@ -1,4 +1,4 @@ -thread 'rustc' panicked at 'assertion failed: rows.iter().all(|r| r.len() == v.len())', src/librustc_mir/hair/pattern/_match.rs:1084:5 +thread 'rustc' panicked at 'assertion failed: rows.iter().all(|r| r.len() == v.len())', src/librustc_mir/hair/pattern/_match.rs:LL:CC note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace. error: internal compiler error: unexpected panic |