mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

std: Rewrite the write! and writeln! macros

Browse source 
These are reimplemented using the new `core::fmt` module.
This commit is contained in:
Alex Crichton 2014-05-10 13:57:26 -07:00
parent 854d95f9ff
commit 8767093eb9
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/libstd/macros.rs
View file

@ -251,10 +251,17 @@ macro_rules! format_strbuf(
/// write!(&mut w, "formatted {}", "arguments");
/// ```
#[macro_export]
#[cfg(not(stage0))]
macro_rules! write(
($dst:expr, $($arg:tt)*) => ({
let dst: &mut ::std::io::Writer = $dst;
format_args!(|args| { ::std::fmt::write(dst, args) }, $($arg)*)
format_args_method!($dst, write_fmt, $($arg)*)
})
)
#[cfg(stage0)]
#[macro_export]
macro_rules! write(
($dst:expr, $($arg:tt)*) => ({
format_args!(|args| { $dst.write_fmt(args) }, $($arg)*)
})
)
@ -262,9 +269,9 @@ macro_rules! write(
/// the message is written.
#[macro_export]
macro_rules! writeln(
($dst:expr, $($arg:tt)*) => ({
let dst: &mut ::std::io::Writer = $dst;
format_args!(|args| { ::std::fmt::writeln(dst, args) }, $($arg)*)
($dst:expr, $fmt:expr $($arg:tt)*) => ({
format_args!(|args| { $dst.write_fmt(args) },
concat!($fmt, "\n") $($arg)*)
})
)