bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Provide structured suggestions for valid formatting descriptors

Browse source
This commit is contained in:
Esteban Küber 2019-11-05 12:08:22 -08:00
parent 08b235b5be
commit c271db284b
1 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/libsyntax_ext/format.rs
View file

@ -256,8 +256,9 @@ impl<'a, 'b> Context<'a, 'b> {
"X" => "UpperHex", "X" => "UpperHex",
_ => { _ => {
let fmtsp = self.fmtsp; let fmtsp = self.fmtsp;
let sp = arg.format.ty_span.map(|sp| fmtsp.from_inner(sp));
let mut err = self.ecx.struct_span_err( let mut err = self.ecx.struct_span_err(
arg.format.ty_span.map(|sp| fmtsp.from_inner(sp)).unwrap_or(fmtsp), sp.unwrap_or(fmtsp),
&format!("unknown format trait `{}`", arg.format.ty), &format!("unknown format trait `{}`", arg.format.ty),
); );
err.note("the only appropriate formatting traits are:\n\ err.note("the only appropriate formatting traits are:\n\
@ -270,6 +271,26 @@ impl<'a, 'b> Context<'a, 'b> {
- `b`, which uses the `Binary` trait\n\ - `b`, which uses the `Binary` trait\n\
- `x`, which uses the `LowerHex` trait\n\ - `x`, which uses the `LowerHex` trait\n\
- `X`, which uses the `UpperHex` trait"); - `X`, which uses the `UpperHex` trait");
if let Some(sp) = sp {
for (fmt, name) in &[
("", "Display"),
("?", "Debug"),
("e", "LowerExp"),
("E", "UpperExp"),
("o", "Octal"),
("p", "Pointer"),
("b", "Binary"),
("x", "LowerHex"),
("X", "UpperHex"),
] {
err.tool_only_span_suggestion(
sp,
&format!("use the `{}` trait", name),
fmt.to_string(),
Applicability::MaybeIncorrect,
);
}
}
err.emit(); err.emit();
"<invalid>" "<invalid>"
} }