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

Auto merge of #12398 - WeiTheShinobi:bug-lint-numbered_fields, r=Manishearth

Browse Source 
bug fix: lint numbered_fields message error

fixes #12367

changelog: [`numbered_fields`]: fix macro expand message error.
This commit is contained in:
bors 2024-05-22 15:50:46 +00:00
commit 05c4053628
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clippy_lints/src/init_numbered_fields.rs
View File

@ -1,5 +1,5 @@
use clippy_utils::diagnostics::span_lint_and_sugg; use clippy_utils::diagnostics::span_lint_and_sugg;
use clippy_utils::source::snippet_with_applicability; use clippy_utils::source::{snippet_with_applicability, snippet_with_context};
use rustc_errors::Applicability; use rustc_errors::Applicability;
use rustc_hir::def::{DefKind, Res}; use rustc_hir::def::{DefKind, Res};
use rustc_hir::{Expr, ExprKind}; use rustc_hir::{Expr, ExprKind};
@ -62,7 +62,7 @@ impl<'tcx> LateLintPass<'tcx> for NumberedFields {
snippet_with_applicability(cx, path.span(), "..", &mut appl), snippet_with_applicability(cx, path.span(), "..", &mut appl),
expr_spans expr_spans
.into_iter_sorted() .into_iter_sorted()
.map(|(_, span)| snippet_with_applicability(cx, span, "..", &mut appl)) .map(|(_, span)| snippet_with_context(cx, span, path.span().ctxt(), "..", &mut appl).0)
.intersperse(Cow::Borrowed(", ")) .intersperse(Cow::Borrowed(", "))
.collect::<String>() .collect::<String>()
); );

5
tests/ui/numbered_fields.fixed
View File

@ -34,4 +34,9 @@ fn main() {
// Aliases can't be tuple constructed #8638 // Aliases can't be tuple constructed #8638
let _ = Alias { 0: 0, 1: 1, 2: 2 }; let _ = Alias { 0: 0, 1: 1, 2: 2 };
// Issue #12367
struct TupleStructVec(Vec<usize>);
let _ = TupleStructVec(vec![0, 1, 2, 3]);
} }

5
tests/ui/numbered_fields.rs
View File

@ -42,4 +42,9 @@ fn main() {
// Aliases can't be tuple constructed #8638 // Aliases can't be tuple constructed #8638
let _ = Alias { 0: 0, 1: 1, 2: 2 }; let _ = Alias { 0: 0, 1: 1, 2: 2 };
// Issue #12367
struct TupleStructVec(Vec<usize>);
let _ = TupleStructVec { 0: vec![0, 1, 2, 3] };
} }

8
tests/ui/numbered_fields.stderr
View File

@ -23,5 +23,11 @@ LL | | 1: 3u32,
LL | | }; LL | | };
| |_____^ help: try: `TupleStruct(1u32, 3u32, 2u8)` | |_____^ help: try: `TupleStruct(1u32, 3u32, 2u8)`
error: aborting due to 2 previous errors error: used a field initializer for a tuple struct
--> tests/ui/numbered_fields.rs:49:13
|
LL | let _ = TupleStructVec { 0: vec![0, 1, 2, 3] };
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `TupleStructVec(vec![0, 1, 2, 3])`
error: aborting due to 3 previous errors