Skip to content

Commit f928bc4

Browse files
committed
---
yaml --- r: 223967 b: refs/heads/beta c: d088db9 h: refs/heads/master i: 223965: e37d138 223963: 15422f9 223959: 7ef0342 223951: 7e18caf 223935: 6a89ec9 v: v3
1 parent c2cbb10 commit f928bc4

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: 27188bbefe5efbbb8c11464457ce90edf24ac17f
26+
refs/heads/beta: d088db99a7c67bebb00c2d66bfaf9cb64298fba2
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: 938f5d7af401e2d8238522fed4a612943b6e77fd
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc/middle/traits/fulfill.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,8 +430,8 @@ fn process_predicate<'a,'tcx>(selcx: &mut SelectionContext<'a,'tcx>,
430430
obligation.clone(),
431431
CodeSelectionError(Unimplemented)))
432432
}
433-
// Otherwise, we have something of the form `for<'a> T: 'a`, which
434-
// we can treat as `T: 'static`.
433+
// Otherwise, we have something of the form
434+
// `for<'a> T: 'a where 'a not in T`, which we can treat as `T: 'static`.
435435
Some(t_a) => {
436436
register_region_obligation(t_a, ty::ReStatic,
437437
obligation.cause.clone(),

0 commit comments

Comments
 (0)