Skip to content

Commit

Permalink
rollup merge of rust-lang#20080: seanmonstar/new-show-syntax
Browse files Browse the repository at this point in the history
First step of rust-lang#20013. This will allow (after a snapshot) to change all the debug strings from `{}` to `{:?}`.

r? @alexcrichton
  • Loading branch information
alexcrichton committed Dec 21, 2014
2 parents 3e5257f + 84b8f31 commit 40e1f7c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/libsyntax/ext/format.rs
Original file line number Diff line number Diff line change
Expand Up @@ -654,6 +654,7 @@ impl<'a, 'b> Context<'a, 'b> {
Known(ref tyname) => {
match tyname.as_slice() {
"" => "Show",
"?" => "Show",
"e" => "LowerExp",
"E" => "UpperExp",
"o" => "Octal",
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/ifmt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ pub fn main() {
t!(format!("{}", 10i), "10");
t!(format!("{}", 10i), "10");
t!(format!("{}", 10u), "10");
t!(format!("{:?}", true), "true");
t!(format!("{:o}", 10u), "12");
t!(format!("{:x}", 10u), "a");
t!(format!("{:X}", 10u), "A");
Expand Down

0 comments on commit 40e1f7c

Please sign in to comment.