Rollup merge of #22680 - FlaPer87:type_builtin, r=nikomatsakis
Fixes #20302
This commit is contained in:
commit
47377904a1
2 changed files with 75 additions and 24 deletions
src
|
@ -305,9 +305,9 @@ fn create_region_substs<'tcx>(
|
||||||
rscope.anon_regions(span, expected_num_region_params);
|
rscope.anon_regions(span, expected_num_region_params);
|
||||||
|
|
||||||
if supplied_num_region_params != 0 || anon_regions.is_err() {
|
if supplied_num_region_params != 0 || anon_regions.is_err() {
|
||||||
span_err!(tcx.sess, span, E0107,
|
report_lifetime_number_error(tcx, span,
|
||||||
"wrong number of lifetime parameters: expected {}, found {}",
|
supplied_num_region_params,
|
||||||
expected_num_region_params, supplied_num_region_params);
|
expected_num_region_params);
|
||||||
}
|
}
|
||||||
|
|
||||||
match anon_regions {
|
match anon_regions {
|
||||||
|
@ -355,31 +355,14 @@ fn create_substs_for_ast_path<'tcx>(
|
||||||
.count();
|
.count();
|
||||||
|
|
||||||
let mut type_substs = types_provided;
|
let mut type_substs = types_provided;
|
||||||
|
check_type_argument_count(this.tcx(), span, supplied_ty_param_count,
|
||||||
|
required_ty_param_count, formal_ty_param_count);
|
||||||
|
|
||||||
if supplied_ty_param_count < required_ty_param_count {
|
if supplied_ty_param_count < required_ty_param_count {
|
||||||
let expected = if required_ty_param_count < formal_ty_param_count {
|
|
||||||
"expected at least"
|
|
||||||
} else {
|
|
||||||
"expected"
|
|
||||||
};
|
|
||||||
span_err!(this.tcx().sess, span, E0243,
|
|
||||||
"wrong number of type arguments: {} {}, found {}",
|
|
||||||
expected,
|
|
||||||
required_ty_param_count,
|
|
||||||
supplied_ty_param_count);
|
|
||||||
while type_substs.len() < required_ty_param_count {
|
while type_substs.len() < required_ty_param_count {
|
||||||
type_substs.push(tcx.types.err);
|
type_substs.push(tcx.types.err);
|
||||||
}
|
}
|
||||||
} else if supplied_ty_param_count > formal_ty_param_count {
|
} else if supplied_ty_param_count > formal_ty_param_count {
|
||||||
let expected = if required_ty_param_count < formal_ty_param_count {
|
|
||||||
"expected at most"
|
|
||||||
} else {
|
|
||||||
"expected"
|
|
||||||
};
|
|
||||||
span_err!(this.tcx().sess, span, E0244,
|
|
||||||
"wrong number of type arguments: {} {}, found {}",
|
|
||||||
expected,
|
|
||||||
formal_ty_param_count,
|
|
||||||
supplied_ty_param_count);
|
|
||||||
type_substs.truncate(formal_ty_param_count);
|
type_substs.truncate(formal_ty_param_count);
|
||||||
}
|
}
|
||||||
assert!(type_substs.len() >= required_ty_param_count &&
|
assert!(type_substs.len() >= required_ty_param_count &&
|
||||||
|
@ -1847,7 +1830,16 @@ pub fn partition_bounds<'a>(tcx: &ty::ctxt,
|
||||||
if ty::try_add_builtin_trait(tcx,
|
if ty::try_add_builtin_trait(tcx,
|
||||||
trait_did,
|
trait_did,
|
||||||
&mut builtin_bounds) {
|
&mut builtin_bounds) {
|
||||||
// FIXME(#20302) -- we should check for things like Copy<T>
|
let segments = &b.trait_ref.path.segments;
|
||||||
|
let parameters = &segments[segments.len() - 1].parameters;
|
||||||
|
if parameters.types().len() > 0 {
|
||||||
|
check_type_argument_count(tcx, b.trait_ref.path.span,
|
||||||
|
parameters.types().len(), 0, 0);
|
||||||
|
}
|
||||||
|
if parameters.lifetimes().len() > 0{
|
||||||
|
report_lifetime_number_error(tcx, b.trait_ref.path.span,
|
||||||
|
parameters.lifetimes().len(), 0);
|
||||||
|
}
|
||||||
continue; // success
|
continue; // success
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1880,3 +1872,34 @@ fn prohibit_projections<'tcx>(tcx: &ty::ctxt<'tcx>,
|
||||||
"associated type bindings are not allowed here");
|
"associated type bindings are not allowed here");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn check_type_argument_count(tcx: &ty::ctxt, span: Span, supplied: usize,
|
||||||
|
required: usize, accepted: usize) {
|
||||||
|
if supplied < required {
|
||||||
|
let expected = if required < accepted {
|
||||||
|
"expected at least"
|
||||||
|
} else {
|
||||||
|
"expected"
|
||||||
|
};
|
||||||
|
span_err!(tcx.sess, span, E0243,
|
||||||
|
"wrong number of type arguments: {} {}, found {}",
|
||||||
|
expected, required, supplied);
|
||||||
|
} else if supplied > accepted {
|
||||||
|
let expected = if required < accepted {
|
||||||
|
"expected at most"
|
||||||
|
} else {
|
||||||
|
"expected"
|
||||||
|
};
|
||||||
|
span_err!(tcx.sess, span, E0244,
|
||||||
|
"wrong number of type arguments: {} {}, found {}",
|
||||||
|
expected,
|
||||||
|
accepted,
|
||||||
|
supplied);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn report_lifetime_number_error(tcx: &ty::ctxt, span: Span, number: usize, expected: usize) {
|
||||||
|
span_err!(tcx.sess, span, E0107,
|
||||||
|
"wrong number of lifetime parameters: expected {}, found {}",
|
||||||
|
expected, number);
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,28 @@
|
||||||
|
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
|
||||||
|
// file at the top-level directory of this distribution and at
|
||||||
|
// http://rust-lang.org/COPYRIGHT.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||||
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||||
|
// option. This file may not be copied, modified, or distributed
|
||||||
|
// except according to those terms.
|
||||||
|
|
||||||
|
fn foo1<T:Copy<U>, U>(x: T) {}
|
||||||
|
//~^ ERROR: wrong number of type arguments: expected 0, found 1
|
||||||
|
|
||||||
|
trait Trait: Copy<Send> {}
|
||||||
|
//~^ ERROR: wrong number of type arguments: expected 0, found 1
|
||||||
|
|
||||||
|
struct MyStruct1<T: Copy<T>>;
|
||||||
|
//~^ ERROR wrong number of type arguments: expected 0, found 1
|
||||||
|
|
||||||
|
struct MyStruct2<'a, T: Copy<'a>>;
|
||||||
|
//~^ ERROR: wrong number of lifetime parameters: expected 0, found 1
|
||||||
|
|
||||||
|
fn foo2<'a, T:Copy<'a, U>, U>(x: T) {}
|
||||||
|
//~^ ERROR: wrong number of type arguments: expected 0, found 1
|
||||||
|
//~^^ ERROR: wrong number of lifetime parameters: expected 0, found 1
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
}
|
Loading…
Add table
Reference in a new issue