Skip to content

Commit 25b1fc7

Browse files
authored
Unrolled build for #148007
Rollup merge of #148007 - Muscraft:annotate-snippets, r=jdonszelmann chore: Update to the latest annotate-snippets This PR updates `annotate-snippets` to the latest version and updates the adapter code[^1] so that `AnnotateSnippetEmitter`'s output matches `HumanEmitter`'s output. If anyone would like to see the differences[^2] between `AnnotateSnippetEmitter` and `HumanEmitter`, [I have a branch](https://github.com/Muscraft/rust/tree/annotate-snippets-default-renderer) where `AnnotateSnippetEmitter` is used in place of `HumanEmitter`. [^1]: A lot of the adapter code changes are based on code for `HumanEmitter`. [^2]: Some of the test differences will go away when #148001 and #148004 are merged.
2 parents 79966ae + 354b977 commit 25b1fc7

File tree

7 files changed

+780
-122
lines changed

7 files changed

+780
-122
lines changed

Cargo.lock

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
7575
checksum = "710e8eae58854cdc1790fcb56cca04d712a17be849eeb81da2a724bf4bae2bc4"
7676
dependencies = [
7777
"anstyle",
78-
"unicode-width 0.2.1",
78+
"unicode-width 0.2.2",
79+
]
80+
81+
[[package]]
82+
name = "annotate-snippets"
83+
version = "0.12.7"
84+
source = "registry+https://github.com/rust-lang/crates.io-index"
85+
checksum = "47224528f74de27d1d06aad6a5dda4f865b6ebe2e56c538943d746a7270cb67e"
86+
dependencies = [
87+
"anstyle",
88+
"unicode-width 0.2.2",
7989
]
8090

8191
[[package]]
@@ -136,7 +146,7 @@ dependencies = [
136146
"anstyle-lossy",
137147
"anstyle-parse",
138148
"html-escape",
139-
"unicode-width 0.2.1",
149+
"unicode-width 0.2.2",
140150
]
141151

142152
[[package]]
@@ -677,7 +687,7 @@ checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81"
677687
dependencies = [
678688
"serde",
679689
"termcolor",
680-
"unicode-width 0.2.1",
690+
"unicode-width 0.2.2",
681691
]
682692

683693
[[package]]
@@ -808,7 +818,7 @@ dependencies = [
808818
"encode_unicode",
809819
"libc",
810820
"once_cell",
811-
"unicode-width 0.2.1",
821+
"unicode-width 0.2.2",
812822
"windows-sys 0.59.0",
813823
]
814824

@@ -1485,7 +1495,7 @@ version = "0.2.24"
14851495
source = "registry+https://github.com/rust-lang/crates.io-index"
14861496
checksum = "cfe4fbac503b8d1f88e6676011885f34b7174f46e59956bba534ba83abded4df"
14871497
dependencies = [
1488-
"unicode-width 0.2.1",
1498+
"unicode-width 0.2.2",
14891499
]
14901500

14911501
[[package]]
@@ -1887,7 +1897,7 @@ dependencies = [
18871897
"console",
18881898
"number_prefix",
18891899
"portable-atomic",
1890-
"unicode-width 0.2.1",
1900+
"unicode-width 0.2.2",
18911901
"web-time",
18921902
]
18931903

@@ -3756,7 +3766,7 @@ dependencies = [
37563766
name = "rustc_errors"
37573767
version = "0.0.0"
37583768
dependencies = [
3759-
"annotate-snippets 0.11.5",
3769+
"annotate-snippets 0.12.7",
37603770
"anstream",
37613771
"anstyle",
37623772
"derive_setters",
@@ -4331,7 +4341,7 @@ dependencies = [
43314341
"thin-vec",
43324342
"tracing",
43334343
"unicode-normalization",
4334-
"unicode-width 0.2.1",
4344+
"unicode-width 0.2.2",
43354345
]
43364346

43374347
[[package]]
@@ -4590,7 +4600,7 @@ dependencies = [
45904600
"sha1",
45914601
"sha2",
45924602
"tracing",
4593-
"unicode-width 0.2.1",
4603+
"unicode-width 0.2.2",
45944604
]
45954605

45964606
[[package]]
@@ -5936,9 +5946,9 @@ checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
59365946

59375947
[[package]]
59385948
name = "unicode-width"
5939-
version = "0.2.1"
5949+
version = "0.2.2"
59405950
source = "registry+https://github.com/rust-lang/crates.io-index"
5941-
checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c"
5951+
checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
59425952

59435953
[[package]]
59445954
name = "unicode-xid"
@@ -6223,7 +6233,7 @@ dependencies = [
62236233
"bumpalo",
62246234
"leb128fmt",
62256235
"memchr",
6226-
"unicode-width 0.2.1",
6236+
"unicode-width 0.2.2",
62276237
"wasm-encoder 0.240.0",
62286238
]
62296239

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 = "0.11"
8+
annotate-snippets = "0.12.7"
99
anstream = "0.6.20"
1010
anstyle = "1.0.13"
1111
derive_setters = "0.1.6"

0 commit comments

Comments
 (0)