Skip to content

Commit

Permalink
Rollup merge of #77371 - camelid:remove-extra-space-in-diagnostic, r=…
Browse files Browse the repository at this point in the history
…varkor

Remove trailing space in error message

- Add test for error message
- Remove trailing space in error message
  • Loading branch information
Dylan-DPC authored Oct 1, 2020
2 parents cc1513b + b2ce3e5 commit 85e77ed
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 1 deletion.
2 changes: 1 addition & 1 deletion compiler/rustc_middle/src/ty/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ impl<'tcx> ty::TyS<'tcx> {
let n = tcx.lift(&n).unwrap();
match n.try_eval_usize(tcx, ty::ParamEnv::empty()) {
_ if t.is_simple_ty() => format!("array `{}`", self).into(),
Some(n) => format!("array of {} element{} ", n, pluralize!(n)).into(),
Some(n) => format!("array of {} element{}", n, pluralize!(n)).into(),
None => "array".into(),
}
}
Expand Down
6 changes: 6 additions & 0 deletions src/test/ui/slice-to-vec-comparison.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
fn main() {
let a = &[];
let b: &Vec<u8> = &vec![];
a > b;
//~^ ERROR mismatched types
}
12 changes: 12 additions & 0 deletions src/test/ui/slice-to-vec-comparison.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
error[E0308]: mismatched types
--> $DIR/slice-to-vec-comparison.rs:4:9
|
LL | a > b;
| ^ expected array of 0 elements, found struct `Vec`
|
= note: expected reference `&[_; 0]`
found reference `&Vec<u8>`

error: aborting due to previous error

For more information about this error, try `rustc --explain E0308`.

0 comments on commit 85e77ed

Please sign in to comment.