bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix tidy errors caused by renaming

Browse source
This commit is contained in:
varkor 2018-04-12 20:36:18 +01:00
parent 06f0a7c89f
commit cadf96e8e1
5 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1895,11 +1895,13 @@ impl<'a> LoweringContext<'a> {
GenericParam::Lifetime(ref lifetime_def) => {
hir::GenericParam::Lifetime(self.lower_lifetime_def(lifetime_def))
}
GenericParam::Type(ref ty_param) => hir::GenericParam::Type(self.lower_ty_param(
ty_param,
add_bounds.get(&ty_param.id).map_or(&[][..], |x| &x),
itctx,
)),
GenericParam::Type(ref ty_param) => {
hir::GenericParam::Type(self.lower_ty_param(
ty_param,
add_bounds.get(&ty_param.id).map_or(&[][..], |x| &x),
itctx,
))
}
})
.collect()
}

5
src/librustc/hir/print.rs
View file

@ -2043,7 +2043,10 @@ impl<'a> State<'a> {
Ok(())
}
pub fn print_generic_params(&mut self, generic_params: &[hir::GenericParam]) -> io::Result<()> {
pub fn print_generic_params(&mut self,
generic_params: &[hir::GenericParam])
-> io::Result<()>
{
if !generic_params.is_empty() {
self.s.word("<")?;

4
src/libsyntax/visit.rs
View file

@ -72,7 +72,9 @@ pub trait Visitor<'ast>: Sized {
fn visit_expr(&mut self, ex: &'ast Expr) { walk_expr(self, ex) }
fn visit_expr_post(&mut self, _ex: &'ast Expr) { }
fn visit_ty(&mut self, t: &'ast Ty) { walk_ty(self, t) }
fn visit_generic_param(&mut self, param: &'ast GenericParam) { walk_generic_param(self, param) }
fn visit_generic_param(&mut self, param: &'ast GenericParam) {
walk_generic_param(self, param)
}
fn visit_generics(&mut self, g: &'ast Generics) { walk_generics(self, g) }
fn visit_where_predicate(&mut self, p: &'ast WherePredicate) {
walk_where_predicate(self, p)

6
src/libsyntax_ext/deriving/generic/mod.rs
View file

@ -570,7 +570,11 @@ impl<'a> TraitDef<'a> {
bounds.push((*declared_bound).clone());
}
GenericParam::Type(cx.typaram(self.span, ty_param.ident, vec![], bounds, None))
GenericParam::Type(cx.typaram(self.span,
ty_param.ident,
vec![],
bounds,
None))
}
}
}));

9
src/libsyntax_ext/deriving/generic/ty.rs
View file

@ -187,7 +187,9 @@ impl<'a> Ty<'a> {
let self_params = self_generics.params
.iter()
.filter_map(|param| match *param {
GenericParam::Type(ref ty_param) => Some(cx.ty_ident(span, ty_param.ident)),
GenericParam::Type(ref ty_param) => {
Some(cx.ty_ident(span, ty_param.ident))
}
_ => None,
})
.collect();
@ -270,7 +272,10 @@ impl<'a> LifetimeBounds<'a> {
let bounds = bounds.iter()
.map(|b| cx.lifetime(span, Ident::from_str(b)))
.collect();
GenericParam::Lifetime(cx.lifetime_def(span, Ident::from_str(lt), vec![], bounds))
GenericParam::Lifetime(cx.lifetime_def(span,
Ident::from_str(lt),
vec![],
bounds))
})
.chain(self.bounds
.iter()