hir, mir: Separate HIR expressions / MIR operands from InlineAsm.

[rust.git] / src / librustc_typeck / check / mod.rs

diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
index cdff78d01e3e22e8c638b564fc16d0c5692fc11e..903fc458d818564c891688938095021698c30b94 100644 (file)
--- a/src/librustc_typeck/check/mod.rs
+++ b/src/librustc_typeck/check/mod.rs
@@ -864,14 +864,14 @@ fn check_method_body<'a, 'tcx>(ccx: &CrateCtxt<'a, 'tcx>,
     check_bare_fn(ccx, &sig.decl, body, id, span, fty, param_env);
 }
 
-fn report_forbidden_specialization(tcx: &ty::ctxt,
+fn report_forbidden_specialization(tcx: &TyCtxt,
                                    impl_item: &hir::ImplItem,
                                    parent_impl: DefId)
 {
     let mut err = struct_span_err!(
         tcx.sess, impl_item.span, E0520,
-        "item `{}` is provided by an implementation that specializes \
-         another, but the item in the parent implementations is not \
+        "item `{}` is provided by an `impl` that specializes \
+         another, but the item in the parent `impl` is not \
          marked `default` and so it cannot be specialized.",
         impl_item.name);
 
@@ -887,7 +887,7 @@ fn report_forbidden_specialization(tcx: &ty::ctxt,
     err.emit();
 }
 
-fn check_specialization_validity<'tcx>(tcx: &ty::ctxt<'tcx>, trait_def: &ty::TraitDef<'tcx>,
+fn check_specialization_validity<'tcx>(tcx: &TyCtxt<'tcx>, trait_def: &ty::TraitDef<'tcx>,
                                        impl_id: DefId, impl_item: &hir::ImplItem)
 {
     let ancestors = trait_def.ancestors(impl_id);
@@ -3416,12 +3416,12 @@ fn check_expr_struct<'a, 'tcx>(fcx: &FnCtxt<'a,'tcx>,
               fcx.add_wf_bounds(&item_substs.substs, expr);
           });
       }
-      hir::ExprInlineAsm(ref ia) => {
-          for &(_, ref input) in &ia.inputs {
-              check_expr(fcx, &input);
+      hir::ExprInlineAsm(_, ref outputs, ref inputs) => {
+          for output in outputs {
+              check_expr(fcx, output);
           }
-          for out in &ia.outputs {
-              check_expr(fcx, &out.expr);
+          for input in inputs {
+              check_expr(fcx, input);
           }
           fcx.write_nil(id);
       }