Skip to content

Commit 57ad4d2

Browse files
committed
---
yaml --- r: 50533 b: refs/heads/try c: cf9e958 h: refs/heads/master i: 50531: 57ce287 v: v3
1 parent b098f14 commit 57ad4d2

28 files changed

+254
-2787
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
5-
refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
5+
refs/heads/try: cf9e958fe0b235b2d6cc39bfd0100adc0c46f62f
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcore/core.rc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,7 @@ pub mod unicode;
242242
#[path = "num/cmath.rs"]
243243
pub mod cmath;
244244
pub mod stackwalk;
245-
#[path = "rt/mod.rs"]
246-
pub mod rt;
245+
247246

248247
// A curious inner-module that's not exported that contains the binding
249248
// 'core' so that macro-expanded references to core::error and such

branches/try/src/libcore/iter-trait/option.rs

Lines changed: 0 additions & 32 deletions
This file was deleted.

branches/try/src/libcore/option.rs

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -130,27 +130,6 @@ pub pure fn get_ref<T>(opt: &r/Option<T>) -> &r/T {
130130
}
131131
}
132132
133-
pub pure fn get_mut_ref<T>(opt: &r/mut Option<T>) -> &r/mut T {
134-
/*!
135-
Gets a mutable reference to the value inside an option.
136-
137-
# Failure
138-
139-
Fails if the value equals `None`
140-
141-
# Safety note
142-
143-
In general, because this function may fail, its use is discouraged
144-
(calling `get` on `None` is akin to dereferencing a null pointer).
145-
Instead, prefer to use pattern matching and handle the `None`
146-
case explicitly.
147-
*/
148-
match *opt {
149-
Some(ref mut x) => x,
150-
None => fail!(~"option::get_mut_ref none")
151-
}
152-
}
153-
154133
#[inline(always)]
155134
pub pure fn map<T, U>(opt: &r/Option<T>, f: fn(x: &r/T) -> U) -> Option<U> {
156135
//! Maps a `some` value by reference from one type to another
@@ -385,23 +364,6 @@ pub impl<T> Option<T> {
385364
#[inline(always)]
386365
pure fn get_ref(&self) -> &self/T { get_ref(self) }
387366
388-
/**
389-
Gets a mutable reference to the value inside an option.
390-
391-
# Failure
392-
393-
Fails if the value equals `None`
394-
395-
# Safety note
396-
397-
In general, because this function may fail, its use is discouraged
398-
(calling `get` on `None` is akin to dereferencing a null pointer).
399-
Instead, prefer to use pattern matching and handle the `None`
400-
case explicitly.
401-
*/
402-
#[inline(always)]
403-
pure fn get_mut_ref(&mut self) -> &self/mut T { get_mut_ref(self) }
404-
405367
/**
406368
* Gets the value out of an option without copying.
407369
*

branches/try/src/libcore/rt/context.rs

Lines changed: 0 additions & 156 deletions
This file was deleted.

branches/try/src/libcore/rt/io.rs

Lines changed: 0 additions & 45 deletions
This file was deleted.

branches/try/src/libcore/rt/mod.rs

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)