bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #68023 - FSciammarella:master, r=Centril,varkor

Browse source 
Fix issue #68008

Correcting Typo on error message. From "substract" to "subtract".

Fixes #68008.
This commit is contained in:
Mazdak Farrokhzad 2020-01-09 00:22:18 +01:00 • committed by GitHub
commit d2922e51a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc_typeck/check/op.rs
View file

@ -330,7 +330,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
Some("std::ops::Add"), Some("std::ops::Add"),
), ),
hir::BinOpKind::Sub => ( hir::BinOpKind::Sub => (
format!("cannot substract `{}` from `{}`", rhs_ty, lhs_ty), format!("cannot subtract `{}` from `{}`", rhs_ty, lhs_ty),
Some("std::ops::Sub"), Some("std::ops::Sub"),
), ),
hir::BinOpKind::Mul => ( hir::BinOpKind::Mul => (

2
src/test/ui/issues/issue-28837.rs
View file

@ -5,7 +5,7 @@ fn main() {
a + a; //~ ERROR cannot add `A` to `A` a + a; //~ ERROR cannot add `A` to `A`
a - a; //~ ERROR cannot substract `A` from `A` a - a; //~ ERROR cannot subtract `A` from `A`
a * a; //~ ERROR cannot multiply `A` to `A` a * a; //~ ERROR cannot multiply `A` to `A`

2
src/test/ui/issues/issue-28837.stderr
View file

@ -8,7 +8,7 @@ LL | a + a;
| |
= note: an implementation of `std::ops::Add` might be missing for `A` = note: an implementation of `std::ops::Add` might be missing for `A`
error[E0369]: cannot substract `A` from `A` error[E0369]: cannot subtract `A` from `A`
--> $DIR/issue-28837.rs:8:7 --> $DIR/issue-28837.rs:8:7
| |
LL | a - a; LL | a - a;