bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename param_counts to own_counts

Browse source
This commit is contained in:
varkor 2018-05-11 00:30:34 +01:00
parent 365c8c3704
commit fd8e284a20
11 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc/hir/lowering.rs
View file

@ -1461,7 +1461,7 @@ impl<'a> LoweringContext<'a> {
assert!(!def_id.is_local());
let item_generics =
self.cstore.item_generics_cloned_untracked(def_id, self.sess);
let n = item_generics.param_counts().lifetimes;
let n = item_generics.own_counts().lifetimes;
self.type_def_lifetime_params.insert(def_id, n);
n
});

2
src/librustc/traits/object_safety.rs
View file

@ -284,7 +284,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
}
// We can't monomorphize things like `fn foo<A>(...)`.
if self.generics_of(method.def_id).param_counts().types != 0 {
if self.generics_of(method.def_id).own_counts().types != 0 {
return Some(MethodViolationCode::Generic);
}

10
src/librustc/ty/mod.rs
View file

@ -794,23 +794,23 @@ impl<'a, 'gcx, 'tcx> Generics {
self.parent_count + self.params.len()
}
pub fn param_counts(&self) -> GenericParamCount {
pub fn own_counts(&self) -> GenericParamCount {
// We could cache this as a property of `GenericParamCount`, but
// the aim is to refactor this away entirely eventually and the
// presence of this method will be a constant reminder.
let mut param_counts = GenericParamCount {
let mut own_counts = GenericParamCount {
lifetimes: 0,
types: 0,
};
for param in self.params.iter() {
match param.kind {
GenericParamDefKind::Lifetime => param_counts.lifetimes += 1,
GenericParamDefKind::Type(_) => param_counts.types += 1,
GenericParamDefKind::Lifetime => own_counts.lifetimes += 1,
GenericParamDefKind::Type(_) => own_counts.types += 1,
};
}
param_counts
own_counts
}
pub fn requires_monomorphization(&self, tcx: TyCtxt<'a, 'gcx, 'tcx>) -> bool {

18
src/librustc/util/ppaux.rs
View file

@ -257,7 +257,7 @@ impl PrintContext {
let verbose = self.is_verbose;
let mut num_supplied_defaults = 0;
let mut has_self = false;
let mut param_counts = GenericParamCount {
let mut own_counts = GenericParamCount {
lifetimes: 0,
types: 0,
};
@ -306,7 +306,7 @@ impl PrintContext {
}
}
let mut generics = tcx.generics_of(item_def_id);
let child_param_counts = generics.param_counts();
let child_own_counts = generics.own_counts();
let mut path_def_id = did;
has_self = generics.has_self;
@ -314,9 +314,9 @@ impl PrintContext {
if let Some(def_id) = generics.parent {
// Methods.
assert!(is_value_path);
child_types = child_param_counts.types;
child_types = child_own_counts.types;
generics = tcx.generics_of(def_id);
param_counts = generics.param_counts();
own_counts = generics.own_counts();
if has_self {
print!(f, self, write("<"), print_display(substs.type_at(0)), write(" as "))?;
@ -331,7 +331,7 @@ impl PrintContext {
assert_eq!(has_self, false);
} else {
// Types and traits.
param_counts = child_param_counts;
own_counts = child_own_counts;
}
}
@ -415,10 +415,10 @@ impl PrintContext {
Ok(())
};
print_regions(f, "<", 0, param_counts.lifetimes)?;
print_regions(f, "<", 0, own_counts.lifetimes)?;
let tps = substs.types()
.take(param_counts.types - num_supplied_defaults)
.take(own_counts.types - num_supplied_defaults)
.skip(has_self as usize);
for ty in tps {
@ -450,10 +450,10 @@ impl PrintContext {
write!(f, "::{}", item_name)?;
}
print_regions(f, "::<", param_counts.lifetimes, usize::MAX)?;
print_regions(f, "::<", own_counts.lifetimes, usize::MAX)?;
// FIXME: consider being smart with defaults here too
for ty in substs.types().skip(param_counts.types) {
for ty in substs.types().skip(own_counts.types) {
start_or_continue(f, "::<", ", ")?;
ty.print_display(f, self)?;
}