Skip to content

Commit c294899

Browse files
committed
---
yaml --- r: 15310 b: refs/heads/try c: 2ad20df h: refs/heads/master v: v3
1 parent 3408c4e commit c294899

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: 44c7386376df87f32afd49467178fb2858cb18ca
5+
refs/heads/try: 2ad20df40b94e38cc576b3d24977c1108ca3fe82
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libcore/result.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ fn chain_err<T: copy, U: copy, V: copy>(
108108
}
109109
}
110110

111-
impl methods<T:copy,E:copy> for result<T,E> {
111+
impl extensions<T:copy, E:copy> for result<T,E> {
112112
fn chain<U:copy>(op: fn(T) -> result<U,E>) -> result<U,E> {
113113
chain(self, op)
114114
}

branches/try/src/rustc/middle/infer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import middle::ty;
55
import syntax::ast;
66
import syntax::ast::{ret_style};
77
import util::ppaux::{ty_to_str, mt_to_str};
8-
import result::{result, methods, chain, chain_err, ok, err, map, map2, iter2};
8+
import result::{result, extensions, ok, err, map, map2, iter2};
99
import ty::type_is_bot;
1010

1111
export infer_ctxt;
@@ -85,7 +85,7 @@ fn fixup_vars(cx: infer_ctxt, a: ty::t) -> fres<ty::t> {
8585
impl methods for ures {
8686
fn then<T:copy>(f: fn() -> result<T,ty::type_err>)
8787
-> result<T,ty::type_err> {
88-
chain(self) {|_i| f() }
88+
self.chain() {|_i| f() }
8989
}
9090
}
9191

0 commit comments

Comments
 (0)