Skip to content

Fix format arg spans in diagnostics #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RAprogramm merged 1 commit into from
Sep 29, 2025
Merged

Fix format arg spans in diagnostics #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion masterror-derive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ description = "Derive macros for masterror"
proc-macro = true

[dependencies]
proc-macro2 = "1"
proc-macro2 = { version = "1", features = ["span-locations"] }
quote = "1"
syn = { version = "2", features = ["full", "extra-traits"] }
masterror-template = { workspace = true }
5 changes: 1 addition & 4 deletions masterror-derive/src/input.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1246,10 +1246,7 @@ impl Parse for RawFormatArg {
input.parse::<Token![=]>()?;
let value = parse_format_arg_value(input)?;
let value_span = format_arg_value_span(&value);
let span = ident
.span()
.join(value_span)
.unwrap_or_else(|| ident.span());
let span = ident.span().join(value_span).unwrap_or(value_span);
Ok(Self::Named {
ident,
value,
Expand Down
7 changes: 3 additions & 4 deletions tests/ui/app_error/fail/enum_missing_variant.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
error: all variants must use #[app_error(...)] to derive AppError conversion
--> tests/ui/app_error/fail/enum_missing_variant.rs:8:5
|
8 | / #[error("without")]
9 | | Without,
| |___________^
8 | #[error("without")]
| ^

warning: unused import: `AppErrorKind`
--> tests/ui/app_error/fail/enum_missing_variant.rs:1:17
|
1 | use masterror::{AppErrorKind, Error};
| ^^^^^^^^^^^^
|
= note: `#[warn(unused_imports)]` (part of `#[warn(unused)]`) on by default
= note: `#[warn(unused_imports)]` on by default
4 changes: 2 additions & 2 deletions tests/ui/app_error/fail/missing_code.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ error: AppCode conversion requires `code = ...` in #[app_error(...)]
--> tests/ui/app_error/fail/missing_code.rs:9:5
|
9 | #[app_error(kind = AppErrorKind::Service)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| ^

warning: unused imports: `AppCode` and `AppErrorKind`
--> tests/ui/app_error/fail/missing_code.rs:1:17
|
1 | use masterror::{AppCode, AppErrorKind, Error};
| ^^^^^^^ ^^^^^^^^^^^^
|
= note: `#[warn(unused_imports)]` (part of `#[warn(unused)]`) on by default
= note: `#[warn(unused_imports)]` on by default
2 changes: 1 addition & 1 deletion tests/ui/app_error/fail/missing_kind.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ error: missing `kind = ...` in #[app_error(...)]
--> tests/ui/app_error/fail/missing_kind.rs:5:1
|
5 | #[app_error(message)]
| ^^^^^^^^^^^^^^^^^^^^^
| ^
4 changes: 2 additions & 2 deletions tests/ui/formatter/fail/duplicate_fmt.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: duplicate `fmt` handler specified
--> tests/ui/formatter/fail/duplicate_fmt.rs:4:36
--> tests/ui/formatter/fail/duplicate_fmt.rs:4:42
|
4 | #[error(fmt = crate::format_error, fmt = crate::format_error)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^
| ^^^^^
1 change: 0 additions & 1 deletion tests/ui/formatter/fail/implicit_after_named.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ error: multiple unused formatting arguments
| argument never used
| argument never used
|
= note: consider adding 2 format specifiers
= note: this error originates in the derive macro `Error` (in Nightly builds, run with -Z macro-backtrace for more info)
4 changes: 2 additions & 2 deletions tests/ui/formatter/fail/unsupported_flag.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: placeholder spanning bytes 0..11 uses an unsupported formatter
--> tests/ui/formatter/fail/unsupported_flag.rs:4:10
--> tests/ui/formatter/fail/unsupported_flag.rs:4:9
|
4 | #[error("{value:##x}")]
| ^^^^^^^^^^^
| ^^^^^^^^^^^^^
4 changes: 2 additions & 2 deletions tests/ui/formatter/fail/unsupported_formatter.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: placeholder spanning bytes 0..9 uses an unsupported formatter
--> tests/ui/formatter/fail/unsupported_formatter.rs:4:10
--> tests/ui/formatter/fail/unsupported_formatter.rs:4:9
|
4 | #[error("{value:y}")]
| ^^^^^^^^^
| ^^^^^^^^^^^
4 changes: 2 additions & 2 deletions tests/ui/formatter/fail/uppercase_binary.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: placeholder spanning bytes 0..9 uses an unsupported formatter
--> tests/ui/formatter/fail/uppercase_binary.rs:4:10
--> tests/ui/formatter/fail/uppercase_binary.rs:4:9
|
4 | #[error("{value:B}")]
| ^^^^^^^^^
| ^^^^^^^^^^^
4 changes: 2 additions & 2 deletions tests/ui/formatter/fail/uppercase_pointer.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: placeholder spanning bytes 0..9 uses an unsupported formatter
--> tests/ui/formatter/fail/uppercase_pointer.rs:4:10
--> tests/ui/formatter/fail/uppercase_pointer.rs:4:9
|
4 | #[error("{value:P}")]
| ^^^^^^^^^
| ^^^^^^^^^^^
2 changes: 1 addition & 1 deletion tests/ui/masterror/fail/duplicate_attr.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ warning: unused imports: `AppCode` and `AppErrorKind`
1 | use masterror::{AppCode, AppErrorKind, Masterror};
| ^^^^^^^ ^^^^^^^^^^^^
|
= note: `#[warn(unused_imports)]` (part of `#[warn(unused)]`) on by default
= note: `#[warn(unused_imports)]` on by default
2 changes: 1 addition & 1 deletion tests/ui/masterror/fail/duplicate_telemetry.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ warning: unused imports: `AppCode` and `AppErrorKind`
1 | use masterror::{AppCode, AppErrorKind, Masterror};
| ^^^^^^^ ^^^^^^^^^^^^
|
= note: `#[warn(unused_imports)]` (part of `#[warn(unused)]`) on by default
= note: `#[warn(unused_imports)]` on by default
2 changes: 1 addition & 1 deletion tests/ui/masterror/fail/empty_redact.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ warning: unused imports: `AppCode` and `AppErrorKind`
1 | use masterror::{AppCode, AppErrorKind, Masterror};
| ^^^^^^^ ^^^^^^^^^^^^
|
= note: `#[warn(unused_imports)]` (part of `#[warn(unused)]`) on by default
= note: `#[warn(unused_imports)]` on by default
7 changes: 3 additions & 4 deletions tests/ui/masterror/fail/enum_missing_variant.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
error: all variants must use #[masterror(...)] to derive masterror::Error conversion
--> tests/ui/masterror/fail/enum_missing_variant.rs:8:5
|
8 | / #[error("missing")]
9 | | Missing
| |___________^
8 | #[error("missing")]
| ^

warning: unused imports: `AppCode` and `AppErrorKind`
--> tests/ui/masterror/fail/enum_missing_variant.rs:1:17
|
1 | use masterror::{AppCode, AppErrorKind, Masterror};
| ^^^^^^^ ^^^^^^^^^^^^
|
= note: `#[warn(unused_imports)]` (part of `#[warn(unused)]`) on by default
= note: `#[warn(unused_imports)]` on by default
4 changes: 2 additions & 2 deletions tests/ui/masterror/fail/missing_category.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ error: missing `category = ...` in #[masterror(...)]
--> tests/ui/masterror/fail/missing_category.rs:5:1
|
5 | #[masterror(code = AppCode::Internal)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| ^

warning: unused import: `AppCode`
--> tests/ui/masterror/fail/missing_category.rs:1:17
|
1 | use masterror::{AppCode, Masterror};
| ^^^^^^^
|
= note: `#[warn(unused_imports)]` (part of `#[warn(unused)]`) on by default
= note: `#[warn(unused_imports)]` on by default
4 changes: 2 additions & 2 deletions tests/ui/masterror/fail/missing_code.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ error: missing `code = ...` in #[masterror(...)]
--> tests/ui/masterror/fail/missing_code.rs:5:1
|
5 | #[masterror(category = AppErrorKind::Internal)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| ^

warning: unused import: `AppErrorKind`
--> tests/ui/masterror/fail/missing_code.rs:1:17
|
1 | use masterror::{AppErrorKind, Masterror};
| ^^^^^^^^^^^^
|
= note: `#[warn(unused_imports)]` (part of `#[warn(unused)]`) on by default
= note: `#[warn(unused_imports)]` on by default
2 changes: 1 addition & 1 deletion tests/ui/masterror/fail/unknown_option.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ warning: unused imports: `AppCode` and `AppErrorKind`
1 | use masterror::{AppCode, AppErrorKind, Masterror};
| ^^^^^^^ ^^^^^^^^^^^^
|
= note: `#[warn(unused_imports)]` (part of `#[warn(unused)]`) on by default
= note: `#[warn(unused_imports)]` on by default
Loading