about summary refs log tree commit diff
path: root/src/test/ui/array-slice-vec
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-05-11 23:14:06 +0000
committerbors <bors@rust-lang.org>2020-05-11 23:14:06 +0000
commit09c817eeb29e764cfc12d0a8d94841e3ffe34023 (patch)
treef118ca7b1552fec31eb6a93009347897c3e0c18e /src/test/ui/array-slice-vec
parent99cb9ccb9ca2067ad6e60508e3d52da77396b2f1 (diff)
parentdfa3677bee58a39296daf85645eff7d51cbad8ae (diff)
downloadrust-09c817eeb29e764cfc12d0a8d94841e3ffe34023.tar.gz
rust-09c817eeb29e764cfc12d0a8d94841e3ffe34023.zip
Auto merge of #72120 - Dylan-DPC:rollup-ca0tur2, r=Dylan-DPC
Rollup of 10 pull requests

Successful merges:

 - #72014 (Deprecated emoji)
 - #72019 (Fix debug assertion in error code)
 - #72027 (Use CDN for ci-caches on download)
 - #72044 (use min_specialization for some rustc crates where it requires no changes)
 - #72052 (display `ConstKind::Param`)
 - #72067 (Emit a warning when optimization fuel runs out)
 - #72072 (doc: minus (U+2212) instead of dash (U+002D) for negative infinity)
 - #72077 (Improve E0571 wording)
 - #72107 (Clean up E0579 explanation)
 - #72109 (Fix clippy warnings)

Failed merges:

r? @ghost
Diffstat (limited to 'src/test/ui/array-slice-vec')
-rw-r--r--src/test/ui/array-slice-vec/match_arr_unknown_len.stderr2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/ui/array-slice-vec/match_arr_unknown_len.stderr b/src/test/ui/array-slice-vec/match_arr_unknown_len.stderr
index 09f65f6acd0..ed29443332f 100644
--- a/src/test/ui/array-slice-vec/match_arr_unknown_len.stderr
+++ b/src/test/ui/array-slice-vec/match_arr_unknown_len.stderr
@@ -13,7 +13,7 @@ LL |         [1, 2] => true,
    |         ^^^^^^ expected `2usize`, found `N`
    |
    = note: expected array `[u32; 2]`
-              found array `[u32; _]`
+              found array `[u32; N]`
 
 error: aborting due to previous error; 1 warning emitted