Skip to content

Create a Default trait for an empty format string#8564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alexcrichton wants to merge 2 commits into from
Closed

Create a Default trait for an empty format string #8564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1092744
Implement `{:s}` for ~str and @str as well
alexcrichton Aug 14, 2013
22c7bbf
Delegate `{}` to Default instead of Poly
alexcrichton Aug 15, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 53 additions & 3 deletions src/libstd/fmt/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -356,28 +356,46 @@ pub struct Argument<'self> {
priv value: &'self util::Void,
}

/// When a format is not otherwise specified, types are formatted by ascribing
/// to this trait. There is not an explicit way of selecting this trait to be
/// used for formatting, it is only if no other format is specified.
#[allow(missing_doc)]
pub trait Default { fn fmt(&Self, &mut Formatter); }

/// Format trait for the `b` character
#[allow(missing_doc)]
pub trait Bool { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `c` character
#[allow(missing_doc)]
pub trait Char { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `i` and `d` characters
#[allow(missing_doc)]
pub trait Signed { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `u` character
#[allow(missing_doc)]
pub trait Unsigned { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `o` character
#[allow(missing_doc)]
pub trait Octal { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `b` character
#[allow(missing_doc)]
pub trait Binary { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `x` character
#[allow(missing_doc)]
pub trait LowerHex { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `X` character
#[allow(missing_doc)]
pub trait UpperHex { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `s` character
#[allow(missing_doc)]
pub trait String { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `?` character
#[allow(missing_doc)]
pub trait Poly { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `p` character
#[allow(missing_doc)]
pub trait Pointer { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `f` character
#[allow(missing_doc)]
pub trait Float { fn fmt(&Self, &mut Formatter); }

Expand DownExpand Up@@ -726,9 +744,9 @@ impl Bool for bool {
}
}

impl<'self> String for &'self str {
fn fmt(s: & &'self str, f: &mut Formatter) {
f.pad(*s);
impl<'self, T: str::Str> String for T {
fn fmt(s: &T, f: &mut Formatter) {
f.pad(s.as_slice());
}
}

Expand DownExpand Up@@ -855,5 +873,37 @@ impl<T> Pointer for *const T {
}
}

// Implementation of Default for various core types

macro_rules! delegate(($ty:ty to $other:ident) => {
impl<'self> Default for $ty {
fn fmt(me: &$ty, f: &mut Formatter) {
$other::fmt(me, f)
}
}
})
delegate!(int to Signed)
delegate!( i8 to Signed)
delegate!(i16 to Signed)
delegate!(i32 to Signed)
delegate!(i64 to Signed)
delegate!(uint to Unsigned)
delegate!( u8 to Unsigned)
delegate!( u16 to Unsigned)
delegate!( u32 to Unsigned)
delegate!( u64 to Unsigned)
delegate!(@str to String)
delegate!(~str to String)
delegate!(&'self str to String)
delegate!(bool to Bool)
delegate!(char to Char)
delegate!(float to Float)
delegate!(f32 to Float)
delegate!(f64 to Float)

impl<T> Default for *const T {
fn fmt(me: &*const T, f: &mut Formatter) { Pointer::fmt(me, f) }
}

// If you expected tests to be here, look instead at the run-pass/ifmt.rs test,
// it's a lot easier than creating all of the rt::Piece structures here.
6 changes: 5 additions & 1 deletion src/libstd/fmt/parse.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,7 +339,11 @@ impl<'self> Parser<'self> {
}
}
// Finally the actual format specifier
spec.ty = self.word();
if self.consume('?') {
spec.ty = "?";
} else {
spec.ty = self.word();
}
return spec;
}

Expand Down
43 changes: 20 additions & 23 deletions src/libsyntax/ext/ifmt.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -623,19 +623,16 @@ impl Context {

fn format_arg(&self, sp: span, arg: Either<uint, @str>,
ident: ast::ident) -> @ast::expr {
let mut ty = match arg {
let ty = match arg {
Left(i) => self.arg_types[i].unwrap(),
Right(s) => *self.name_types.get(&s)
};
// Default types to '?' if nothing else is specified.
if ty == Unknown {
ty = Known(@"?");
}

let argptr = self.ecx.expr_addr_of(sp, self.ecx.expr_ident(sp, ident));
match ty {
let fmt_trait = match ty {
Unknown => "Default",
Known(tyname) => {
let fmt_trait = match tyname.as_slice() {
match tyname.as_slice() {
"?" => "Poly",
"b" => "Bool",
"c" => "Char",
Expand All@@ -653,35 +650,35 @@ impl Context {
`%s`", tyname));
"Dummy"
}
};
let format_fn = self.ecx.path_global(sp, ~[
self.ecx.ident_of("std"),
self.ecx.ident_of("fmt"),
self.ecx.ident_of(fmt_trait),
self.ecx.ident_of("fmt"),
]);
self.ecx.expr_call_global(sp, ~[
self.ecx.ident_of("std"),
self.ecx.ident_of("fmt"),
self.ecx.ident_of("argument"),
], ~[self.ecx.expr_path(format_fn), argptr])
}
}
String => {
self.ecx.expr_call_global(sp, ~[
return self.ecx.expr_call_global(sp, ~[
self.ecx.ident_of("std"),
self.ecx.ident_of("fmt"),
self.ecx.ident_of("argumentstr"),
], ~[argptr])
}
Unsigned => {
self.ecx.expr_call_global(sp, ~[
return self.ecx.expr_call_global(sp, ~[
self.ecx.ident_of("std"),
self.ecx.ident_of("fmt"),
self.ecx.ident_of("argumentuint"),
], ~[argptr])
}
Unknown => { fail!() }
}
};

let format_fn = self.ecx.path_global(sp, ~[
self.ecx.ident_of("std"),
self.ecx.ident_of("fmt"),
self.ecx.ident_of(fmt_trait),
self.ecx.ident_of("fmt"),
]);
self.ecx.expr_call_global(sp, ~[
self.ecx.ident_of("std"),
self.ecx.ident_of("fmt"),
self.ecx.ident_of("argument"),
], ~[self.ecx.expr_path(format_fn), argptr])
}
}

Expand Down
32 changes: 27 additions & 5 deletions src/test/run-pass/ifmt.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,16 +25,36 @@ pub fn main() {
macro_rules! t(($a:expr, $b:expr) => { assert_eq!($a, $b.to_owned()) })

// Make sure there's a poly formatter that takes anything
t!(ifmt!("{}", 1), "1");
t!(ifmt!("{}", A), "{}");
t!(ifmt!("{}", ()), "()");
t!(ifmt!("{}", @(~1, "foo")), "@(~1, \"foo\")");
t!(ifmt!("{:?}", 1), "1");
t!(ifmt!("{:?}", A), "{}");
t!(ifmt!("{:?}", ()), "()");
t!(ifmt!("{:?}", @(~1, "foo")), "@(~1, \"foo\")");

// Various edge cases without formats
t!(ifmt!(""), "");
t!(ifmt!("hello"), "hello");
t!(ifmt!("hello \\{"), "hello {");

// default formatters should work
t!(ifmt!("{}", 1i), "1");
t!(ifmt!("{}", 1i8), "1");
t!(ifmt!("{}", 1i16), "1");
t!(ifmt!("{}", 1i32), "1");
t!(ifmt!("{}", 1i64), "1");
t!(ifmt!("{}", 1u), "1");
t!(ifmt!("{}", 1u8), "1");
t!(ifmt!("{}", 1u16), "1");
t!(ifmt!("{}", 1u32), "1");
t!(ifmt!("{}", 1u64), "1");
t!(ifmt!("{}", 1.0f), "1");
t!(ifmt!("{}", 1.0f32), "1");
t!(ifmt!("{}", 1.0f64), "1");
t!(ifmt!("{}", "a"), "a");
t!(ifmt!("{}", ~"a"), "a");
t!(ifmt!("{}", @"a"), "a");
t!(ifmt!("{}", false), "false");
t!(ifmt!("{}", 'a'), "a");

// At least exercise all the formats
t!(ifmt!("{:b}", true), "true");
t!(ifmt!("{:c}", '☃'), "☃");
Expand All@@ -45,6 +65,8 @@ pub fn main() {
t!(ifmt!("{:x}", 10u), "a");
t!(ifmt!("{:X}", 10u), "A");
t!(ifmt!("{:s}", "foo"), "foo");
t!(ifmt!("{:s}", ~"foo"), "foo");
t!(ifmt!("{:s}", @"foo"), "foo");
t!(ifmt!("{:p}", 0x1234 as *int), "0x1234");
t!(ifmt!("{:p}", 0x1234 as *mut int), "0x1234");
t!(ifmt!("{:d}", A), "aloha");
Expand All@@ -54,7 +76,7 @@ pub fn main() {
t!(ifmt!("{foo} {bar}", foo=0, bar=1), "0 1");
t!(ifmt!("{foo} {1} {bar} {0}", 0, 1, foo=2, bar=3), "2 1 3 0");
t!(ifmt!("{} {0:s}", "a"), "a a");
t!(ifmt!("{} {0}", "a"), "\"a\" \"a\"");
t!(ifmt!("{} {0}", "a"), "a a");

// Methods should probably work
t!(ifmt!("{0, plural, =1{a#} =2{b#} zero{c#} other{d#}}", 0u), "c0");
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Create a `Default` trait for an empty format string by alexcrichton · Pull Request #8564 · rust-lang/rust · GitHub
Skip to content
Create a Default trait for an empty format string#8564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

alexcrichton
wants to merge
2
commits into

from

 Closed


Create a Default trait for an empty format string
#8564
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1092744

Implement `{:s}` for ~str and @str as well


alexcrichton Aug 14, 2013
22c7bbf

Delegate `{}` to Default instead of Poly


alexcrichton Aug 15, 2013

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 53 additions & 3 deletions
src/libstd/fmt/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -356,28 +356,46 @@ pub struct Argument<'self> {
 priv value: &'self util::Void,
}

/// When a format is not otherwise specified, types are formatted by ascribing
/// to this trait. There is not an explicit way of selecting this trait to be
/// used for formatting, it is only if no other format is specified.
#[allow(missing_doc)]
pub trait Default { fn fmt(&Self, &mut Formatter); }

/// Format trait for the `b` character
#[allow(missing_doc)]
pub trait Bool { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `c` character
#[allow(missing_doc)]
pub trait Char { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `i` and `d` characters
#[allow(missing_doc)]
pub trait Signed { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `u` character
#[allow(missing_doc)]
pub trait Unsigned { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `o` character
#[allow(missing_doc)]
pub trait Octal { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `b` character
#[allow(missing_doc)]
pub trait Binary { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `x` character
#[allow(missing_doc)]
pub trait LowerHex { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `X` character
#[allow(missing_doc)]
pub trait UpperHex { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `s` character
#[allow(missing_doc)]
pub trait String { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `?` character
#[allow(missing_doc)]
pub trait Poly { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `p` character
#[allow(missing_doc)]
pub trait Pointer { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `f` character
#[allow(missing_doc)]
pub trait Float { fn fmt(&Self, &mut Formatter); }

Expand DownExpand Up@@ -726,9 +744,9 @@ impl Bool for bool {
 }
}

impl<'self> String for &'self str {
 fn fmt(s: & &'self str, f: &mut Formatter) {
 f.pad(*s);
impl<'self, T: str::Str> String for T {
 fn fmt(s: &T, f: &mut Formatter) {
 f.pad(s.as_slice());
 }
}

Expand DownExpand Up@@ -855,5 +873,37 @@ impl<T> Pointer for *const T {
 }
}

// Implementation of Default for various core types

macro_rules! delegate(($ty:ty to $other:ident) => {
 impl<'self> Default for $ty {
 fn fmt(me: &$ty, f: &mut Formatter) {
 $other::fmt(me, f)
 }
 }
})
delegate!(int to Signed)
delegate!( i8 to Signed)
delegate!(i16 to Signed)
delegate!(i32 to Signed)
delegate!(i64 to Signed)
delegate!(uint to Unsigned)
delegate!( u8 to Unsigned)
delegate!( u16 to Unsigned)
delegate!( u32 to Unsigned)
delegate!( u64 to Unsigned)
delegate!(@str to String)
delegate!(~str to String)
delegate!(&'self str to String)
delegate!(bool to Bool)
delegate!(char to Char)
delegate!(float to Float)
delegate!(f32 to Float)
delegate!(f64 to Float)

impl<T> Default for *const T {
 fn fmt(me: &*const T, f: &mut Formatter) { Pointer::fmt(me, f) }
}

// If you expected tests to be here, look instead at the run-pass/ifmt.rs test,
// it's a lot easier than creating all of the rt::Piece structures here.

6 changes: 5 additions & 1 deletion
src/libstd/fmt/parse.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -339,7 +339,11 @@ impl<'self> Parser<'self> {
 }
 }
 // Finally the actual format specifier
 spec.ty = self.word();
 if self.consume('?') {
 spec.ty = "?";
 } else {
 spec.ty = self.word();
 }
 return spec;
 }

Expand Down

43 changes: 20 additions & 23 deletions
src/libsyntax/ext/ifmt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -623,19 +623,16 @@ impl Context {

 fn format_arg(&self, sp: span, arg: Either<uint, @str>,
 ident: ast::ident) -> @ast::expr {
 let mut ty = match arg {
 let ty = match arg {
 Left(i) => self.arg_types[i].unwrap(),
 Right(s) => *self.name_types.get(&s)
 };
 // Default types to '?' if nothing else is specified.
 if ty == Unknown {
 ty = Known(@"?");
 }

 let argptr = self.ecx.expr_addr_of(sp, self.ecx.expr_ident(sp, ident));
 match ty {
 let fmt_trait = match ty {
 Unknown => "Default",
 Known(tyname) => {
let fmt_trait = match tyname.as_slice() {
 match tyname.as_slice() {
 "?" => "Poly",
 "b" => "Bool",
 "c" => "Char",
Expand All@@ -653,35 +650,35 @@ impl Context {
 `%s`", tyname));
 "Dummy"
 }
 };
 let format_fn = self.ecx.path_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of(fmt_trait),
 self.ecx.ident_of("fmt"),
 ]);
 self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argument"),
 ], ~[self.ecx.expr_path(format_fn), argptr])
 }
 }
 String => {
 self.ecx.expr_call_global(sp, ~[
return self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argumentstr"),
 ], ~[argptr])
 }
 Unsigned => {
 self.ecx.expr_call_global(sp, ~[
return self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argumentuint"),
 ], ~[argptr])
 }
 Unknown => { fail!() }
 }
 };

 let format_fn = self.ecx.path_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of(fmt_trait),
 self.ecx.ident_of("fmt"),
 ]);
 self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argument"),
 ], ~[self.ecx.expr_path(format_fn), argptr])
 }
}

Expand Down

32 changes: 27 additions & 5 deletions
src/test/run-pass/ifmt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,16 +25,36 @@ pub fn main() {
 macro_rules! t(($a:expr, $b:expr) => { assert_eq!($a, $b.to_owned()) })

 // Make sure there's a poly formatter that takes anything
 t!(ifmt!("{}", 1), "1");
 t!(ifmt!("{}", A), "{}");
 t!(ifmt!("{}", ()), "()");
 t!(ifmt!("{}", @(~1, "foo")), "@(~1, \"foo\")");
 t!(ifmt!("{:?}", 1), "1");
 t!(ifmt!("{:?}", A), "{}");
 t!(ifmt!("{:?}", ()), "()");
 t!(ifmt!("{:?}", @(~1, "foo")), "@(~1, \"foo\")");

 // Various edge cases without formats
 t!(ifmt!(""), "");
 t!(ifmt!("hello"), "hello");
 t!(ifmt!("hello \\{"), "hello {");

 // default formatters should work
 t!(ifmt!("{}", 1i), "1");
 t!(ifmt!("{}", 1i8), "1");
 t!(ifmt!("{}", 1i16), "1");
 t!(ifmt!("{}", 1i32), "1");
 t!(ifmt!("{}", 1i64), "1");
 t!(ifmt!("{}", 1u), "1");
 t!(ifmt!("{}", 1u8), "1");
 t!(ifmt!("{}", 1u16), "1");
 t!(ifmt!("{}", 1u32), "1");
 t!(ifmt!("{}", 1u64), "1");
 t!(ifmt!("{}", 1.0f), "1");
 t!(ifmt!("{}", 1.0f32), "1");
 t!(ifmt!("{}", 1.0f64), "1");
 t!(ifmt!("{}", "a"), "a");
 t!(ifmt!("{}", ~"a"), "a");
 t!(ifmt!("{}", @"a"), "a");
 t!(ifmt!("{}", false), "false");
 t!(ifmt!("{}", 'a'), "a");

 // At least exercise all the formats
 t!(ifmt!("{:b}", true), "true");
 t!(ifmt!("{:c}", '☃'), "☃");
Expand All@@ -45,6 +65,8 @@ pub fn main() {
 t!(ifmt!("{:x}", 10u), "a");
 t!(ifmt!("{:X}", 10u), "A");
 t!(ifmt!("{:s}", "foo"), "foo");
 t!(ifmt!("{:s}", ~"foo"), "foo");
 t!(ifmt!("{:s}", @"foo"), "foo");
 t!(ifmt!("{:p}", 0x1234 as *int), "0x1234");
 t!(ifmt!("{:p}", 0x1234 as *mut int), "0x1234");
 t!(ifmt!("{:d}", A), "aloha");
Expand All@@ -54,7 +76,7 @@ pub fn main() {
 t!(ifmt!("{foo} {bar}", foo=0, bar=1), "0 1");
 t!(ifmt!("{foo} {1} {bar} {0}", 0, 1, foo=2, bar=3), "2 1 3 0");
 t!(ifmt!("{} {0:s}", "a"), "a a");
 t!(ifmt!("{} {0}", "a"), "\"a\" \"a\"");
 t!(ifmt!("{} {0}", "a"), "a a");

 // Methods should probably work
 t!(ifmt!("{0, plural, =1{a#} =2{b#} zero{c#} other{d#}}", 0u), "c0");
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Create a `Default` trait for an empty format string by alexcrichton · Pull Request #8564 · rust-lang/rust · GitHub
Skip to content
Create a Default trait for an empty format string#8564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

alexcrichton
wants to merge
2
commits into

from

 Closed


Create a Default trait for an empty format string
#8564
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1092744

Implement `{:s}` for ~str and @str as well


alexcrichton Aug 14, 2013
22c7bbf

Delegate `{}` to Default instead of Poly


alexcrichton Aug 15, 2013

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 53 additions & 3 deletions
src/libstd/fmt/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -356,28 +356,46 @@ pub struct Argument<'self> {
 priv value: &'self util::Void,
}

/// When a format is not otherwise specified, types are formatted by ascribing
/// to this trait. There is not an explicit way of selecting this trait to be
/// used for formatting, it is only if no other format is specified.
#[allow(missing_doc)]
pub trait Default { fn fmt(&Self, &mut Formatter); }

/// Format trait for the `b` character
#[allow(missing_doc)]
pub trait Bool { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `c` character
#[allow(missing_doc)]
pub trait Char { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `i` and `d` characters
#[allow(missing_doc)]
pub trait Signed { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `u` character
#[allow(missing_doc)]
pub trait Unsigned { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `o` character
#[allow(missing_doc)]
pub trait Octal { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `b` character
#[allow(missing_doc)]
pub trait Binary { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `x` character
#[allow(missing_doc)]
pub trait LowerHex { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `X` character
#[allow(missing_doc)]
pub trait UpperHex { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `s` character
#[allow(missing_doc)]
pub trait String { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `?` character
#[allow(missing_doc)]
pub trait Poly { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `p` character
#[allow(missing_doc)]
pub trait Pointer { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `f` character
#[allow(missing_doc)]
pub trait Float { fn fmt(&Self, &mut Formatter); }

Expand DownExpand Up@@ -726,9 +744,9 @@ impl Bool for bool {
 }
}

impl<'self> String for &'self str {
 fn fmt(s: & &'self str, f: &mut Formatter) {
 f.pad(*s);
impl<'self, T: str::Str> String for T {
 fn fmt(s: &T, f: &mut Formatter) {
 f.pad(s.as_slice());
 }
}

Expand DownExpand Up@@ -855,5 +873,37 @@ impl<T> Pointer for *const T {
 }
}

// Implementation of Default for various core types

macro_rules! delegate(($ty:ty to $other:ident) => {
 impl<'self> Default for $ty {
 fn fmt(me: &$ty, f: &mut Formatter) {
 $other::fmt(me, f)
 }
 }
})
delegate!(int to Signed)
delegate!( i8 to Signed)
delegate!(i16 to Signed)
delegate!(i32 to Signed)
delegate!(i64 to Signed)
delegate!(uint to Unsigned)
delegate!( u8 to Unsigned)
delegate!( u16 to Unsigned)
delegate!( u32 to Unsigned)
delegate!( u64 to Unsigned)
delegate!(@str to String)
delegate!(~str to String)
delegate!(&'self str to String)
delegate!(bool to Bool)
delegate!(char to Char)
delegate!(float to Float)
delegate!(f32 to Float)
delegate!(f64 to Float)

impl<T> Default for *const T {
 fn fmt(me: &*const T, f: &mut Formatter) { Pointer::fmt(me, f) }
}

// If you expected tests to be here, look instead at the run-pass/ifmt.rs test,
// it's a lot easier than creating all of the rt::Piece structures here.

6 changes: 5 additions & 1 deletion
src/libstd/fmt/parse.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -339,7 +339,11 @@ impl<'self> Parser<'self> {
 }
 }
 // Finally the actual format specifier
 spec.ty = self.word();
 if self.consume('?') {
 spec.ty = "?";
 } else {
 spec.ty = self.word();
 }
 return spec;
 }

Expand Down

43 changes: 20 additions & 23 deletions
src/libsyntax/ext/ifmt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -623,19 +623,16 @@ impl Context {

 fn format_arg(&self, sp: span, arg: Either<uint, @str>,
 ident: ast::ident) -> @ast::expr {
 let mut ty = match arg {
 let ty = match arg {
 Left(i) => self.arg_types[i].unwrap(),
 Right(s) => *self.name_types.get(&s)
 };
 // Default types to '?' if nothing else is specified.
 if ty == Unknown {
 ty = Known(@"?");
 }

 let argptr = self.ecx.expr_addr_of(sp, self.ecx.expr_ident(sp, ident));
 match ty {
 let fmt_trait = match ty {
 Unknown => "Default",
 Known(tyname) => {
let fmt_trait = match tyname.as_slice() {
 match tyname.as_slice() {
 "?" => "Poly",
 "b" => "Bool",
 "c" => "Char",
Expand All@@ -653,35 +650,35 @@ impl Context {
 `%s`", tyname));
 "Dummy"
 }
 };
 let format_fn = self.ecx.path_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of(fmt_trait),
 self.ecx.ident_of("fmt"),
 ]);
 self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argument"),
 ], ~[self.ecx.expr_path(format_fn), argptr])
 }
 }
 String => {
 self.ecx.expr_call_global(sp, ~[
return self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argumentstr"),
 ], ~[argptr])
 }
 Unsigned => {
 self.ecx.expr_call_global(sp, ~[
return self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argumentuint"),
 ], ~[argptr])
 }
 Unknown => { fail!() }
 }
 };

 let format_fn = self.ecx.path_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of(fmt_trait),
 self.ecx.ident_of("fmt"),
 ]);
 self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argument"),
 ], ~[self.ecx.expr_path(format_fn), argptr])
 }
}

Expand Down

32 changes: 27 additions & 5 deletions
src/test/run-pass/ifmt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,16 +25,36 @@ pub fn main() {
 macro_rules! t(($a:expr, $b:expr) => { assert_eq!($a, $b.to_owned()) })

 // Make sure there's a poly formatter that takes anything
 t!(ifmt!("{}", 1), "1");
 t!(ifmt!("{}", A), "{}");
 t!(ifmt!("{}", ()), "()");
 t!(ifmt!("{}", @(~1, "foo")), "@(~1, \"foo\")");
 t!(ifmt!("{:?}", 1), "1");
 t!(ifmt!("{:?}", A), "{}");
 t!(ifmt!("{:?}", ()), "()");
 t!(ifmt!("{:?}", @(~1, "foo")), "@(~1, \"foo\")");

 // Various edge cases without formats
 t!(ifmt!(""), "");
 t!(ifmt!("hello"), "hello");
 t!(ifmt!("hello \\{"), "hello {");

 // default formatters should work
 t!(ifmt!("{}", 1i), "1");
 t!(ifmt!("{}", 1i8), "1");
 t!(ifmt!("{}", 1i16), "1");
 t!(ifmt!("{}", 1i32), "1");
 t!(ifmt!("{}", 1i64), "1");
 t!(ifmt!("{}", 1u), "1");
 t!(ifmt!("{}", 1u8), "1");
 t!(ifmt!("{}", 1u16), "1");
 t!(ifmt!("{}", 1u32), "1");
 t!(ifmt!("{}", 1u64), "1");
 t!(ifmt!("{}", 1.0f), "1");
 t!(ifmt!("{}", 1.0f32), "1");
 t!(ifmt!("{}", 1.0f64), "1");
 t!(ifmt!("{}", "a"), "a");
 t!(ifmt!("{}", ~"a"), "a");
 t!(ifmt!("{}", @"a"), "a");
 t!(ifmt!("{}", false), "false");
 t!(ifmt!("{}", 'a'), "a");

 // At least exercise all the formats
 t!(ifmt!("{:b}", true), "true");
 t!(ifmt!("{:c}", '☃'), "☃");
Expand All@@ -45,6 +65,8 @@ pub fn main() {
 t!(ifmt!("{:x}", 10u), "a");
 t!(ifmt!("{:X}", 10u), "A");
 t!(ifmt!("{:s}", "foo"), "foo");
 t!(ifmt!("{:s}", ~"foo"), "foo");
 t!(ifmt!("{:s}", @"foo"), "foo");
 t!(ifmt!("{:p}", 0x1234 as *int), "0x1234");
 t!(ifmt!("{:p}", 0x1234 as *mut int), "0x1234");
 t!(ifmt!("{:d}", A), "aloha");
Expand All@@ -54,7 +76,7 @@ pub fn main() {
 t!(ifmt!("{foo} {bar}", foo=0, bar=1), "0 1");
 t!(ifmt!("{foo} {1} {bar} {0}", 0, 1, foo=2, bar=3), "2 1 3 0");
 t!(ifmt!("{} {0:s}", "a"), "a a");
 t!(ifmt!("{} {0}", "a"), "\"a\" \"a\"");
 t!(ifmt!("{} {0}", "a"), "a a");

 // Methods should probably work
 t!(ifmt!("{0, plural, =1{a#} =2{b#} zero{c#} other{d#}}", 0u), "c0");
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Create a `Default` trait for an empty format string by alexcrichton · Pull Request #8564 · rust-lang/rust · GitHub
Skip to content
Create a Default trait for an empty format string#8564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

alexcrichton
wants to merge
2
commits into

from

 Closed


Create a Default trait for an empty format string
#8564
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1092744

Implement `{:s}` for ~str and @str as well


alexcrichton Aug 14, 2013
22c7bbf

Delegate `{}` to Default instead of Poly


alexcrichton Aug 15, 2013

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 53 additions & 3 deletions
src/libstd/fmt/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -356,28 +356,46 @@ pub struct Argument<'self> {
 priv value: &'self util::Void,
}

/// When a format is not otherwise specified, types are formatted by ascribing
/// to this trait. There is not an explicit way of selecting this trait to be
/// used for formatting, it is only if no other format is specified.
#[allow(missing_doc)]
pub trait Default { fn fmt(&Self, &mut Formatter); }

/// Format trait for the `b` character
#[allow(missing_doc)]
pub trait Bool { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `c` character
#[allow(missing_doc)]
pub trait Char { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `i` and `d` characters
#[allow(missing_doc)]
pub trait Signed { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `u` character
#[allow(missing_doc)]
pub trait Unsigned { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `o` character
#[allow(missing_doc)]
pub trait Octal { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `b` character
#[allow(missing_doc)]
pub trait Binary { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `x` character
#[allow(missing_doc)]
pub trait LowerHex { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `X` character
#[allow(missing_doc)]
pub trait UpperHex { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `s` character
#[allow(missing_doc)]
pub trait String { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `?` character
#[allow(missing_doc)]
pub trait Poly { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `p` character
#[allow(missing_doc)]
pub trait Pointer { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `f` character
#[allow(missing_doc)]
pub trait Float { fn fmt(&Self, &mut Formatter); }

Expand DownExpand Up@@ -726,9 +744,9 @@ impl Bool for bool {
 }
}

impl<'self> String for &'self str {
 fn fmt(s: & &'self str, f: &mut Formatter) {
 f.pad(*s);
impl<'self, T: str::Str> String for T {
 fn fmt(s: &T, f: &mut Formatter) {
 f.pad(s.as_slice());
 }
}

Expand DownExpand Up@@ -855,5 +873,37 @@ impl<T> Pointer for *const T {
 }
}

// Implementation of Default for various core types

macro_rules! delegate(($ty:ty to $other:ident) => {
 impl<'self> Default for $ty {
 fn fmt(me: &$ty, f: &mut Formatter) {
 $other::fmt(me, f)
 }
 }
})
delegate!(int to Signed)
delegate!( i8 to Signed)
delegate!(i16 to Signed)
delegate!(i32 to Signed)
delegate!(i64 to Signed)
delegate!(uint to Unsigned)
delegate!( u8 to Unsigned)
delegate!( u16 to Unsigned)
delegate!( u32 to Unsigned)
delegate!( u64 to Unsigned)
delegate!(@str to String)
delegate!(~str to String)
delegate!(&'self str to String)
delegate!(bool to Bool)
delegate!(char to Char)
delegate!(float to Float)
delegate!(f32 to Float)
delegate!(f64 to Float)

impl<T> Default for *const T {
 fn fmt(me: &*const T, f: &mut Formatter) { Pointer::fmt(me, f) }
}

// If you expected tests to be here, look instead at the run-pass/ifmt.rs test,
// it's a lot easier than creating all of the rt::Piece structures here.

6 changes: 5 additions & 1 deletion
src/libstd/fmt/parse.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -339,7 +339,11 @@ impl<'self> Parser<'self> {
 }
 }
 // Finally the actual format specifier
 spec.ty = self.word();
 if self.consume('?') {
 spec.ty = "?";
 } else {
 spec.ty = self.word();
 }
 return spec;
 }

Expand Down

43 changes: 20 additions & 23 deletions
src/libsyntax/ext/ifmt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -623,19 +623,16 @@ impl Context {

 fn format_arg(&self, sp: span, arg: Either<uint, @str>,
 ident: ast::ident) -> @ast::expr {
 let mut ty = match arg {
 let ty = match arg {
 Left(i) => self.arg_types[i].unwrap(),
 Right(s) => *self.name_types.get(&s)
 };
 // Default types to '?' if nothing else is specified.
 if ty == Unknown {
 ty = Known(@"?");
 }

 let argptr = self.ecx.expr_addr_of(sp, self.ecx.expr_ident(sp, ident));
 match ty {
 let fmt_trait = match ty {
 Unknown => "Default",
 Known(tyname) => {
let fmt_trait = match tyname.as_slice() {
 match tyname.as_slice() {
 "?" => "Poly",
 "b" => "Bool",
 "c" => "Char",
Expand All@@ -653,35 +650,35 @@ impl Context {
 `%s`", tyname));
 "Dummy"
 }
 };
 let format_fn = self.ecx.path_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of(fmt_trait),
 self.ecx.ident_of("fmt"),
 ]);
 self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argument"),
 ], ~[self.ecx.expr_path(format_fn), argptr])
 }
 }
 String => {
 self.ecx.expr_call_global(sp, ~[
return self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argumentstr"),
 ], ~[argptr])
 }
 Unsigned => {
 self.ecx.expr_call_global(sp, ~[
return self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argumentuint"),
 ], ~[argptr])
 }
 Unknown => { fail!() }
 }
 };

 let format_fn = self.ecx.path_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of(fmt_trait),
 self.ecx.ident_of("fmt"),
 ]);
 self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argument"),
 ], ~[self.ecx.expr_path(format_fn), argptr])
 }
}

Expand Down

32 changes: 27 additions & 5 deletions
src/test/run-pass/ifmt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,16 +25,36 @@ pub fn main() {
 macro_rules! t(($a:expr, $b:expr) => { assert_eq!($a, $b.to_owned()) })

 // Make sure there's a poly formatter that takes anything
 t!(ifmt!("{}", 1), "1");
 t!(ifmt!("{}", A), "{}");
 t!(ifmt!("{}", ()), "()");
 t!(ifmt!("{}", @(~1, "foo")), "@(~1, \"foo\")");
 t!(ifmt!("{:?}", 1), "1");
 t!(ifmt!("{:?}", A), "{}");
 t!(ifmt!("{:?}", ()), "()");
 t!(ifmt!("{:?}", @(~1, "foo")), "@(~1, \"foo\")");

 // Various edge cases without formats
 t!(ifmt!(""), "");
 t!(ifmt!("hello"), "hello");
 t!(ifmt!("hello \\{"), "hello {");

 // default formatters should work
 t!(ifmt!("{}", 1i), "1");
 t!(ifmt!("{}", 1i8), "1");
 t!(ifmt!("{}", 1i16), "1");
 t!(ifmt!("{}", 1i32), "1");
 t!(ifmt!("{}", 1i64), "1");
 t!(ifmt!("{}", 1u), "1");
 t!(ifmt!("{}", 1u8), "1");
 t!(ifmt!("{}", 1u16), "1");
 t!(ifmt!("{}", 1u32), "1");
 t!(ifmt!("{}", 1u64), "1");
 t!(ifmt!("{}", 1.0f), "1");
 t!(ifmt!("{}", 1.0f32), "1");
 t!(ifmt!("{}", 1.0f64), "1");
 t!(ifmt!("{}", "a"), "a");
 t!(ifmt!("{}", ~"a"), "a");
 t!(ifmt!("{}", @"a"), "a");
 t!(ifmt!("{}", false), "false");
 t!(ifmt!("{}", 'a'), "a");

 // At least exercise all the formats
 t!(ifmt!("{:b}", true), "true");
 t!(ifmt!("{:c}", '☃'), "☃");
Expand All@@ -45,6 +65,8 @@ pub fn main() {
 t!(ifmt!("{:x}", 10u), "a");
 t!(ifmt!("{:X}", 10u), "A");
 t!(ifmt!("{:s}", "foo"), "foo");
 t!(ifmt!("{:s}", ~"foo"), "foo");
 t!(ifmt!("{:s}", @"foo"), "foo");
 t!(ifmt!("{:p}", 0x1234 as *int), "0x1234");
 t!(ifmt!("{:p}", 0x1234 as *mut int), "0x1234");
 t!(ifmt!("{:d}", A), "aloha");
Expand All@@ -54,7 +76,7 @@ pub fn main() {
 t!(ifmt!("{foo} {bar}", foo=0, bar=1), "0 1");
 t!(ifmt!("{foo} {1} {bar} {0}", 0, 1, foo=2, bar=3), "2 1 3 0");
 t!(ifmt!("{} {0:s}", "a"), "a a");
 t!(ifmt!("{} {0}", "a"), "\"a\" \"a\"");
 t!(ifmt!("{} {0}", "a"), "a a");

 // Methods should probably work
 t!(ifmt!("{0, plural, =1{a#} =2{b#} zero{c#} other{d#}}", 0u), "c0");
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Create a `Default` trait for an empty format string by alexcrichton · Pull Request #8564 · rust-lang/rust · GitHub
Skip to content
Create a Default trait for an empty format string#8564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

alexcrichton
wants to merge
2
commits into

from

 Closed


Create a Default trait for an empty format string
#8564
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1092744

Implement `{:s}` for ~str and @str as well


alexcrichton Aug 14, 2013
22c7bbf

Delegate `{}` to Default instead of Poly


alexcrichton Aug 15, 2013

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 53 additions & 3 deletions
src/libstd/fmt/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -356,28 +356,46 @@ pub struct Argument<'self> {
 priv value: &'self util::Void,
}

/// When a format is not otherwise specified, types are formatted by ascribing
/// to this trait. There is not an explicit way of selecting this trait to be
/// used for formatting, it is only if no other format is specified.
#[allow(missing_doc)]
pub trait Default { fn fmt(&Self, &mut Formatter); }

/// Format trait for the `b` character
#[allow(missing_doc)]
pub trait Bool { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `c` character
#[allow(missing_doc)]
pub trait Char { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `i` and `d` characters
#[allow(missing_doc)]
pub trait Signed { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `u` character
#[allow(missing_doc)]
pub trait Unsigned { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `o` character
#[allow(missing_doc)]
pub trait Octal { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `b` character
#[allow(missing_doc)]
pub trait Binary { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `x` character
#[allow(missing_doc)]
pub trait LowerHex { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `X` character
#[allow(missing_doc)]
pub trait UpperHex { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `s` character
#[allow(missing_doc)]
pub trait String { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `?` character
#[allow(missing_doc)]
pub trait Poly { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `p` character
#[allow(missing_doc)]
pub trait Pointer { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `f` character
#[allow(missing_doc)]
pub trait Float { fn fmt(&Self, &mut Formatter); }

Expand DownExpand Up@@ -726,9 +744,9 @@ impl Bool for bool {
 }
}

impl<'self> String for &'self str {
 fn fmt(s: & &'self str, f: &mut Formatter) {
 f.pad(*s);
impl<'self, T: str::Str> String for T {
 fn fmt(s: &T, f: &mut Formatter) {
 f.pad(s.as_slice());
 }
}

Expand DownExpand Up@@ -855,5 +873,37 @@ impl<T> Pointer for *const T {
 }
}

// Implementation of Default for various core types

macro_rules! delegate(($ty:ty to $other:ident) => {
 impl<'self> Default for $ty {
 fn fmt(me: &$ty, f: &mut Formatter) {
 $other::fmt(me, f)
 }
 }
})
delegate!(int to Signed)
delegate!( i8 to Signed)
delegate!(i16 to Signed)
delegate!(i32 to Signed)
delegate!(i64 to Signed)
delegate!(uint to Unsigned)
delegate!( u8 to Unsigned)
delegate!( u16 to Unsigned)
delegate!( u32 to Unsigned)
delegate!( u64 to Unsigned)
delegate!(@str to String)
delegate!(~str to String)
delegate!(&'self str to String)
delegate!(bool to Bool)
delegate!(char to Char)
delegate!(float to Float)
delegate!(f32 to Float)
delegate!(f64 to Float)

impl<T> Default for *const T {
 fn fmt(me: &*const T, f: &mut Formatter) { Pointer::fmt(me, f) }
}

// If you expected tests to be here, look instead at the run-pass/ifmt.rs test,
// it's a lot easier than creating all of the rt::Piece structures here.

6 changes: 5 additions & 1 deletion
src/libstd/fmt/parse.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -339,7 +339,11 @@ impl<'self> Parser<'self> {
 }
 }
 // Finally the actual format specifier
 spec.ty = self.word();
 if self.consume('?') {
 spec.ty = "?";
 } else {
 spec.ty = self.word();
 }
 return spec;
 }

Expand Down

43 changes: 20 additions & 23 deletions
src/libsyntax/ext/ifmt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -623,19 +623,16 @@ impl Context {

 fn format_arg(&self, sp: span, arg: Either<uint, @str>,
 ident: ast::ident) -> @ast::expr {
 let mut ty = match arg {
 let ty = match arg {
 Left(i) => self.arg_types[i].unwrap(),
 Right(s) => *self.name_types.get(&s)
 };
 // Default types to '?' if nothing else is specified.
 if ty == Unknown {
 ty = Known(@"?");
 }

 let argptr = self.ecx.expr_addr_of(sp, self.ecx.expr_ident(sp, ident));
 match ty {
 let fmt_trait = match ty {
 Unknown => "Default",
 Known(tyname) => {
let fmt_trait = match tyname.as_slice() {
 match tyname.as_slice() {
 "?" => "Poly",
 "b" => "Bool",
 "c" => "Char",
Expand All@@ -653,35 +650,35 @@ impl Context {
 `%s`", tyname));
 "Dummy"
 }
 };
 let format_fn = self.ecx.path_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of(fmt_trait),
 self.ecx.ident_of("fmt"),
 ]);
 self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argument"),
 ], ~[self.ecx.expr_path(format_fn), argptr])
 }
 }
 String => {
 self.ecx.expr_call_global(sp, ~[
return self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argumentstr"),
 ], ~[argptr])
 }
 Unsigned => {
 self.ecx.expr_call_global(sp, ~[
return self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argumentuint"),
 ], ~[argptr])
 }
 Unknown => { fail!() }
 }
 };

 let format_fn = self.ecx.path_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of(fmt_trait),
 self.ecx.ident_of("fmt"),
 ]);
 self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argument"),
 ], ~[self.ecx.expr_path(format_fn), argptr])
 }
}

Expand Down

32 changes: 27 additions & 5 deletions
src/test/run-pass/ifmt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,16 +25,36 @@ pub fn main() {
 macro_rules! t(($a:expr, $b:expr) => { assert_eq!($a, $b.to_owned()) })

 // Make sure there's a poly formatter that takes anything
 t!(ifmt!("{}", 1), "1");
 t!(ifmt!("{}", A), "{}");
 t!(ifmt!("{}", ()), "()");
 t!(ifmt!("{}", @(~1, "foo")), "@(~1, \"foo\")");
 t!(ifmt!("{:?}", 1), "1");
 t!(ifmt!("{:?}", A), "{}");
 t!(ifmt!("{:?}", ()), "()");
 t!(ifmt!("{:?}", @(~1, "foo")), "@(~1, \"foo\")");

 // Various edge cases without formats
 t!(ifmt!(""), "");
 t!(ifmt!("hello"), "hello");
 t!(ifmt!("hello \\{"), "hello {");

 // default formatters should work
 t!(ifmt!("{}", 1i), "1");
 t!(ifmt!("{}", 1i8), "1");
 t!(ifmt!("{}", 1i16), "1");
 t!(ifmt!("{}", 1i32), "1");
 t!(ifmt!("{}", 1i64), "1");
 t!(ifmt!("{}", 1u), "1");
 t!(ifmt!("{}", 1u8), "1");
 t!(ifmt!("{}", 1u16), "1");
 t!(ifmt!("{}", 1u32), "1");
 t!(ifmt!("{}", 1u64), "1");
 t!(ifmt!("{}", 1.0f), "1");
 t!(ifmt!("{}", 1.0f32), "1");
 t!(ifmt!("{}", 1.0f64), "1");
 t!(ifmt!("{}", "a"), "a");
 t!(ifmt!("{}", ~"a"), "a");
 t!(ifmt!("{}", @"a"), "a");
 t!(ifmt!("{}", false), "false");
 t!(ifmt!("{}", 'a'), "a");

 // At least exercise all the formats
 t!(ifmt!("{:b}", true), "true");
 t!(ifmt!("{:c}", '☃'), "☃");
Expand All@@ -45,6 +65,8 @@ pub fn main() {
 t!(ifmt!("{:x}", 10u), "a");
 t!(ifmt!("{:X}", 10u), "A");
 t!(ifmt!("{:s}", "foo"), "foo");
 t!(ifmt!("{:s}", ~"foo"), "foo");
 t!(ifmt!("{:s}", @"foo"), "foo");
 t!(ifmt!("{:p}", 0x1234 as *int), "0x1234");
 t!(ifmt!("{:p}", 0x1234 as *mut int), "0x1234");
 t!(ifmt!("{:d}", A), "aloha");
Expand All@@ -54,7 +76,7 @@ pub fn main() {
 t!(ifmt!("{foo} {bar}", foo=0, bar=1), "0 1");
 t!(ifmt!("{foo} {1} {bar} {0}", 0, 1, foo=2, bar=3), "2 1 3 0");
 t!(ifmt!("{} {0:s}", "a"), "a a");
 t!(ifmt!("{} {0}", "a"), "\"a\" \"a\"");
 t!(ifmt!("{} {0}", "a"), "a a");

 // Methods should probably work
 t!(ifmt!("{0, plural, =1{a#} =2{b#} zero{c#} other{d#}}", 0u), "c0");
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Create a `Default` trait for an empty format string by alexcrichton · Pull Request #8564 · rust-lang/rust · GitHub
Skip to content
Create a Default trait for an empty format string#8564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

alexcrichton
wants to merge
2
commits into

from

 Closed


Create a Default trait for an empty format string
#8564
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1092744

Implement `{:s}` for ~str and @str as well


alexcrichton Aug 14, 2013
22c7bbf

Delegate `{}` to Default instead of Poly


alexcrichton Aug 15, 2013

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 53 additions & 3 deletions
src/libstd/fmt/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -356,28 +356,46 @@ pub struct Argument<'self> {
 priv value: &'self util::Void,
}

/// When a format is not otherwise specified, types are formatted by ascribing
/// to this trait. There is not an explicit way of selecting this trait to be
/// used for formatting, it is only if no other format is specified.
#[allow(missing_doc)]
pub trait Default { fn fmt(&Self, &mut Formatter); }

/// Format trait for the `b` character
#[allow(missing_doc)]
pub trait Bool { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `c` character
#[allow(missing_doc)]
pub trait Char { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `i` and `d` characters
#[allow(missing_doc)]
pub trait Signed { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `u` character
#[allow(missing_doc)]
pub trait Unsigned { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `o` character
#[allow(missing_doc)]
pub trait Octal { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `b` character
#[allow(missing_doc)]
pub trait Binary { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `x` character
#[allow(missing_doc)]
pub trait LowerHex { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `X` character
#[allow(missing_doc)]
pub trait UpperHex { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `s` character
#[allow(missing_doc)]
pub trait String { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `?` character
#[allow(missing_doc)]
pub trait Poly { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `p` character
#[allow(missing_doc)]
pub trait Pointer { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `f` character
#[allow(missing_doc)]
pub trait Float { fn fmt(&Self, &mut Formatter); }

Expand DownExpand Up@@ -726,9 +744,9 @@ impl Bool for bool {
 }
}

impl<'self> String for &'self str {
 fn fmt(s: & &'self str, f: &mut Formatter) {
 f.pad(*s);
impl<'self, T: str::Str> String for T {
 fn fmt(s: &T, f: &mut Formatter) {
 f.pad(s.as_slice());
 }
}

Expand DownExpand Up@@ -855,5 +873,37 @@ impl<T> Pointer for *const T {
 }
}

// Implementation of Default for various core types

macro_rules! delegate(($ty:ty to $other:ident) => {
 impl<'self> Default for $ty {
 fn fmt(me: &$ty, f: &mut Formatter) {
 $other::fmt(me, f)
 }
 }
})
delegate!(int to Signed)
delegate!( i8 to Signed)
delegate!(i16 to Signed)
delegate!(i32 to Signed)
delegate!(i64 to Signed)
delegate!(uint to Unsigned)
delegate!( u8 to Unsigned)
delegate!( u16 to Unsigned)
delegate!( u32 to Unsigned)
delegate!( u64 to Unsigned)
delegate!(@str to String)
delegate!(~str to String)
delegate!(&'self str to String)
delegate!(bool to Bool)
delegate!(char to Char)
delegate!(float to Float)
delegate!(f32 to Float)
delegate!(f64 to Float)

impl<T> Default for *const T {
 fn fmt(me: &*const T, f: &mut Formatter) { Pointer::fmt(me, f) }
}

// If you expected tests to be here, look instead at the run-pass/ifmt.rs test,
// it's a lot easier than creating all of the rt::Piece structures here.

6 changes: 5 additions & 1 deletion
src/libstd/fmt/parse.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -339,7 +339,11 @@ impl<'self> Parser<'self> {
 }
 }
 // Finally the actual format specifier
 spec.ty = self.word();
 if self.consume('?') {
 spec.ty = "?";
 } else {
 spec.ty = self.word();
 }
 return spec;
 }

Expand Down

43 changes: 20 additions & 23 deletions
src/libsyntax/ext/ifmt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -623,19 +623,16 @@ impl Context {

 fn format_arg(&self, sp: span, arg: Either<uint, @str>,
 ident: ast::ident) -> @ast::expr {
 let mut ty = match arg {
 let ty = match arg {
 Left(i) => self.arg_types[i].unwrap(),
 Right(s) => *self.name_types.get(&s)
 };
 // Default types to '?' if nothing else is specified.
 if ty == Unknown {
 ty = Known(@"?");
 }

 let argptr = self.ecx.expr_addr_of(sp, self.ecx.expr_ident(sp, ident));
 match ty {
 let fmt_trait = match ty {
 Unknown => "Default",
 Known(tyname) => {
let fmt_trait = match tyname.as_slice() {
 match tyname.as_slice() {
 "?" => "Poly",
 "b" => "Bool",
 "c" => "Char",
Expand All@@ -653,35 +650,35 @@ impl Context {
 `%s`", tyname));
 "Dummy"
 }
 };
 let format_fn = self.ecx.path_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of(fmt_trait),
 self.ecx.ident_of("fmt"),
 ]);
 self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argument"),
 ], ~[self.ecx.expr_path(format_fn), argptr])
 }
 }
 String => {
 self.ecx.expr_call_global(sp, ~[
return self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argumentstr"),
 ], ~[argptr])
 }
 Unsigned => {
 self.ecx.expr_call_global(sp, ~[
return self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argumentuint"),
 ], ~[argptr])
 }
 Unknown => { fail!() }
 }
 };

 let format_fn = self.ecx.path_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of(fmt_trait),
 self.ecx.ident_of("fmt"),
 ]);
 self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argument"),
 ], ~[self.ecx.expr_path(format_fn), argptr])
 }
}

Expand Down

32 changes: 27 additions & 5 deletions
src/test/run-pass/ifmt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,16 +25,36 @@ pub fn main() {
 macro_rules! t(($a:expr, $b:expr) => { assert_eq!($a, $b.to_owned()) })

 // Make sure there's a poly formatter that takes anything
 t!(ifmt!("{}", 1), "1");
 t!(ifmt!("{}", A), "{}");
 t!(ifmt!("{}", ()), "()");
 t!(ifmt!("{}", @(~1, "foo")), "@(~1, \"foo\")");
 t!(ifmt!("{:?}", 1), "1");
 t!(ifmt!("{:?}", A), "{}");
 t!(ifmt!("{:?}", ()), "()");
 t!(ifmt!("{:?}", @(~1, "foo")), "@(~1, \"foo\")");

 // Various edge cases without formats
 t!(ifmt!(""), "");
 t!(ifmt!("hello"), "hello");
 t!(ifmt!("hello \\{"), "hello {");

 // default formatters should work
 t!(ifmt!("{}", 1i), "1");
 t!(ifmt!("{}", 1i8), "1");
 t!(ifmt!("{}", 1i16), "1");
 t!(ifmt!("{}", 1i32), "1");
 t!(ifmt!("{}", 1i64), "1");
 t!(ifmt!("{}", 1u), "1");
 t!(ifmt!("{}", 1u8), "1");
 t!(ifmt!("{}", 1u16), "1");
 t!(ifmt!("{}", 1u32), "1");
 t!(ifmt!("{}", 1u64), "1");
 t!(ifmt!("{}", 1.0f), "1");
 t!(ifmt!("{}", 1.0f32), "1");
 t!(ifmt!("{}", 1.0f64), "1");
 t!(ifmt!("{}", "a"), "a");
 t!(ifmt!("{}", ~"a"), "a");
 t!(ifmt!("{}", @"a"), "a");
 t!(ifmt!("{}", false), "false");
 t!(ifmt!("{}", 'a'), "a");

 // At least exercise all the formats
 t!(ifmt!("{:b}", true), "true");
 t!(ifmt!("{:c}", '☃'), "☃");
Expand All@@ -45,6 +65,8 @@ pub fn main() {
 t!(ifmt!("{:x}", 10u), "a");
 t!(ifmt!("{:X}", 10u), "A");
 t!(ifmt!("{:s}", "foo"), "foo");
 t!(ifmt!("{:s}", ~"foo"), "foo");
 t!(ifmt!("{:s}", @"foo"), "foo");
 t!(ifmt!("{:p}", 0x1234 as *int), "0x1234");
 t!(ifmt!("{:p}", 0x1234 as *mut int), "0x1234");
 t!(ifmt!("{:d}", A), "aloha");
Expand All@@ -54,7 +76,7 @@ pub fn main() {
 t!(ifmt!("{foo} {bar}", foo=0, bar=1), "0 1");
 t!(ifmt!("{foo} {1} {bar} {0}", 0, 1, foo=2, bar=3), "2 1 3 0");
 t!(ifmt!("{} {0:s}", "a"), "a a");
 t!(ifmt!("{} {0}", "a"), "\"a\" \"a\"");
 t!(ifmt!("{} {0}", "a"), "a a");

 // Methods should probably work
 t!(ifmt!("{0, plural, =1{a#} =2{b#} zero{c#} other{d#}}", 0u), "c0");
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Create a `Default` trait for an empty format string by alexcrichton · Pull Request #8564 · rust-lang/rust · GitHub
Skip to content
Create a Default trait for an empty format string#8564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

alexcrichton
wants to merge
2
commits into

from

 Closed


Create a Default trait for an empty format string
#8564
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1092744

Implement `{:s}` for ~str and @str as well


alexcrichton Aug 14, 2013
22c7bbf

Delegate `{}` to Default instead of Poly


alexcrichton Aug 15, 2013

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 53 additions & 3 deletions
src/libstd/fmt/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -356,28 +356,46 @@ pub struct Argument<'self> {
 priv value: &'self util::Void,
}

/// When a format is not otherwise specified, types are formatted by ascribing
/// to this trait. There is not an explicit way of selecting this trait to be
/// used for formatting, it is only if no other format is specified.
#[allow(missing_doc)]
pub trait Default { fn fmt(&Self, &mut Formatter); }

/// Format trait for the `b` character
#[allow(missing_doc)]
pub trait Bool { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `c` character
#[allow(missing_doc)]
pub trait Char { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `i` and `d` characters
#[allow(missing_doc)]
pub trait Signed { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `u` character
#[allow(missing_doc)]
pub trait Unsigned { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `o` character
#[allow(missing_doc)]
pub trait Octal { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `b` character
#[allow(missing_doc)]
pub trait Binary { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `x` character
#[allow(missing_doc)]
pub trait LowerHex { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `X` character
#[allow(missing_doc)]
pub trait UpperHex { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `s` character
#[allow(missing_doc)]
pub trait String { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `?` character
#[allow(missing_doc)]
pub trait Poly { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `p` character
#[allow(missing_doc)]
pub trait Pointer { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `f` character
#[allow(missing_doc)]
pub trait Float { fn fmt(&Self, &mut Formatter); }

Expand DownExpand Up@@ -726,9 +744,9 @@ impl Bool for bool {
 }
}

impl<'self> String for &'self str {
 fn fmt(s: & &'self str, f: &mut Formatter) {
 f.pad(*s);
impl<'self, T: str::Str> String for T {
 fn fmt(s: &T, f: &mut Formatter) {
 f.pad(s.as_slice());
 }
}

Expand DownExpand Up@@ -855,5 +873,37 @@ impl<T> Pointer for *const T {
 }
}

// Implementation of Default for various core types

macro_rules! delegate(($ty:ty to $other:ident) => {
 impl<'self> Default for $ty {
 fn fmt(me: &$ty, f: &mut Formatter) {
 $other::fmt(me, f)
 }
 }
})
delegate!(int to Signed)
delegate!( i8 to Signed)
delegate!(i16 to Signed)
delegate!(i32 to Signed)
delegate!(i64 to Signed)
delegate!(uint to Unsigned)
delegate!( u8 to Unsigned)
delegate!( u16 to Unsigned)
delegate!( u32 to Unsigned)
delegate!( u64 to Unsigned)
delegate!(@str to String)
delegate!(~str to String)
delegate!(&'self str to String)
delegate!(bool to Bool)
delegate!(char to Char)
delegate!(float to Float)
delegate!(f32 to Float)
delegate!(f64 to Float)

impl<T> Default for *const T {
 fn fmt(me: &*const T, f: &mut Formatter) { Pointer::fmt(me, f) }
}

// If you expected tests to be here, look instead at the run-pass/ifmt.rs test,
// it's a lot easier than creating all of the rt::Piece structures here.

6 changes: 5 additions & 1 deletion
src/libstd/fmt/parse.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -339,7 +339,11 @@ impl<'self> Parser<'self> {
 }
 }
 // Finally the actual format specifier
 spec.ty = self.word();
 if self.consume('?') {
 spec.ty = "?";
 } else {
 spec.ty = self.word();
 }
 return spec;
 }

Expand Down

43 changes: 20 additions & 23 deletions
src/libsyntax/ext/ifmt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -623,19 +623,16 @@ impl Context {

 fn format_arg(&self, sp: span, arg: Either<uint, @str>,
 ident: ast::ident) -> @ast::expr {
 let mut ty = match arg {
 let ty = match arg {
 Left(i) => self.arg_types[i].unwrap(),
 Right(s) => *self.name_types.get(&s)
 };
 // Default types to '?' if nothing else is specified.
 if ty == Unknown {
 ty = Known(@"?");
 }

 let argptr = self.ecx.expr_addr_of(sp, self.ecx.expr_ident(sp, ident));
 match ty {
 let fmt_trait = match ty {
 Unknown => "Default",
 Known(tyname) => {
let fmt_trait = match tyname.as_slice() {
 match tyname.as_slice() {
 "?" => "Poly",
 "b" => "Bool",
 "c" => "Char",
Expand All@@ -653,35 +650,35 @@ impl Context {
 `%s`", tyname));
 "Dummy"
 }
 };
 let format_fn = self.ecx.path_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of(fmt_trait),
 self.ecx.ident_of("fmt"),
 ]);
 self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argument"),
 ], ~[self.ecx.expr_path(format_fn), argptr])
 }
 }
 String => {
 self.ecx.expr_call_global(sp, ~[
return self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argumentstr"),
 ], ~[argptr])
 }
 Unsigned => {
 self.ecx.expr_call_global(sp, ~[
return self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argumentuint"),
 ], ~[argptr])
 }
 Unknown => { fail!() }
 }
 };

 let format_fn = self.ecx.path_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of(fmt_trait),
 self.ecx.ident_of("fmt"),
 ]);
 self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argument"),
 ], ~[self.ecx.expr_path(format_fn), argptr])
 }
}

Expand Down

32 changes: 27 additions & 5 deletions
src/test/run-pass/ifmt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,16 +25,36 @@ pub fn main() {
 macro_rules! t(($a:expr, $b:expr) => { assert_eq!($a, $b.to_owned()) })

 // Make sure there's a poly formatter that takes anything
 t!(ifmt!("{}", 1), "1");
 t!(ifmt!("{}", A), "{}");
 t!(ifmt!("{}", ()), "()");
 t!(ifmt!("{}", @(~1, "foo")), "@(~1, \"foo\")");
 t!(ifmt!("{:?}", 1), "1");
 t!(ifmt!("{:?}", A), "{}");
 t!(ifmt!("{:?}", ()), "()");
 t!(ifmt!("{:?}", @(~1, "foo")), "@(~1, \"foo\")");

 // Various edge cases without formats
 t!(ifmt!(""), "");
 t!(ifmt!("hello"), "hello");
 t!(ifmt!("hello \\{"), "hello {");

 // default formatters should work
 t!(ifmt!("{}", 1i), "1");
 t!(ifmt!("{}", 1i8), "1");
 t!(ifmt!("{}", 1i16), "1");
 t!(ifmt!("{}", 1i32), "1");
 t!(ifmt!("{}", 1i64), "1");
 t!(ifmt!("{}", 1u), "1");
 t!(ifmt!("{}", 1u8), "1");
 t!(ifmt!("{}", 1u16), "1");
 t!(ifmt!("{}", 1u32), "1");
 t!(ifmt!("{}", 1u64), "1");
 t!(ifmt!("{}", 1.0f), "1");
 t!(ifmt!("{}", 1.0f32), "1");
 t!(ifmt!("{}", 1.0f64), "1");
 t!(ifmt!("{}", "a"), "a");
 t!(ifmt!("{}", ~"a"), "a");
 t!(ifmt!("{}", @"a"), "a");
 t!(ifmt!("{}", false), "false");
 t!(ifmt!("{}", 'a'), "a");

 // At least exercise all the formats
 t!(ifmt!("{:b}", true), "true");
 t!(ifmt!("{:c}", '☃'), "☃");
Expand All@@ -45,6 +65,8 @@ pub fn main() {
 t!(ifmt!("{:x}", 10u), "a");
 t!(ifmt!("{:X}", 10u), "A");
 t!(ifmt!("{:s}", "foo"), "foo");
 t!(ifmt!("{:s}", ~"foo"), "foo");
 t!(ifmt!("{:s}", @"foo"), "foo");
 t!(ifmt!("{:p}", 0x1234 as *int), "0x1234");
 t!(ifmt!("{:p}", 0x1234 as *mut int), "0x1234");
 t!(ifmt!("{:d}", A), "aloha");
Expand All@@ -54,7 +76,7 @@ pub fn main() {
 t!(ifmt!("{foo} {bar}", foo=0, bar=1), "0 1");
 t!(ifmt!("{foo} {1} {bar} {0}", 0, 1, foo=2, bar=3), "2 1 3 0");
 t!(ifmt!("{} {0:s}", "a"), "a a");
 t!(ifmt!("{} {0}", "a"), "\"a\" \"a\"");
 t!(ifmt!("{} {0}", "a"), "a a");

 // Methods should probably work
 t!(ifmt!("{0, plural, =1{a#} =2{b#} zero{c#} other{d#}}", 0u), "c0");
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Create a `Default` trait for an empty format string by alexcrichton · Pull Request #8564 · rust-lang/rust · GitHub
Skip to content
Create a Default trait for an empty format string#8564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

alexcrichton
wants to merge
2
commits into

from

 Closed


Create a Default trait for an empty format string
#8564
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1092744

Implement `{:s}` for ~str and @str as well


alexcrichton Aug 14, 2013
22c7bbf

Delegate `{}` to Default instead of Poly


alexcrichton Aug 15, 2013

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 53 additions & 3 deletions
src/libstd/fmt/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -356,28 +356,46 @@ pub struct Argument<'self> {
 priv value: &'self util::Void,
}

/// When a format is not otherwise specified, types are formatted by ascribing
/// to this trait. There is not an explicit way of selecting this trait to be
/// used for formatting, it is only if no other format is specified.
#[allow(missing_doc)]
pub trait Default { fn fmt(&Self, &mut Formatter); }

/// Format trait for the `b` character
#[allow(missing_doc)]
pub trait Bool { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `c` character
#[allow(missing_doc)]
pub trait Char { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `i` and `d` characters
#[allow(missing_doc)]
pub trait Signed { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `u` character
#[allow(missing_doc)]
pub trait Unsigned { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `o` character
#[allow(missing_doc)]
pub trait Octal { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `b` character
#[allow(missing_doc)]
pub trait Binary { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `x` character
#[allow(missing_doc)]
pub trait LowerHex { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `X` character
#[allow(missing_doc)]
pub trait UpperHex { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `s` character
#[allow(missing_doc)]
pub trait String { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `?` character
#[allow(missing_doc)]
pub trait Poly { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `p` character
#[allow(missing_doc)]
pub trait Pointer { fn fmt(&Self, &mut Formatter); }
/// Format trait for the `f` character
#[allow(missing_doc)]
pub trait Float { fn fmt(&Self, &mut Formatter); }

Expand DownExpand Up@@ -726,9 +744,9 @@ impl Bool for bool {
 }
}

impl<'self> String for &'self str {
 fn fmt(s: & &'self str, f: &mut Formatter) {
 f.pad(*s);
impl<'self, T: str::Str> String for T {
 fn fmt(s: &T, f: &mut Formatter) {
 f.pad(s.as_slice());
 }
}

Expand DownExpand Up@@ -855,5 +873,37 @@ impl<T> Pointer for *const T {
 }
}

// Implementation of Default for various core types

macro_rules! delegate(($ty:ty to $other:ident) => {
 impl<'self> Default for $ty {
 fn fmt(me: &$ty, f: &mut Formatter) {
 $other::fmt(me, f)
 }
 }
})
delegate!(int to Signed)
delegate!( i8 to Signed)
delegate!(i16 to Signed)
delegate!(i32 to Signed)
delegate!(i64 to Signed)
delegate!(uint to Unsigned)
delegate!( u8 to Unsigned)
delegate!( u16 to Unsigned)
delegate!( u32 to Unsigned)
delegate!( u64 to Unsigned)
delegate!(@str to String)
delegate!(~str to String)
delegate!(&'self str to String)
delegate!(bool to Bool)
delegate!(char to Char)
delegate!(float to Float)
delegate!(f32 to Float)
delegate!(f64 to Float)

impl<T> Default for *const T {
 fn fmt(me: &*const T, f: &mut Formatter) { Pointer::fmt(me, f) }
}

// If you expected tests to be here, look instead at the run-pass/ifmt.rs test,
// it's a lot easier than creating all of the rt::Piece structures here.

6 changes: 5 additions & 1 deletion
src/libstd/fmt/parse.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -339,7 +339,11 @@ impl<'self> Parser<'self> {
 }
 }
 // Finally the actual format specifier
 spec.ty = self.word();
 if self.consume('?') {
 spec.ty = "?";
 } else {
 spec.ty = self.word();
 }
 return spec;
 }

Expand Down

43 changes: 20 additions & 23 deletions
src/libsyntax/ext/ifmt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -623,19 +623,16 @@ impl Context {

 fn format_arg(&self, sp: span, arg: Either<uint, @str>,
 ident: ast::ident) -> @ast::expr {
 let mut ty = match arg {
 let ty = match arg {
 Left(i) => self.arg_types[i].unwrap(),
 Right(s) => *self.name_types.get(&s)
 };
 // Default types to '?' if nothing else is specified.
 if ty == Unknown {
 ty = Known(@"?");
 }

 let argptr = self.ecx.expr_addr_of(sp, self.ecx.expr_ident(sp, ident));
 match ty {
 let fmt_trait = match ty {
 Unknown => "Default",
 Known(tyname) => {
let fmt_trait = match tyname.as_slice() {
 match tyname.as_slice() {
 "?" => "Poly",
 "b" => "Bool",
 "c" => "Char",
Expand All@@ -653,35 +650,35 @@ impl Context {
 `%s`", tyname));
 "Dummy"
 }
 };
 let format_fn = self.ecx.path_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of(fmt_trait),
 self.ecx.ident_of("fmt"),
 ]);
 self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argument"),
 ], ~[self.ecx.expr_path(format_fn), argptr])
 }
 }
 String => {
 self.ecx.expr_call_global(sp, ~[
return self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argumentstr"),
 ], ~[argptr])
 }
 Unsigned => {
 self.ecx.expr_call_global(sp, ~[
return self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argumentuint"),
 ], ~[argptr])
 }
 Unknown => { fail!() }
 }
 };

 let format_fn = self.ecx.path_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of(fmt_trait),
 self.ecx.ident_of("fmt"),
 ]);
 self.ecx.expr_call_global(sp, ~[
 self.ecx.ident_of("std"),
 self.ecx.ident_of("fmt"),
 self.ecx.ident_of("argument"),
 ], ~[self.ecx.expr_path(format_fn), argptr])
 }
}

Expand Down

32 changes: 27 additions & 5 deletions
src/test/run-pass/ifmt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,16 +25,36 @@ pub fn main() {
 macro_rules! t(($a:expr, $b:expr) => { assert_eq!($a, $b.to_owned()) })

 // Make sure there's a poly formatter that takes anything
 t!(ifmt!("{}", 1), "1");
 t!(ifmt!("{}", A), "{}");
 t!(ifmt!("{}", ()), "()");
 t!(ifmt!("{}", @(~1, "foo")), "@(~1, \"foo\")");
 t!(ifmt!("{:?}", 1), "1");
 t!(ifmt!("{:?}", A), "{}");
 t!(ifmt!("{:?}", ()), "()");
 t!(ifmt!("{:?}", @(~1, "foo")), "@(~1, \"foo\")");

 // Various edge cases without formats
 t!(ifmt!(""), "");
 t!(ifmt!("hello"), "hello");
 t!(ifmt!("hello \\{"), "hello {");

 // default formatters should work
 t!(ifmt!("{}", 1i), "1");
 t!(ifmt!("{}", 1i8), "1");
 t!(ifmt!("{}", 1i16), "1");
 t!(ifmt!("{}", 1i32), "1");
 t!(ifmt!("{}", 1i64), "1");
 t!(ifmt!("{}", 1u), "1");
 t!(ifmt!("{}", 1u8), "1");
 t!(ifmt!("{}", 1u16), "1");
 t!(ifmt!("{}", 1u32), "1");
 t!(ifmt!("{}", 1u64), "1");
 t!(ifmt!("{}", 1.0f), "1");
 t!(ifmt!("{}", 1.0f32), "1");
 t!(ifmt!("{}", 1.0f64), "1");
 t!(ifmt!("{}", "a"), "a");
 t!(ifmt!("{}", ~"a"), "a");
 t!(ifmt!("{}", @"a"), "a");
 t!(ifmt!("{}", false), "false");
 t!(ifmt!("{}", 'a'), "a");

 // At least exercise all the formats
 t!(ifmt!("{:b}", true), "true");
 t!(ifmt!("{:c}", '☃'), "☃");
Expand All@@ -45,6 +65,8 @@ pub fn main() {
 t!(ifmt!("{:x}", 10u), "a");
 t!(ifmt!("{:X}", 10u), "A");
 t!(ifmt!("{:s}", "foo"), "foo");
 t!(ifmt!("{:s}", ~"foo"), "foo");
 t!(ifmt!("{:s}", @"foo"), "foo");
 t!(ifmt!("{:p}", 0x1234 as *int), "0x1234");
 t!(ifmt!("{:p}", 0x1234 as *mut int), "0x1234");
 t!(ifmt!("{:d}", A), "aloha");
Expand All@@ -54,7 +76,7 @@ pub fn main() {
 t!(ifmt!("{foo} {bar}", foo=0, bar=1), "0 1");
 t!(ifmt!("{foo} {1} {bar} {0}", 0, 1, foo=2, bar=3), "2 1 3 0");
 t!(ifmt!("{} {0:s}", "a"), "a a");
 t!(ifmt!("{} {0}", "a"), "\"a\" \"a\"");
 t!(ifmt!("{} {0}", "a"), "a a");

 // Methods should probably work
 t!(ifmt!("{0, plural, =1{a#} =2{b#} zero{c#} other{d#}}", 0u), "c0");
Expand Down