Skip to content

Commit e26dedc

Browse files
borsbors
committed
Auto merge of #154914 - Muscraft:update-annotate-snippets, r=jieyouxu
chore: Update annotate-snippets to 0.12.15 This PR updates `annotate-snippets` to [`0.12.15`](https://github.com/rust-lang/annotate-snippets-rs/blob/main/CHANGELOG.md#01215---2026-04-06), which includes a fix for #154258, as well as a number of other fixes over [`0.12.10`](https://github.com/rust-lang/annotate-snippets-rs/blob/main/CHANGELOG.md#01210---2025-12-01). fixes #154258
2 parents c753cef + 63ed113 commit e26dedc

9 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎Cargo.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ dependencies = [
6464

6565
[[package]]
6666
name = "annotate-snippets"
67-
version = "0.12.10"
67+
version = "0.12.15"
6868
source = "registry+https://github.com/rust-lang/crates.io-index"
69-
checksum = "15580ece6ea97cbf832d60ba19c021113469480852c6a2a6beb0db28f097bf1f"
69+
checksum = "92570a3f9c98e7e84df84b71d0965ac99b1871fcd75a3773a3bd1bad13f64cf7"
7070
dependencies = [
7171
"anstyle",
7272
"memchr",
@@ -2418,9 +2418,9 @@ dependencies = [
24182418

24192419
[[package]]
24202420
name = "memchr"
2421-
version = "2.7.6"
2421+
version = "2.8.0"
24222422
source = "registry+https://github.com/rust-lang/crates.io-index"
2423-
checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
2423+
checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
24242424

24252425
[[package]]
24262426
name = "memmap2"
@@ -3905,7 +3905,7 @@ dependencies = [
39053905
name = "rustc_errors"
39063906
version = "0.0.0"
39073907
dependencies = [
3908-
"annotate-snippets 0.12.10",
3908+
"annotate-snippets 0.12.15",
39093909
"anstream",
39103910
"anstyle",
39113911
"derive_setters",

‎compiler/rustc_errors/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2024"
55

66
[dependencies]
77
# tidy-alphabetical-start
8-
annotate-snippets = { version = "0.12.10", features = ["simd"] }
8+
annotate-snippets = { version = "0.12.15", features = ["simd"] }
99
anstream = "0.6.20"
1010
anstyle = "1.0.13"
1111
derive_setters = "0.1.6"

‎tests/rustdoc-ui/lints/diagnostic-width.stderr‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
error: this URL is not a hyperlink
22
--> $DIR/diagnostic-width.rs:4:41
33
|
4-
LL | ... a http://link.com
5-
| ^^^^^^^^^^^^^^^
4+
LL | ... a http:...k.com
5+
| ^^^^^...^^^^^
66
|
77
= note: bare URLs are not automatically turned into clickable links
88
note: the lint level is defined here
99
--> $DIR/diagnostic-width.rs:2:9
1010
|
11-
LL | ...ny(ru...are_urls)]
12-
| ^^...^^^^^^^^
11+
LL | ...ny(rustd..._urls)]
12+
| ^^^^^...^^^^^
1313
help: use an automatic link instead
1414
|
1515
LL | /// This is a long line that contains a <http://link.com>

‎tests/ui/diagnostic-width/long-span.long.stderr‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
error[E0369]: cannot add `[{integer}; 1680]` to `[{integer}; 1680]`
22
╭▸ $DIR/long-span.rs:7:5056
33
│
4-
LL │ …u8 = [0, 0, 0, 0, 0, 0, 0, 0, 0, …, 0, 0, 0, 0, 0, 0, 0] + [0, 0, 0, 0, 0, 0, 0, 0, 0, …, 0, 0, 0, 0, 0, 0, 0];
5-
│ ┬───────────────────────────…────────────────────── ━ ────────────────────────────…────────────────────── [{integer}; 1680]
4+
LL │ …u8 = [0, 0, 0, 0, 0, 0, 0, 0, …, 0, 0, 0, 0, 0, 0, 0, 0] + [0, 0, 0, 0, 0, 0, 0, 0, …, 0, 0, 0, 0, 0, 0, 0, 0];
5+
│ ┬────────────────────────…───────────────────────── ━ ─────────────────────────…───────────────────────── [{integer}; 1680]
66
│ │
77
╰╴ [{integer}; 1680]
88

99
error[E0308]: mismatched types
1010
╭▸ $DIR/long-span.rs:9:15
1111
│
12-
LL │ …t D: u8 = [0, 0, 0, 0, 0, 0, 0, 0… 0, 0, 0, 0, 0, 0, 0, 0, 0];
13-
│ ┬─ ━━━━━━━━━━━━━━━━━━━━━━━…━━━━━━━━━━━━━━━━━━━━━━━━━━━ expected `u8`, found `[{integer}; 1680]`
12+
LL │ …t D: u8 = [0, 0, 0, 0, 0, 0, 0, 0, …, 0, 0, 0, 0, 0, 0, 0, 0];
13+
│ ┬─ ━━━━━━━━━━━━━━━━━━━━━━━━━…━━━━━━━━━━━━━━━━━━━━━━━━━ expected `u8`, found `[{integer}; 1680]`
1414
│ │
1515
╰╴ expected because of the type of the constant
1616

‎tests/ui/diagnostic-width/long-span.longest.stderr‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
error[E0369]: cannot add `[{integer}; 1680]` to `[{integer}; 1680]`
22
--> $DIR/long-span.rs:7:5056
33
|
4-
LL | ... = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0...0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0...0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
5-
| -----------------------------------------...----------------------------------- ^ -----------------------------------------...----------------------------------- [{integer}; 1680]
4+
LL | ... = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0...0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] + [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0...0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
5+
| --------------------------------------...-------------------------------------- ^ --------------------------------------...-------------------------------------- [{integer}; 1680]
66
| |
77
| [{integer}; 1680]
88

99
error[E0308]: mismatched types
1010
--> $DIR/long-span.rs:9:15
1111
|
12-
LL | ...D: u8 = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,..., 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
13-
| -- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^...^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u8`, found `[{integer}; 1680]`
12+
LL | ...D: u8 = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0...0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
13+
| -- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^...^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u8`, found `[{integer}; 1680]`
1414
| |
1515
| expected because of the type of the constant
1616

‎tests/ui/diagnostic-width/long-span.short.stderr‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
error[E0369]: cannot add `[{integer}; 1680]` to `[{integer}; 1680]`
22
╭▸ $DIR/long-span.rs:7:5056
33
│
4-
LL │ …u8 = [0, 0, 0…0] + [0, 0, 0…0];
5-
│ ┬───────…── ━ ────────…── [{integer}; 1680]
4+
LL │ …u8 = [0, 0…0, 0] + [0, 0…0, 0];
5+
│ ┬────…───── ━ ─────…───── [{integer}; 1680]
66
│ │
77
╰╴ [{integer}; 1680]
88

99
error[E0308]: mismatched types
1010
╭▸ $DIR/long-span.rs:9:15
1111
│
12-
LL │ …t D: u8 = [0,…, 0, 0];
13-
│ ┬─ ━━━…━━━━━━━ expected `u8`, found `[{integer}; 1680]`
12+
LL │ …t D: u8 = [0, 0…0, 0];
13+
│ ┬─ ━━━━━…━━━━━ expected `u8`, found `[{integer}; 1680]`
1414
│ │
1515
╰╴ expected because of the type of the constant
1616

‎tests/ui/diagnostic-width/long-span.shortest.stderr‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
error[E0369]: cannot add `[{integer}; 1680]` to `[{integer}; 1680]`
22
--> $DIR/long-span.rs:7:5056
33
|
4-
LL | ... = [0, 0, 0...0] + [0, 0, 0...0];
5-
| --------...-- ^ --------...-- [{integer}; 1680]
4+
LL | ... = [0, 0...0, 0] + [0, 0...0, 0];
5+
| -----...----- ^ -----...----- [{integer}; 1680]
66
| |
77
| [{integer}; 1680]
88

99
error[E0308]: mismatched types
1010
--> $DIR/long-span.rs:9:15
1111
|
12-
LL | ...D: u8 = [0,..., 0, 0];
13-
| -- ^^^...^^^^^^^ expected `u8`, found `[{integer}; 1680]`
12+
LL | ...D: u8 = [0, 0...0, 0];
13+
| -- ^^^^^...^^^^^ expected `u8`, found `[{integer}; 1680]`
1414
| |
1515
| expected because of the type of the constant
1616

‎tests/ui/parser/raw/too-many-hash.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error: too many `#` symbols: raw strings may be delimited by up to 255 `#` symbols, but found 256
22
--> $DIR/too-many-hash.rs:4:19
33
|
4-
LL | ... = r###################################################...######################################;
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^...^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4+
LL | ... = r############################################...#############################################;
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^...^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66

77
error: aborting due to 1 previous error
88

‎tests/ui/proc-macro/nonfatal-parsing.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ LL | '\n'
166166
error: too many `#` symbols: raw strings may be delimited by up to 255 `#` symbols, but found 256
167167
--> <proc-macro source code>:1:1
168168
|
169-
LL | r#######################################...##################################################
170-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^...^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
169+
LL | r############################################...#############################################
170+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^...^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
171171

172172
error: invalid digit for a base 2 literal
173173
--> <proc-macro source code>:1:9

0 commit comments

Comments
 (0)