From 5b2f23c0280c1597488718ddb139e32347b287cc Mon Sep 17 00:00:00 2001 From: Roland Fredenhagen Date: Wed, 1 Oct 2025 12:51:54 +0200 Subject: [PATCH 1/6] fix-test-errors --- examples/macro/tests/ui/emit.stderr | 8 ++++---- examples/no_macro/tests/ui/emit.stderr | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/macro/tests/ui/emit.stderr b/examples/macro/tests/ui/emit.stderr index 225a0c7..36082a9 100644 --- a/examples/macro/tests/ui/emit.stderr +++ b/examples/macro/tests/ui/emit.stderr @@ -7,10 +7,10 @@ error: example error = note: this error originates in the attribute macro `attr_emit` (in Nightly builds, run with -Z macro-backtrace for more info) error: example error - --> tests/ui/emit.rs:8:5 - | -8 | / emit!( -9 | | struct Struct; + --> tests/ui/emit.rs:8:5 + | + 8 | / emit!( + 9 | | struct Struct; 10 | | ); | |_____^ | diff --git a/examples/no_macro/tests/ui/emit.stderr b/examples/no_macro/tests/ui/emit.stderr index 225a0c7..36082a9 100644 --- a/examples/no_macro/tests/ui/emit.stderr +++ b/examples/no_macro/tests/ui/emit.stderr @@ -7,10 +7,10 @@ error: example error = note: this error originates in the attribute macro `attr_emit` (in Nightly builds, run with -Z macro-backtrace for more info) error: example error - --> tests/ui/emit.rs:8:5 - | -8 | / emit!( -9 | | struct Struct; + --> tests/ui/emit.rs:8:5 + | + 8 | / emit!( + 9 | | struct Struct; 10 | | ); | |_____^ | From ddbcc71d19b5fa259177da3d7ca49b509689c80c Mon Sep 17 00:00:00 2001 From: Roland Fredenhagen Date: Wed, 1 Oct 2025 13:14:07 +0200 Subject: [PATCH 2/6] huh --- examples/macro/tests/ui/emit.stderr | 2 +- examples/no_macro/tests/ui/emit.stderr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/macro/tests/ui/emit.stderr b/examples/macro/tests/ui/emit.stderr index 36082a9..de2a89b 100644 --- a/examples/macro/tests/ui/emit.stderr +++ b/examples/macro/tests/ui/emit.stderr @@ -8,7 +8,7 @@ error: example error error: example error --> tests/ui/emit.rs:8:5 - | + | 8 | / emit!( 9 | | struct Struct; 10 | | ); diff --git a/examples/no_macro/tests/ui/emit.stderr b/examples/no_macro/tests/ui/emit.stderr index 36082a9..de2a89b 100644 --- a/examples/no_macro/tests/ui/emit.stderr +++ b/examples/no_macro/tests/ui/emit.stderr @@ -8,7 +8,7 @@ error: example error error: example error --> tests/ui/emit.rs:8:5 - | + | 8 | / emit!( 9 | | struct Struct; 10 | | ); From a49bf4f03e4652230e330f33d62594f01f03e529 Mon Sep 17 00:00:00 2001 From: Roland Fredenhagen Date: Wed, 1 Oct 2025 13:18:29 +0200 Subject: [PATCH 3/6] huhuh --- examples/macro/tests/ui/emit.stderr | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/examples/macro/tests/ui/emit.stderr b/examples/macro/tests/ui/emit.stderr index de2a89b..2e1b7c4 100644 --- a/examples/macro/tests/ui/emit.stderr +++ b/examples/macro/tests/ui/emit.stderr @@ -1,13 +1,12 @@ error: example error - --> tests/ui/emit.rs:3:5 +Error: --> tests/ui/emit.rs:3:5 | 3 | #[attr_emit] | ^^^^^^^^^^^^ | = note: this error originates in the attribute macro `attr_emit` (in Nightly builds, run with -Z macro-backtrace for more info) - error: example error - --> tests/ui/emit.rs:8:5 +Error: --> tests/ui/emit.rs:8:5 | 8 | / emit!( 9 | | struct Struct; @@ -15,9 +14,8 @@ error: example error | |_____^ | = note: this error originates in the macro `emit` (in Nightly builds, run with -Z macro-backtrace for more info) - error: example error - --> tests/ui/emit.rs:14:14 +Error: --> tests/ui/emit.rs:14:14 | 14 | #[derive(Emit)] | ^^^^ From 9e3e807ced4374245daaf155cf8e9bdcb3b57d89 Mon Sep 17 00:00:00 2001 From: Roland Fredenhagen Date: Wed, 1 Oct 2025 13:36:44 +0200 Subject: [PATCH 4/6] hmm --- examples/macro/tests/ui/emit.stderr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/macro/tests/ui/emit.stderr b/examples/macro/tests/ui/emit.stderr index 2e1b7c4..22e1b6c 100644 --- a/examples/macro/tests/ui/emit.stderr +++ b/examples/macro/tests/ui/emit.stderr @@ -1,12 +1,12 @@ error: example error -Error: --> tests/ui/emit.rs:3:5 +##[error]: --> tests/ui/emit.rs:3:5 | 3 | #[attr_emit] | ^^^^^^^^^^^^ | = note: this error originates in the attribute macro `attr_emit` (in Nightly builds, run with -Z macro-backtrace for more info) error: example error -Error: --> tests/ui/emit.rs:8:5 +##[error]: --> tests/ui/emit.rs:8:5 | 8 | / emit!( 9 | | struct Struct; @@ -15,7 +15,7 @@ Error: --> tests/ui/emit.rs:8:5 | = note: this error originates in the macro `emit` (in Nightly builds, run with -Z macro-backtrace for more info) error: example error -Error: --> tests/ui/emit.rs:14:14 +##[error]: --> tests/ui/emit.rs:14:14 | 14 | #[derive(Emit)] | ^^^^ From cef15d3947a2f52a440ad836919c94d8ac6e1fbc Mon Sep 17 00:00:00 2001 From: Roland Fredenhagen Date: Wed, 1 Oct 2025 13:41:23 +0200 Subject: [PATCH 5/6] update-trybuild --- examples/macro/Cargo.toml | 2 +- examples/macro/tests/ui/emit.stderr | 8 +++++--- examples/no_macro/Cargo.toml | 2 +- examples/no_macro/tests/ui/emit.stderr | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/examples/macro/Cargo.toml b/examples/macro/Cargo.toml index a61c87f..ddba6f3 100644 --- a/examples/macro/Cargo.toml +++ b/examples/macro/Cargo.toml @@ -14,7 +14,7 @@ quote = "1" syn = { version = "2", features = ["full"] } [dev-dependencies] -trybuild = "1.0.80" +trybuild = "1.0.111" [package.metadata.release] release = false diff --git a/examples/macro/tests/ui/emit.stderr b/examples/macro/tests/ui/emit.stderr index 22e1b6c..a22e07a 100644 --- a/examples/macro/tests/ui/emit.stderr +++ b/examples/macro/tests/ui/emit.stderr @@ -1,12 +1,13 @@ error: example error -##[error]: --> tests/ui/emit.rs:3:5 + --> tests/ui/emit.rs:3:5 | 3 | #[attr_emit] | ^^^^^^^^^^^^ | = note: this error originates in the attribute macro `attr_emit` (in Nightly builds, run with -Z macro-backtrace for more info) + error: example error -##[error]: --> tests/ui/emit.rs:8:5 + --> tests/ui/emit.rs:8:5 | 8 | / emit!( 9 | | struct Struct; @@ -14,8 +15,9 @@ error: example error | |_____^ | = note: this error originates in the macro `emit` (in Nightly builds, run with -Z macro-backtrace for more info) + error: example error -##[error]: --> tests/ui/emit.rs:14:14 + --> tests/ui/emit.rs:14:14 | 14 | #[derive(Emit)] | ^^^^ diff --git a/examples/no_macro/Cargo.toml b/examples/no_macro/Cargo.toml index edf41ba..d013aad 100644 --- a/examples/no_macro/Cargo.toml +++ b/examples/no_macro/Cargo.toml @@ -14,7 +14,7 @@ quote = "1" syn = { version = "2", features = ["full"] } [dev-dependencies] -trybuild = "1.0.80" +trybuild = "1.0.111" [package.metadata.release] release = false diff --git a/examples/no_macro/tests/ui/emit.stderr b/examples/no_macro/tests/ui/emit.stderr index de2a89b..a22e07a 100644 --- a/examples/no_macro/tests/ui/emit.stderr +++ b/examples/no_macro/tests/ui/emit.stderr @@ -7,7 +7,7 @@ error: example error = note: this error originates in the attribute macro `attr_emit` (in Nightly builds, run with -Z macro-backtrace for more info) error: example error - --> tests/ui/emit.rs:8:5 + --> tests/ui/emit.rs:8:5 | 8 | / emit!( 9 | | struct Struct; From c5fce59047a9af91468e1ee99f12d5c3b2a78d3d Mon Sep 17 00:00:00 2001 From: Roland Fredenhagen Date: Wed, 1 Oct 2025 13:47:38 +0200 Subject: [PATCH 6/6] update-docs --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 8ce0ab3..5a6721e 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -37,7 +37,7 @@ jobs: - name: Generate Docs (reference docs.rs) run: | cargo rustdoc -- --cfg docsrs -Z unstable-options $(cargo metadata --format-version 1 | jq --raw-output '.packages | map("--extern-html-root-url=\(.name)=https://docs.rs/\(.name)/\(.version)") | join(" ")') - - uses: actions/upload-pages-artifact@v1 + - uses: actions/upload-pages-artifact@v4 with: path: 'target/doc' - id: deployment