diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-11-02 18:45:34 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-11-03 08:31:46 -0800 |
| commit | 386cc7665596e59ead9fffdc0934962890f945fc (patch) | |
| tree | 9a81c00c5aadcb613d06f5f6acaf8cff72ecb357 /src/libsyntax | |
| parent | a8fdcc305e112556fd3842bd8ce85531e45d6bc6 (diff) | |
| parent | 3a075dce9af716a7512618bad6b37b00e559060d (diff) | |
| download | rust-386cc7665596e59ead9fffdc0934962890f945fc.tar.gz rust-386cc7665596e59ead9fffdc0934962890f945fc.zip | |
rollup merge of #18537 : japaric/no-secret
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/format.rs | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/src/libsyntax/ext/format.rs b/src/libsyntax/ext/format.rs index 53d091db095..486ce910e2b 100644 --- a/src/libsyntax/ext/format.rs +++ b/src/libsyntax/ext/format.rs @@ -663,28 +663,28 @@ impl<'a, 'b> Context<'a, 'b> { fn format_arg(ecx: &ExtCtxt, sp: Span, ty: &ArgumentType, arg: P<ast::Expr>) -> P<ast::Expr> { - let (krate, fmt_fn) = match *ty { + let trait_ = match *ty { Known(ref tyname) => { match tyname.as_slice() { - "" => ("std", "secret_show"), - "b" => ("std", "secret_bool"), - "c" => ("std", "secret_char"), - "d" | "i" => ("std", "secret_signed"), - "e" => ("std", "secret_lower_exp"), - "E" => ("std", "secret_upper_exp"), - "f" => ("std", "secret_float"), - "o" => ("std", "secret_octal"), - "p" => ("std", "secret_pointer"), - "s" => ("std", "secret_string"), - "t" => ("std", "secret_binary"), - "u" => ("std", "secret_unsigned"), - "x" => ("std", "secret_lower_hex"), - "X" => ("std", "secret_upper_hex"), + "" => "Show", + "b" => "Bool", + "c" => "Char", + "d" | "i" => "Signed", + "e" => "LowerExp", + "E" => "UpperExp", + "f" => "Float", + "o" => "Octal", + "p" => "Pointer", + "s" => "String", + "t" => "Binary", + "u" => "Unsigned", + "x" => "LowerHex", + "X" => "UpperHex", _ => { ecx.span_err(sp, format!("unknown format trait `{}`", *tyname).as_slice()); - ("std", "dummy") + "Dummy" } } } @@ -697,9 +697,10 @@ impl<'a, 'b> Context<'a, 'b> { }; let format_fn = ecx.path_global(sp, vec![ - ecx.ident_of(krate), + ecx.ident_of("std"), ecx.ident_of("fmt"), - ecx.ident_of(fmt_fn)]); + ecx.ident_of(trait_), + ecx.ident_of("fmt")]); ecx.expr_call_global(sp, vec![ ecx.ident_of("std"), ecx.ident_of("fmt"), |