diff options
| author | bors <bors@rust-lang.org> | 2019-12-13 19:39:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-12-13 19:39:20 +0000 |
| commit | ff15e9670843f8bd6b54ab1b042d2095b4c0aa6d (patch) | |
| tree | ab93656235150d2f5d3104ec4d0de0004581a89b /src/test/ui/error-codes | |
| parent | 703c82e5319c15929df38bb8611755b3eda5bd8e (diff) | |
| parent | d0cc289ec0fa35de2aa35df5445ebca332ccf4f6 (diff) | |
| download | rust-ff15e9670843f8bd6b54ab1b042d2095b4c0aa6d.tar.gz rust-ff15e9670843f8bd6b54ab1b042d2095b4c0aa6d.zip | |
Auto merge of #67284 - Centril:rollup-ghiukob, r=Centril
Rollup of 7 pull requests Successful merges: - #67026 (Improve diagnostics and code for exhaustiveness of empty matches) - #67235 (VecDeque: drop remaining items on destructor panic) - #67254 (dont ICE in case of invalid drop fn) - #67256 (Reduce allocs for validation errors) - #67274 (be explicit that mem::uninitialized is the same as MaybeUninit::uninit().assume_init()) - #67278 (`coerce_inner`: use initial `expected_ty`) - #67280 (docs: std::convert::From: Fix typo) Failed merges: r? @ghost
Diffstat (limited to 'src/test/ui/error-codes')
| -rw-r--r-- | src/test/ui/error-codes/E0004-2.stderr | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/ui/error-codes/E0004-2.stderr b/src/test/ui/error-codes/E0004-2.stderr index db0a2b5a085..f5b41cd1cc0 100644 --- a/src/test/ui/error-codes/E0004-2.stderr +++ b/src/test/ui/error-codes/E0004-2.stderr @@ -1,8 +1,8 @@ -error[E0004]: non-exhaustive patterns: multiple patterns of type `std::option::Option<i32>` are not handled +error[E0004]: non-exhaustive patterns: `None` and `Some(_)` not covered --> $DIR/E0004-2.rs:4:11 | LL | match x { } - | ^ + | ^ patterns `None` and `Some(_)` not covered | = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms |