Skip to content

Commit

Permalink
Suggest rewriting a malformed hex literal if we expect a float
Browse files Browse the repository at this point in the history
  • Loading branch information
compiler-errors committed Dec 27, 2022
1 parent b38a6d3 commit 3cf22de
Show file tree
Hide file tree
Showing 3 changed files with 87 additions and 0 deletions.
26 changes: 26 additions & 0 deletions compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ use rustc_middle::ty::{
TypeVisitable,
};
use rustc_session::errors::ExprParenthesesNeeded;
use rustc_span::source_map::Spanned;
use rustc_span::symbol::{sym, Ident};
use rustc_span::{Span, Symbol};
use rustc_trait_selection::infer::InferCtxtExt;
Expand Down Expand Up @@ -1259,6 +1260,31 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
);
true
}
ExprKind::Lit(Spanned {
node: rustc_ast::LitKind::Int(lit, rustc_ast::LitIntType::Unsuffixed),
span,
}) => {
let Ok(snippet) = self.tcx.sess.source_map().span_to_snippet(span) else { return false; };
if !(snippet.starts_with("0x") || snippet.starts_with("0X")) {
return false;
}
if snippet.len() <= 5 || !snippet.is_char_boundary(snippet.len() - 3) {
return false;
}
let (_, suffix) = snippet.split_at(snippet.len() - 3);
let value = match suffix {
"f32" => (lit - 0xf32) / (16 * 16 * 16),
"f64" => (lit - 0xf64) / (16 * 16 * 16),
_ => return false,
};
err.span_suggestions(
expr.span,
"rewrite this as a decimal floating point literal, or use `as` to turn a hex literal into a float",
[format!("0x{value:X} as {suffix}"), format!("{value}_{suffix}")],
Applicability::MaybeIncorrect,
);
true
}
_ => false,
}
}
Expand Down
13 changes: 13 additions & 0 deletions src/test/ui/suggestions/bad-hex-float-lit.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
fn main() {
let _f: f32 = 0xAAf32;
//~^ ERROR mismatched types
//~| HELP rewrite this

let _f: f32 = 0xAB_f32;
//~^ ERROR mismatched types
//~| HELP rewrite this

let _f: f64 = 0xFF_f64;
//~^ ERROR mismatched types
//~| HELP rewrite this
}
48 changes: 48 additions & 0 deletions src/test/ui/suggestions/bad-hex-float-lit.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
error[E0308]: mismatched types
--> $DIR/bad-hex-float-lit.rs:2:19
|
LL | let _f: f32 = 0xAAf32;
| --- ^^^^^^^ expected `f32`, found integer
| |
| expected due to this
|
help: rewrite this as a decimal floating point literal, or use `as` to turn a hex literal into a float
|
LL | let _f: f32 = 0xAA as f32;
| ~~~~~~~~~~~
LL | let _f: f32 = 170_f32;
| ~~~~~~~

error[E0308]: mismatched types
--> $DIR/bad-hex-float-lit.rs:6:19
|
LL | let _f: f32 = 0xAB_f32;
| --- ^^^^^^^^ expected `f32`, found integer
| |
| expected due to this
|
help: rewrite this as a decimal floating point literal, or use `as` to turn a hex literal into a float
|
LL | let _f: f32 = 0xAB as f32;
| ~~~~~~~~~~~
LL | let _f: f32 = 171_f32;
| ~~~~~~~

error[E0308]: mismatched types
--> $DIR/bad-hex-float-lit.rs:10:19
|
LL | let _f: f64 = 0xFF_f64;
| --- ^^^^^^^^ expected `f64`, found integer
| |
| expected due to this
|
help: rewrite this as a decimal floating point literal, or use `as` to turn a hex literal into a float
|
LL | let _f: f64 = 0xFF as f64;
| ~~~~~~~~~~~
LL | let _f: f64 = 255_f64;
| ~~~~~~~

error: aborting due to 3 previous errors

For more information about this error, try `rustc --explain E0308`.

0 comments on commit 3cf22de

Please sign in to comment.