Rebased with master.

diff --git a/src/librustc_traits/normalize_projection_ty.rs b/src/librustc_traits/normalize_projection_ty.rs
index 55785d9586cc37cebbd46479b1fcecf9293ec0ba..171bc1bd2d6d403d208fc9e643591ba07d9db5dc 100644 (file)
--- a/src/librustc_traits/normalize_projection_ty.rs
+++ b/src/librustc_traits/normalize_projection_ty.rs
@@ -36,7 +36,7 @@
         ) = infcx.instantiate_canonical_with_fresh_inference_vars(DUMMY_SP, &goal);
         let fulfill_cx = &mut FulfillmentContext::new();
         let selcx = &mut SelectionContext::new(infcx);
-        let cause = ObligationCause::misc(DUMMY_SP, DUMMY_NODE_ID);
+        let cause = ObligationCause::misc(DUMMY_SP, DUMMY_NODE_ID, DUMMY_NODE_ID);
         let Normalized {
             value: answer,
             obligations,

diff --git a/src/librustc_typeck/check/dropck.rs b/src/librustc_typeck/check/dropck.rs
index 596381d7ea676612081e8310a67b2f083367201f..4943560d68be081d7c70a7240367d0b18cf29e83 100644 (file)
--- a/src/librustc_typeck/check/dropck.rs
+++ b/src/librustc_typeck/check/dropck.rs
@@ -298,7 +298,7 @@ pub fn check_safety_of_destructor_if_necessary<'a, 'gcx, 'tcx>(
     };
     let parent_scope = rcx.tcx.mk_region(ty::ReScope(parent_scope));
     let origin = || infer::SubregionOrigin::SafeDestructor(span);
-    let cause = &ObligationCause::misc(span, body_id);
+    let cause = &ObligationCause::misc(span, body_id, body_id);
     let infer_ok = rcx.infcx.at(cause, rcx.fcx.param_env).dropck_outlives(ty);
     debug!("dropck_outlives = {:#?}", infer_ok);
     let kinds = rcx.fcx.register_infer_ok_obligations(infer_ok);

diff --git a/src/test/ui/suggest-remove-refs-1.stderr b/src/test/ui/suggest-remove-refs-1.stderr
index 154b67219f679c49deec1afd34f43e5fc7e43166..fe4ab2c4ee052c2a6f25be345d5ba97c3b424d69 100644 (file)
--- a/src/test/ui/suggest-remove-refs-1.stderr
+++ b/src/test/ui/suggest-remove-refs-1.stderr
@@ -12,4 +12,4 @@ LL |     for (i, n) in &v.iter().enumerate() {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.

diff --git a/src/test/ui/suggest-remove-refs-2.stderr b/src/test/ui/suggest-remove-refs-2.stderr
index f394344275aafe8c2f67173d90e1e4b743287f60..243ddcfe125e22403de4662f6bebaf0951606736 100644 (file)
--- a/src/test/ui/suggest-remove-refs-2.stderr
+++ b/src/test/ui/suggest-remove-refs-2.stderr
@@ -12,4 +12,4 @@ LL |     for (i, n) in & & & & &v.iter().enumerate() {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.

diff --git a/src/test/ui/suggest-remove-refs-3.stderr b/src/test/ui/suggest-remove-refs-3.stderr
index 7add72adf4d3d13f02926e5e637946cecc8231b6..83f3826642b2b55723b4c59efd310c48d59b945a 100644 (file)
--- a/src/test/ui/suggest-remove-refs-3.stderr
+++ b/src/test/ui/suggest-remove-refs-3.stderr
@@ -19,4 +19,4 @@ LL |         .enumerate() {
 
 error: aborting due to previous error
 
-If you want more information on this error, try using "rustc --explain E0277"
+For more information about this error, try `rustc --explain E0277`.