diff options
| author | Pietro Albini <pietro@pietroalbini.org> | 2020-03-18 21:11:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-18 21:11:07 +0100 |
| commit | 11053bafac5bdb00f37cb040a19779474e778a35 (patch) | |
| tree | 58d06260aa7b94875c1accd4efb6f27753d428e2 /src/test/ui/pattern | |
| parent | f509b26a7730d721ef87423a72b3fdf8724b4afa (diff) | |
| parent | b6f61a1f51bd87dce41cf9523a24312f66d06b79 (diff) | |
| download | rust-11053bafac5bdb00f37cb040a19779474e778a35.tar.gz rust-11053bafac5bdb00f37cb040a19779474e778a35.zip | |
Rollup merge of #70112 - Centril:rollup-gpi5tbq, r=Centril
Rollup of 10 pull requests Successful merges: - #67749 (keyword docs for else and inkeyword docs for else and in.) - #69139 (clean up E0308 explanation) - #69189 (Erase regions in writeback) - #69837 (Use smaller discriminants for generators) - #69838 (Expansion-driven outline module parsing) - #69839 (Miri error reform) - #69899 (Make methods declared by `newtype_index` macro `const`) - #69920 (Remove some imports to the rustc crate) - #70075 (Fix repr pretty display) - #70106 (Tidy: fix running rustfmt twice) Failed merges: - #70051 (Allow `hir().find` to return `None`) - #70074 (Expand: nix all fatal errors) r? @ghost
Diffstat (limited to 'src/test/ui/pattern')
| -rw-r--r-- | src/test/ui/pattern/usefulness/always-inhabited-union-ref.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/pattern/usefulness/always-inhabited-union-ref.stderr | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/ui/pattern/usefulness/always-inhabited-union-ref.rs b/src/test/ui/pattern/usefulness/always-inhabited-union-ref.rs index 11eae2af9c9..7d1cac8a442 100644 --- a/src/test/ui/pattern/usefulness/always-inhabited-union-ref.rs +++ b/src/test/ui/pattern/usefulness/always-inhabited-union-ref.rs @@ -21,7 +21,7 @@ fn uninhab_union() -> Foo { fn match_on_uninhab() { match uninhab_ref() { - //~^ ERROR non-exhaustive patterns: type `&'static !` is non-empty + //~^ ERROR non-exhaustive patterns: type `&!` is non-empty } match uninhab_union() { diff --git a/src/test/ui/pattern/usefulness/always-inhabited-union-ref.stderr b/src/test/ui/pattern/usefulness/always-inhabited-union-ref.stderr index 1b1096c977a..e1079f912d0 100644 --- a/src/test/ui/pattern/usefulness/always-inhabited-union-ref.stderr +++ b/src/test/ui/pattern/usefulness/always-inhabited-union-ref.stderr @@ -1,4 +1,4 @@ -error[E0004]: non-exhaustive patterns: type `&'static !` is non-empty +error[E0004]: non-exhaustive patterns: type `&!` is non-empty --> $DIR/always-inhabited-union-ref.rs:23:11 | LL | match uninhab_ref() { |