mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #128517 - clubby789:overflowing-lit-span, r=petrochenkov

Browse Source 
Fallback to string formatting if source is not available for lint

Fixes #128445
This commit is contained in:
Matthias Krüger 2024-08-06 20:23:39 +02:00 committed by GitHub
commit 5f9ebb5d26
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
compiler/rustc_lint/src/types.rs
View File

@ -458,8 +458,11 @@ fn lint_int_literal<'tcx>(
} }
let span = if negative { type_limits.negated_expr_span.unwrap() } else { e.span }; let span = if negative { type_limits.negated_expr_span.unwrap() } else { e.span };
let lit = let lit = cx
cx.sess().source_map().span_to_snippet(span).expect("must get snippet from literal"); .sess()
.source_map()
.span_to_snippet(span)
.unwrap_or_else(|_| if negative { format!("-{v}") } else { v.to_string() });
let help = get_type_suggestion(cx.typeck_results().node_type(e.hir_id), v, negative) let help = get_type_suggestion(cx.typeck_results().node_type(e.hir_id), v, negative)
.map(|suggestion_ty| OverflowingIntHelp { suggestion_ty }); .map(|suggestion_ty| OverflowingIntHelp { suggestion_ty });
@ -485,6 +488,7 @@ fn lint_uint_literal<'tcx>(
ast::LitKind::Int(v, _) => v.get(), ast::LitKind::Int(v, _) => v.get(),
_ => bug!(), _ => bug!(),
}; };
if lit_val < min || lit_val > max { if lit_val < min || lit_val > max {
if let Node::Expr(par_e) = cx.tcx.parent_hir_node(e.hir_id) { if let Node::Expr(par_e) = cx.tcx.parent_hir_node(e.hir_id) {
match par_e.kind { match par_e.kind {
@ -526,7 +530,7 @@ fn lint_uint_literal<'tcx>(
.sess() .sess()
.source_map() .source_map()
.span_to_snippet(lit.span) .span_to_snippet(lit.span)
.expect("must get snippet from literal"), .unwrap_or_else(|_| lit_val.to_string()),
min, min,
max, max,
}, },
@ -551,14 +555,14 @@ fn lint_literal<'tcx>(
} }
ty::Uint(t) => lint_uint_literal(cx, e, lit, t), ty::Uint(t) => lint_uint_literal(cx, e, lit, t),
ty::Float(t) => { ty::Float(t) => {
let is_infinite = match lit.node { let (is_infinite, sym) = match lit.node {
ast::LitKind::Float(v, _) => match t { ast::LitKind::Float(v, _) => match t {
// FIXME(f16_f128): add this check once `is_infinite` is reliable (ABI // FIXME(f16_f128): add this check once `is_infinite` is reliable (ABI
// issues resolved). // issues resolved).
ty::FloatTy::F16 => Ok(false), ty::FloatTy::F16 => (Ok(false), v),
ty::FloatTy::F32 => v.as_str().parse().map(f32::is_infinite), ty::FloatTy::F32 => (v.as_str().parse().map(f32::is_infinite), v),
ty::FloatTy::F64 => v.as_str().parse().map(f64::is_infinite), ty::FloatTy::F64 => (v.as_str().parse().map(f64::is_infinite), v),
ty::FloatTy::F128 => Ok(false), ty::FloatTy::F128 => (Ok(false), v),
}, },
_ => bug!(), _ => bug!(),
}; };
@ -572,7 +576,7 @@ fn lint_literal<'tcx>(
.sess() .sess()
.source_map() .source_map()
.span_to_snippet(lit.span) .span_to_snippet(lit.span)
.expect("must get snippet from literal"), .unwrap_or_else(|_| sym.to_string()),
}, },
); );
} }