Skip to content

Commit eb83a4e

Browse files
committed
---
yaml --- r: 151798 b: refs/heads/try2 c: 4a1d21a h: refs/heads/master v: v3
1 parent 4e8f2f3 commit eb83a4e

File tree

5 files changed

+9
-14
lines changed

5 files changed

+9
-14
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: 639759b7f46b2ea7fd93cbfdb6fa39ab24f8774f
8+
refs/heads/try2: 4a1d21ab7b8d08398649d9c6a9641acebb6bc01c
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/liballoc/owned.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ impl<T: fmt::Show> fmt::Show for Box<T> {
107107
}
108108
}
109109

110-
#[cfg(not(stage0))]
111110
impl fmt::Show for Box<Any> {
112111
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
113112
f.pad("Box<Any>")

branches/try2/src/libcore/fmt/mod.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@ pub struct Formatter<'a> {
7070
/// Optionally specified precision for numeric types
7171
pub precision: Option<uint>,
7272

73-
#[allow(missing_doc)]
74-
#[cfg(stage0)]
75-
pub buf: &'a mut FormatWriter,
76-
#[cfg(not(stage0))]
7773
buf: &'a mut FormatWriter,
7874
curarg: slice::Items<'a, Argument<'a>>,
7975
args: &'a [Argument<'a>],

branches/try2/src/libstd/macros.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -251,19 +251,11 @@ macro_rules! format_strbuf(
251251
/// write!(&mut w, "formatted {}", "arguments");
252252
/// ```
253253
#[macro_export]
254-
#[cfg(not(stage0))]
255254
macro_rules! write(
256255
($dst:expr, $($arg:tt)*) => ({
257256
format_args_method!($dst, write_fmt, $($arg)*)
258257
})
259258
)
260-
#[cfg(stage0)]
261-
#[macro_export]
262-
macro_rules! write(
263-
($dst:expr, $($arg:tt)*) => ({
264-
format_args!(|args| { $dst.write_fmt(args) }, $($arg)*)
265-
})
266-
)
267259

268260
/// Equivalent to the `write!` macro, except that a newline is appended after
269261
/// the message is written.

branches/try2/src/snapshots.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
S 2014-05-16 5327218
2+
freebsd-x86_64 e91e235c808eb7e8a1e82f7e00c874de9b1df345
3+
linux-i386 3a3b7d68ed42a144fa06c9a49c63966da9adeef2
4+
linux-x86_64 212f9062080a6e6cba472d8530d086ad787bbf72
5+
macos-i386 8306ef93b626cedbc0cb45296a72b294d8e073a0
6+
macos-x86_64 3025ff751d888994431eb3cf970936cd2143f95d
7+
winnt-i386 9b271338ecc29684e7db15c402e8c90b8b152781
8+
19
S 2014-05-15 6a2b3d1
210
freebsd-x86_64 afc98b59cb819025fecdb9d145ca4463f857a477
311
linux-i386 d6f7a404412ea34db3d19814ca21fe6fa662b02f

0 commit comments

Comments
 (0)