diff options
| author | bors <bors@rust-lang.org> | 2019-11-23 22:23:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-23 22:23:20 +0000 |
| commit | ad808d95c4839caedc2be76d0ed059dc920ab4b6 (patch) | |
| tree | eeb5b6401c97decfd3ebb19f12bddf916712c95d /src/test/ui/str/str-array-assignment.stderr | |
| parent | 0c987c5c02498b4e77f5dfae1f6914ffb9268575 (diff) | |
| parent | c215de006230208afa77f4c8bb2715ecabf5b1a4 (diff) | |
| download | rust-ad808d95c4839caedc2be76d0ed059dc920ab4b6.tar.gz rust-ad808d95c4839caedc2be76d0ed059dc920ab4b6.zip | |
Auto merge of #66680 - Centril:rollup-1ke3svj, r=Centril
Rollup of 5 pull requests Successful merges: - #61351 (Stabilize cfg(doc)) - #66539 (Point at type in `let` assignment on type errors) - #66655 (rustdoc: Mark `--extern-private` as unstable) - #66657 (rustdoc: Don't panic when failing to write .lock file) - #66673 (Move def collector from `rustc` to `rustc_resolve`) Failed merges: r? @ghost
Diffstat (limited to 'src/test/ui/str/str-array-assignment.stderr')
| -rw-r--r-- | src/test/ui/str/str-array-assignment.stderr | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/test/ui/str/str-array-assignment.stderr b/src/test/ui/str/str-array-assignment.stderr index 909ff1e0263..a133c69eeef 100644 --- a/src/test/ui/str/str-array-assignment.stderr +++ b/src/test/ui/str/str-array-assignment.stderr @@ -32,10 +32,11 @@ error[E0308]: mismatched types --> $DIR/str-array-assignment.rs:9:17 | LL | let w: &str = s[..2]; - | ^^^^^^ - | | - | expected `&str`, found `str` - | help: consider borrowing here: `&s[..2]` + | ---- ^^^^^^ + | | | + | | expected `&str`, found `str` + | | help: consider borrowing here: `&s[..2]` + | expected due to this error: aborting due to 4 previous errors |