Skip to content

Commit d9040e4

Browse files
committed
---
yaml --- r: 151646 b: refs/heads/try2 c: 949443e h: refs/heads/master v: v3
1 parent c262c29 commit d9040e4

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
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: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 82a8a5ebb3b3c34cd135da511641a9df28e2c30e
8+
refs/heads/try2: 949443eff640ede205502547ea04a4dd350b255f
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libcore/failure.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
//! Failure support for libcore
1212
13-
#![allow(dead_code)]
13+
#![allow(dead_code, missing_doc)]
1414

1515
#[cfg(not(test))]
1616
use str::raw::c_str_to_static_slice;

branches/try2/src/libcore/lib.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ pub mod atomics;
106106
pub mod bool;
107107
pub mod cell;
108108
pub mod char;
109+
pub mod failure;
109110
pub mod finally;
110111
pub mod iter;
111112
pub mod option;
@@ -118,13 +119,15 @@ pub mod tuple;
118119
#[cfg(stage0, not(test))]
119120
pub mod owned;
120121

121-
mod failure;
122-
123122
// FIXME: this module should not exist. Once owned allocations are no longer a
124123
// language type, this module can move outside to the owned allocation
125124
// crate.
126125
mod should_not_exist;
127126

127+
mod core {
128+
pub use failure;
129+
}
130+
128131
mod std {
129132
pub use clone;
130133
pub use cmp;

branches/try2/src/libcore/macros.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ macro_rules! fail(
1717
fail!("explicit failure")
1818
);
1919
($msg:expr) => (
20-
::failure::begin_unwind($msg, file!(), line!())
20+
::core::failure::begin_unwind($msg, file!(), line!())
2121
);
2222
)
2323

0 commit comments

Comments
 (0)