Skip to content

Commit 87bda0e

Browse files
committed
---
yaml --- r: 234818 b: refs/heads/tmp c: e567cb5 h: refs/heads/master v: v3
1 parent 631775c commit 87bda0e

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
2626
refs/heads/beta: d2e13e822a73e0ea46ae9e21afdd3155fc997f6d
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
28-
refs/heads/tmp: 01872f7b917f5bbb45826c45606832e427c94eec
28+
refs/heads/tmp: e567cb5a3ee0fd01c3a96d9688b1ae54e9b541e7
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: ab792abf1fcc28afbd315426213f6428da25c085
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828

branches/tmp/src/librustc/middle/infer/equate.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ use middle::ty::{self, Ty};
1717
use middle::ty::TyVar;
1818
use middle::ty_relate::{Relate, RelateResult, TypeRelation};
1919

20+
/// Ensures `a` is made equal to `b`. Returns `a` on success.
2021
pub struct Equate<'a, 'tcx: 'a> {
2122
fields: CombineFields<'a, 'tcx>
2223
}

branches/tmp/src/librustc/middle/infer/sub.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use middle::ty::TyVar;
1818
use middle::ty_relate::{Cause, Relate, RelateResult, TypeRelation};
1919
use std::mem;
2020

21-
/// "Greatest lower bound" (common subtype)
21+
/// Ensures `a` is made a subtype of `b`. Returns `a` on success.
2222
pub struct Sub<'a, 'tcx: 'a> {
2323
fields: CombineFields<'a, 'tcx>,
2424
}

0 commit comments

Comments
 (0)