Skip to content

Commit 9b446c7

Browse files
borsbors
committed
Auto merge of #12787 - J-ZhengLi:issue127311, r=blyxyas
make [`from_str_radix_10`] skip constant context fixes: #12731 --- changelog: make [`from_str_radix_10`] skip constant context
2 parents 2b34abc + 904c99c commit 9b446c7

File tree

4 files changed

+34
-9
lines changed

4 files changed

+34
-9
lines changed

‎clippy_lints/src/from_str_radix_10.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use clippy_utils::diagnostics::span_lint_and_sugg;
2-
use clippy_utils::is_integer_literal;
32
use clippy_utils::sugg::Sugg;
43
use clippy_utils::ty::{is_type_diagnostic_item, is_type_lang_item};
4+
use clippy_utils::{in_constant, is_integer_literal};
55
use rustc_errors::Applicability;
66
use rustc_hir::{def, Expr, ExprKind, LangItem, PrimTy, QPath, TyKind};
77
use rustc_lint::{LateContext, LateLintPass};
@@ -47,6 +47,9 @@ impl<'tcx> LateLintPass<'tcx> for FromStrRadix10 {
4747
fn check_expr(&mut self, cx: &LateContext<'tcx>, exp: &Expr<'tcx>) {
4848
if let ExprKind::Call(maybe_path, [src, radix]) = &exp.kind
4949
&& let ExprKind::Path(QPath::TypeRelative(ty, pathseg)) = &maybe_path.kind
50+
// do not lint in constant context, because the suggestion won't work.
51+
// NB: keep this check until a new `const_trait_impl` is available and stablized.
52+
&& !in_constant(cx, exp.hir_id)
5053

5154
// check if the first part of the path is some integer primitive
5255
&& let TyKind::Path(ty_qpath) = &ty.kind

‎tests/ui/from_str_radix_10.fixed

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#![feature(const_int_from_str)]
12
#![warn(clippy::from_str_radix_10)]
23

34
mod some_mod {
@@ -59,3 +60,13 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
5960

6061
Ok(())
6162
}
63+
64+
fn issue_12732() {
65+
const A: Result<u32, std::num::ParseIntError> = u32::from_str_radix("123", 10);
66+
const B: () = {
67+
let _ = u32::from_str_radix("123", 10);
68+
};
69+
const fn foo() {
70+
let _ = u32::from_str_radix("123", 10);
71+
}
72+
}

‎tests/ui/from_str_radix_10.rs

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#![feature(const_int_from_str)]
12
#![warn(clippy::from_str_radix_10)]
23

34
mod some_mod {
@@ -59,3 +60,13 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
5960

6061
Ok(())
6162
}
63+
64+
fn issue_12732() {
65+
const A: Result<u32, std::num::ParseIntError> = u32::from_str_radix("123", 10);
66+
const B: () = {
67+
let _ = u32::from_str_radix("123", 10);
68+
};
69+
const fn foo() {
70+
let _ = u32::from_str_radix("123", 10);
71+
}
72+
}

‎tests/ui/from_str_radix_10.stderr

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: this call to `from_str_radix` can be replaced with a call to `str::parse`
2-
--> tests/ui/from_str_radix_10.rs:28:5
2+
--> tests/ui/from_str_radix_10.rs:29:5
33
|
44
LL | u32::from_str_radix("30", 10)?;
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `"30".parse::<u32>()`
@@ -8,43 +8,43 @@ LL | u32::from_str_radix("30", 10)?;
88
= help: to override `-D warnings` add `#[allow(clippy::from_str_radix_10)]`
99

1010
error: this call to `from_str_radix` can be replaced with a call to `str::parse`
11-
--> tests/ui/from_str_radix_10.rs:31:5
11+
--> tests/ui/from_str_radix_10.rs:32:5
1212
|
1313
LL | i64::from_str_radix("24", 10)?;
1414
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `"24".parse::<i64>()`
1515

1616
error: this call to `from_str_radix` can be replaced with a call to `str::parse`
17-
--> tests/ui/from_str_radix_10.rs:33:5
17+
--> tests/ui/from_str_radix_10.rs:34:5
1818
|
1919
LL | isize::from_str_radix("100", 10)?;
2020
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `"100".parse::<isize>()`
2121

2222
error: this call to `from_str_radix` can be replaced with a call to `str::parse`
23-
--> tests/ui/from_str_radix_10.rs:35:5
23+
--> tests/ui/from_str_radix_10.rs:36:5
2424
|
2525
LL | u8::from_str_radix("7", 10)?;
2626
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `"7".parse::<u8>()`
2727

2828
error: this call to `from_str_radix` can be replaced with a call to `str::parse`
29-
--> tests/ui/from_str_radix_10.rs:37:5
29+
--> tests/ui/from_str_radix_10.rs:38:5
3030
|
3131
LL | u16::from_str_radix(&("10".to_owned() + "5"), 10)?;
3232
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `("10".to_owned() + "5").parse::<u16>()`
3333

3434
error: this call to `from_str_radix` can be replaced with a call to `str::parse`
35-
--> tests/ui/from_str_radix_10.rs:39:5
35+
--> tests/ui/from_str_radix_10.rs:40:5
3636
|
3737
LL | i128::from_str_radix(Test + Test, 10)?;
3838
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `(Test + Test).parse::<i128>()`
3939

4040
error: this call to `from_str_radix` can be replaced with a call to `str::parse`
41-
--> tests/ui/from_str_radix_10.rs:43:5
41+
--> tests/ui/from_str_radix_10.rs:44:5
4242
|
4343
LL | i32::from_str_radix(string, 10)?;
4444
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `string.parse::<i32>()`
4545

4646
error: this call to `from_str_radix` can be replaced with a call to `str::parse`
47-
--> tests/ui/from_str_radix_10.rs:47:5
47+
--> tests/ui/from_str_radix_10.rs:48:5
4848
|
4949
LL | i32::from_str_radix(&stringier, 10)?;
5050
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `stringier.parse::<i32>()`

0 commit comments

Comments
 (0)