Skip to content

Commit f6bffd1

Browse files
committed
Rebased with master.
1 parent 52cd07a commit f6bffd1

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

src/librustc_traits/normalize_projection_ty.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ crate fn normalize_projection_ty<'tcx>(
3636
) = infcx.instantiate_canonical_with_fresh_inference_vars(DUMMY_SP, &goal);
3737
let fulfill_cx = &mut FulfillmentContext::new();
3838
let selcx = &mut SelectionContext::new(infcx);
39-
let cause = ObligationCause::misc(DUMMY_SP, DUMMY_NODE_ID);
39+
let cause = ObligationCause::misc(DUMMY_SP, DUMMY_NODE_ID, DUMMY_NODE_ID);
4040
let Normalized {
4141
value: answer,
4242
obligations,

src/librustc_typeck/check/dropck.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ pub fn check_safety_of_destructor_if_necessary<'a, 'gcx, 'tcx>(
298298
};
299299
let parent_scope = rcx.tcx.mk_region(ty::ReScope(parent_scope));
300300
let origin = || infer::SubregionOrigin::SafeDestructor(span);
301-
let cause = &ObligationCause::misc(span, body_id);
301+
let cause = &ObligationCause::misc(span, body_id, body_id);
302302
let infer_ok = rcx.infcx.at(cause, rcx.fcx.param_env).dropck_outlives(ty);
303303
debug!("dropck_outlives = {:#?}", infer_ok);
304304
let kinds = rcx.fcx.register_infer_ok_obligations(infer_ok);

src/test/ui/suggest-remove-refs-1.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ LL | for (i, n) in &v.iter().enumerate() {
1212

1313
error: aborting due to previous error
1414

15-
If you want more information on this error, try using "rustc --explain E0277"
15+
For more information about this error, try `rustc --explain E0277`.

src/test/ui/suggest-remove-refs-2.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ LL | for (i, n) in & & & & &v.iter().enumerate() {
1212

1313
error: aborting due to previous error
1414

15-
If you want more information on this error, try using "rustc --explain E0277"
15+
For more information about this error, try `rustc --explain E0277`.

src/test/ui/suggest-remove-refs-3.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ LL | .enumerate() {
1919

2020
error: aborting due to previous error
2121

22-
If you want more information on this error, try using "rustc --explain E0277"
22+
For more information about this error, try `rustc --explain E0277`.

0 commit comments

Comments
 (0)