diff options
| author | bors <bors@rust-lang.org> | 2021-08-27 01:07:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-08-27 01:07:17 +0000 |
| commit | d5cd3205fd6c0817fd46c036d0f3194b7deaca93 (patch) | |
| tree | 5c6c2d66f28c957521ed013ebfac4f79b7ac6c30 /src/test/ui/pattern/pattern-error-continue.stderr | |
| parent | 517c28e421b0d601c6f8eb07ea6aafb8e16975ad (diff) | |
| parent | af549368f3c4062bb509e475652b287be17b6f2c (diff) | |
| download | rust-d5cd3205fd6c0817fd46c036d0f3194b7deaca93.tar.gz rust-d5cd3205fd6c0817fd46c036d0f3194b7deaca93.zip | |
Auto merge of #88371 - Manishearth:rollup-pkkjsme, r=Manishearth
Rollup of 11 pull requests Successful merges: - #87832 (Fix debugger stepping behavior with `match` expressions) - #88123 (Make spans for tuple patterns in E0023 more precise) - #88215 (Reland #83738: "rustdoc: Don't load all extern crates unconditionally") - #88216 (Don't stabilize creation of TryReserveError instances) - #88270 (Handle type ascription type ops in NLL HRTB diagnostics) - #88289 (Fixes for LLVM change 0f45c16f2caa7c035e5c3edd40af9e0d51ad6ba7) - #88320 (type_implements_trait consider obligation failure on overflow) - #88332 (Add argument types tait tests) - #88340 (Add `c_size_t` and `c_ssize_t` to `std::os::raw`.) - #88346 (Revert "Add type of a let tait test impl trait straight in let") - #88348 (Add field types tait tests) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/test/ui/pattern/pattern-error-continue.stderr')
| -rw-r--r-- | src/test/ui/pattern/pattern-error-continue.stderr | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/ui/pattern/pattern-error-continue.stderr b/src/test/ui/pattern/pattern-error-continue.stderr index 3f28ffed291..c800afdae2a 100644 --- a/src/test/ui/pattern/pattern-error-continue.stderr +++ b/src/test/ui/pattern/pattern-error-continue.stderr @@ -26,13 +26,13 @@ LL | A::B(_) => (), | ~ error[E0023]: this pattern has 3 fields, but the corresponding tuple variant has 2 fields - --> $DIR/pattern-error-continue.rs:17:9 + --> $DIR/pattern-error-continue.rs:17:14 | LL | B(isize, isize), - | --------------- tuple variant defined here + | ----- ----- tuple variant has 2 fields ... LL | A::B(_, _, _) => (), - | ^^^^^^^^^^^^^ expected 2 fields, found 3 + | ^ ^ ^ expected 2 fields, found 3 error[E0308]: mismatched types --> $DIR/pattern-error-continue.rs:22:9 |