diff options
| author | kennytm <kennytm@gmail.com> | 2018-08-24 16:44:40 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2018-08-24 19:24:37 +0800 |
| commit | 7d990fa7cd115cec524cc295cd2676f1a1acc961 (patch) | |
| tree | b887c799c405b4dafef1afa2ae1a585eb0603072 | |
| parent | 3fbd72e66b19e4f08692e7d75a6e6d1336fef3a9 (diff) | |
| parent | c9c4f5ef784069319a36cf75d15dfaa604196071 (diff) | |
| download | rust-7d990fa7cd115cec524cc295cd2676f1a1acc961.tar.gz rust-7d990fa7cd115cec524cc295cd2676f1a1acc961.zip | |
Rollup merge of #53600 - varkor:expected-generic-arg-s, r=eddyb
Fix a grammatical mistake in "expected generic arguments" errors r? @eddyb
| -rw-r--r-- | src/librustc_typeck/astconv.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/generic/generic-impl-more-params-with-defaults.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/generic/generic-type-more-params-with-defaults.stderr | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs index a528c8e9b4f..d0778a729ad 100644 --- a/src/librustc_typeck/astconv.rs +++ b/src/librustc_typeck/astconv.rs @@ -371,7 +371,7 @@ impl<'o, 'gcx: 'tcx, 'tcx> dyn AstConv<'gcx, 'tcx>+'o { quantifier, bound, kind, - if required != 1 { "s" } else { "" }, + if bound != 1 { "s" } else { "" }, ) }; diff --git a/src/test/ui/generic/generic-impl-more-params-with-defaults.stderr b/src/test/ui/generic/generic-impl-more-params-with-defaults.stderr index b614da88ba1..6b54baefb1d 100644 --- a/src/test/ui/generic/generic-impl-more-params-with-defaults.stderr +++ b/src/test/ui/generic/generic-impl-more-params-with-defaults.stderr @@ -2,7 +2,7 @@ error[E0244]: wrong number of type arguments: expected at most 2, found 3 --> $DIR/generic-impl-more-params-with-defaults.rs:23:5 | LL | Vec::<isize, Heap, bool>::new(); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected at most 2 type argument + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected at most 2 type arguments error: aborting due to previous error diff --git a/src/test/ui/generic/generic-type-more-params-with-defaults.stderr b/src/test/ui/generic/generic-type-more-params-with-defaults.stderr index f226921816d..684a22ce45c 100644 --- a/src/test/ui/generic/generic-type-more-params-with-defaults.stderr +++ b/src/test/ui/generic/generic-type-more-params-with-defaults.stderr @@ -2,7 +2,7 @@ error[E0244]: wrong number of type arguments: expected at most 2, found 3 --> $DIR/generic-type-more-params-with-defaults.rs:19:12 | LL | let _: Vec<isize, Heap, bool>; - | ^^^^^^^^^^^^^^^^^^^^^^ expected at most 2 type argument + | ^^^^^^^^^^^^^^^^^^^^^^ expected at most 2 type arguments error: aborting due to previous error |