Skip to content

Commit 522a8ed

Browse files
committed
---
yaml --- r: 36341 b: refs/heads/try2 c: a3f845d h: refs/heads/master i: 36339: 6128f28 v: v3
1 parent 245b7d3 commit 522a8ed

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: d9995888fab34e9c67a72641020a793459237cd1
8+
refs/heads/try2: a3f845db521aca3d8b8815a0c969a40446390757
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libcore/result.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,13 +204,13 @@ pub fn map_err<T: Copy, E, F: Copy>(res: &Result<T, E>, op: fn((&E)) -> F)
204204
}
205205

206206
impl<T, E> Result<T, E> {
207-
fn get_ref(&self) -> &self/T { get_ref(self) }
207+
pure fn get_ref(&self) -> &self/T { get_ref(self) }
208208

209-
fn is_ok() -> bool { is_ok(&self) }
209+
pure fn is_ok() -> bool { is_ok(&self) }
210210

211-
fn is_err() -> bool { is_err(&self) }
211+
pure fn is_err() -> bool { is_err(&self) }
212212

213-
fn iter(f: fn((&T))) {
213+
pure fn iter(f: fn((&T))) {
214214
match self {
215215
Ok(ref t) => f(t),
216216
Err(_) => ()
@@ -226,7 +226,7 @@ impl<T, E> Result<T, E> {
226226
}
227227

228228
impl<T: Copy, E> Result<T, E> {
229-
fn get() -> T { get(&self) }
229+
pure fn get() -> T { get(&self) }
230230

231231
fn map_err<F:Copy>(op: fn((&E)) -> F) -> Result<T,F> {
232232
match self {
@@ -237,7 +237,7 @@ impl<T: Copy, E> Result<T, E> {
237237
}
238238

239239
impl<T, E: Copy> Result<T, E> {
240-
fn get_err() -> E { get_err(&self) }
240+
pure fn get_err() -> E { get_err(&self) }
241241

242242
fn map<U:Copy>(op: fn((&T)) -> U) -> Result<U,E> {
243243
match self {

0 commit comments

Comments
 (0)