Fix tidy errors

Author: plietar

src/librustc/util/ppaux.rs

@@ -1030,11 +1030,13 @@ define_print! {
                         write!(f, "impl")?;
                         for predicate in bounds.predicates {
                             if let Some(trait_ref) = predicate.to_opt_poly_trait_ref() {
+                                let did = trait_ref.def_id();
+
                                 // Don't print +Sized/DynSized, but rather +?Sized/?DynSized if absent.
-                                if Some(trait_ref.def_id()) == tcx.lang_items().sized_trait() {
+                                if Some(did) == tcx.lang_items().sized_trait() {
                                     is_sized = true;
                                     continue;
-                                } else if Some(trait_ref.def_id()) == tcx.lang_items().dynsized_trait() {
+                                } else if Some(did) == tcx.lang_items().dynsized_trait() {
                                     is_dynsized = true;
                                     continue;
                                 }

src/librustc_passes/ast_validation.rs

@@ -156,7 +156,8 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
                             any_lifetime_bounds = true;
                         }
                         TraitTyParamBound(ref poly, TraitBoundModifier::Maybe) => {
-                            self.session.span_err(poly.span, "`?Trait` is not permitted in trait object types");
+                            self.session.span_err(poly.span,
+                                "`?Trait` is not permitted in trait object types");
                         }
                         _ => (),
                     }