Skip to content

Commit 0d96d4c

Browse files
committed
---
yaml --- r: 233389 b: refs/heads/beta c: 213326c h: refs/heads/master i: 233387: 524562e v: v3
1 parent a424db6 commit 0d96d4c

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: c106dd449ce9b8e0230a832810a9598274de27e3
26+
refs/heads/beta: 213326cddd0fa470c347992f5b66e776a85864a7
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc/middle/outlives.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ fn compute_components<'a,'tcx>(infcx: &InferCtxt<'a,'tcx>,
126126
// maintained explicitly, because bound regions themselves can
127127
// be readily identified. However, because the outlives
128128
// relation did not used to be applied to fn/trait-object
129-
// arguments, we due wrap the resulting components in an
130-
// RFC1214 wrapper so we can issue warnings.
129+
// arguments, we wrap the resulting components in an RFC1214
130+
// wrapper so we can issue warnings.
131131
ty::TyBareFn(..) | ty::TyTrait(..) => {
132132
// OutlivesFunction, OutlivesObject, OutlivesFragment
133133
let subcomponents = capture_components(infcx, ty);

0 commit comments

Comments
 (0)