user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct variable renaming fallout

Browse source
This commit is contained in:
varkor 2018-04-15 00:22:29 +01:00
parent 0b8b14f6f5
commit 6f257bf26f
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_typeck/check/mod.rs
View file

@ -5094,8 +5094,8 @@ pub fn check_bounds_are_used<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
for param in generics.params.iter() {
let key = match param {
hir::GenericParamDef::Type(_) => ty::Kind::Type,
hir::GenericParamDef::Lifetime(_) => ty::Kind::Lifetime,
hir::GenericParam::Type(_) => ty::Kind::Type,
hir::GenericParam::Lifetime(_) => ty::Kind::Lifetime,
};
*param_counts.get_mut(&key).unwrap() += 1;
}

4
src/librustc_typeck/impl_wf_check.rs
View file

@ -119,13 +119,13 @@ fn enforce_impl_params_are_constrained<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
.zip(impl_hir_generics.params.iter()) {
match (ty_param, hir_param) {
// Disallow ANY unconstrained type parameters.
(ty::GenericParamDef::Type(ty_ty), hir::GenericParamDef::Type(hir_ty)) => {
(ty::GenericParamDef::Type(ty_ty), hir::GenericParam::Type(hir_ty)) => {
let param_ty = ty::ParamTy::for_def(ty_ty);
if !input_parameters.contains(&ctp::Parameter::from(param_ty)) {
report_unused_parameter(tcx, hir_ty.span, "type", &param_ty.to_string());
}
}
(ty::GenericParamDef::Lifetime(ty_lt), hir::GenericParamDef::Lifetime(hir_lt)) => {
(ty::GenericParamDef::Lifetime(ty_lt), hir::GenericParam::Lifetime(hir_lt)) => {
let param = ctp::Parameter::from(ty_lt.to_early_bound_region_data());
if lifetimes_in_associated_types.contains(&param) && // (*)
!input_parameters.contains(&param) {

4
src/librustdoc/clean/mod.rs
View file

@ -2687,7 +2687,7 @@ impl Clean<Type> for hir::Ty {
let mut indices = FxHashMap();
for param in generics.params.iter() {
match param {
GenericParamDef::Type(ty_param) => {
hir::GenericParam::Type(ty_param) => {
let i = indices.entry(Kind::Type).or_insert(0);
let ty_param_def =
Def::TyParam(cx.tcx.hir.local_def_id(ty_param.id));
@ -2699,7 +2699,7 @@ impl Clean<Type> for hir::Ty {
}
*i += 1;
}
GenericParamDef::Lifetime(lt_param) => {
hir::GenericParam::Lifetime(lt_param) => {
let i = indices.entry(Kind::Type).or_insert(0);
if let Some(lt) = provided_params.lifetimes.get(*i).cloned() {
if !lt.is_elided() {