Skip to content

Commit 2aa26d8

Browse files
borsbors
committed
Auto merge of #131645 - matthiaskrgr:rollup-lgr1ezu, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #131086 (Update unicode-width to 0.2.0) - #131585 (compiletest: Remove the one thing that was checking a directive's `original_line`) - #131614 (Error on trying to use revisions in `run-make` tests) - #131638 (compiletest: Move debugger setup code out of `lib.rs`) - #131641 (switch unicode-data bitsets back to 'static') - #131642 (Special case error message for a `build-fail` test that failed check build) r? `@ghost` `@rustbot` modify labels: rollup
2 parents ecf2d1f + 0fa7101 commit 2aa26d8

File tree

15 files changed

+374
-342
lines changed

15 files changed

+374
-342
lines changed

‎Cargo.lock

+19-13
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ version = "0.9.2"
9696
source = "registry+https://github.com/rust-lang/crates.io-index"
9797
checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e"
9898
dependencies = [
99-
"unicode-width",
99+
"unicode-width 0.1.14",
100100
"yansi-term",
101101
]
102102

@@ -107,7 +107,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
107107
checksum = "24e35ed54e5ea7997c14ed4c70ba043478db1112e98263b3b035907aa197d991"
108108
dependencies = [
109109
"anstyle",
110-
"unicode-width",
110+
"unicode-width 0.1.14",
111111
]
112112

113113
[[package]]
@@ -168,7 +168,7 @@ dependencies = [
168168
"anstyle",
169169
"anstyle-lossy",
170170
"html-escape",
171-
"unicode-width",
171+
"unicode-width 0.1.14",
172172
]
173173

174174
[[package]]
@@ -737,7 +737,7 @@ dependencies = [
737737
"encode_unicode",
738738
"lazy_static",
739739
"libc",
740-
"unicode-width",
740+
"unicode-width 0.1.14",
741741
"windows-sys 0.52.0",
742742
]
743743

@@ -1425,7 +1425,7 @@ version = "0.2.21"
14251425
source = "registry+https://github.com/rust-lang/crates.io-index"
14261426
checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
14271427
dependencies = [
1428-
"unicode-width",
1428+
"unicode-width 0.1.14",
14291429
]
14301430

14311431
[[package]]
@@ -1788,7 +1788,7 @@ dependencies = [
17881788
"instant",
17891789
"number_prefix",
17901790
"portable-atomic",
1791-
"unicode-width",
1791+
"unicode-width 0.1.14",
17921792
]
17931793

17941794
[[package]]
@@ -2590,7 +2590,7 @@ version = "0.1.6"
25902590
source = "registry+https://github.com/rust-lang/crates.io-index"
25912591
checksum = "d2ad9b889f1b12e0b9ee24db044b5129150d5eada288edc800f789928dc8c0e3"
25922592
dependencies = [
2593-
"unicode-width",
2593+
"unicode-width 0.1.14",
25942594
]
25952595

25962596
[[package]]
@@ -2601,7 +2601,7 @@ checksum = "9ad43c07024ef767f9160710b3a6773976194758c7919b17e63b863db0bdf7fb"
26012601
dependencies = [
26022602
"bytecount",
26032603
"fnv",
2604-
"unicode-width",
2604+
"unicode-width 0.1.14",
26052605
]
26062606

26072607
[[package]]
@@ -4188,7 +4188,7 @@ dependencies = [
41884188
"thin-vec",
41894189
"tracing",
41904190
"unicode-normalization",
4191-
"unicode-width",
4191+
"unicode-width 0.2.0",
41924192
]
41934193

41944194
[[package]]
@@ -4422,7 +4422,7 @@ dependencies = [
44224422
"sha1",
44234423
"sha2",
44244424
"tracing",
4425-
"unicode-width",
4425+
"unicode-width 0.2.0",
44264426
]
44274427

44284428
[[package]]
@@ -4687,7 +4687,7 @@ dependencies = [
46874687
"tracing-subscriber",
46884688
"unicode-properties",
46894689
"unicode-segmentation",
4690-
"unicode-width",
4690+
"unicode-width 0.1.14",
46914691
]
46924692

46934693
[[package]]
@@ -5097,7 +5097,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
50975097
checksum = "4c998b0c8b921495196a48aabaf1901ff28be0760136e31604f7967b0792050e"
50985098
dependencies = [
50995099
"papergrid",
5100-
"unicode-width",
5100+
"unicode-width 0.1.14",
51015101
]
51025102

51035103
[[package]]
@@ -5646,6 +5646,12 @@ version = "0.1.14"
56465646
source = "registry+https://github.com/rust-lang/crates.io-index"
56475647
checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
56485648

5649+
[[package]]
5650+
name = "unicode-width"
5651+
version = "0.2.0"
5652+
source = "registry+https://github.com/rust-lang/crates.io-index"
5653+
checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
5654+
56495655
[[package]]
56505656
name = "unicode-xid"
56515657
version = "0.2.6"
@@ -5894,7 +5900,7 @@ dependencies = [
58945900
"bumpalo",
58955901
"leb128",
58965902
"memchr",
5897-
"unicode-width",
5903+
"unicode-width 0.1.14",
58985904
"wasm-encoder 0.219.0",
58995905
]
59005906

‎compiler/rustc_parse/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ rustc_span = { path = "../rustc_span" }
2020
thin-vec = "0.2.12"
2121
tracing = "0.1"
2222
unicode-normalization = "0.1.11"
23-
unicode-width = "0.1.4"
23+
unicode-width = "0.2.0"
2424
# tidy-alphabetical-end
2525

2626
[dev-dependencies]

‎compiler/rustc_span/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ scoped-tls = "1.0"
1919
sha1 = "0.10.0"
2020
sha2 = "0.10.1"
2121
tracing = "0.1"
22-
unicode-width = "0.1.4"
22+
unicode-width = "0.2.0"
2323
# tidy-alphabetical-end

‎library/core/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@
178178
// tidy-alphabetical-start
179179
#![cfg_attr(bootstrap, feature(const_mut_refs))]
180180
#![cfg_attr(bootstrap, feature(const_refs_to_cell))]
181+
#![cfg_attr(bootstrap, feature(const_refs_to_static))]
181182
#![feature(abi_unadjusted)]
182183
#![feature(adt_const_params)]
183184
#![feature(allow_internal_unsafe)]

‎library/core/src/unicode/unicode_data.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -331,14 +331,14 @@ pub mod grapheme_extend {
331331

332332
#[rustfmt::skip]
333333
pub mod lowercase {
334-
const BITSET_CHUNKS_MAP: &'static [u8; 123] = &[
334+
static BITSET_CHUNKS_MAP: [u8; 123] = [
335335
14, 17, 0, 0, 9, 0, 0, 12, 13, 10, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
336336
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
337337
0, 0, 0, 4, 1, 0, 15, 0, 8, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
338338
0, 0, 5, 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, 19, 0,
339339
3, 18, 0, 7,
340340
];
341-
const BITSET_INDEX_CHUNKS: &'static [[u8; 16]; 20] = &[
341+
static BITSET_INDEX_CHUNKS: [[u8; 16]; 20] = [
342342
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
343343
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 61, 0, 0],
344344
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 14, 56, 0],
@@ -360,7 +360,7 @@ pub mod lowercase {
360360
[16, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
361361
[65, 41, 55, 12, 77, 63, 18, 1, 7, 64, 76, 20, 73, 74, 4, 45],
362362
];
363-
const BITSET_CANONICAL: &'static [u64; 56] = &[
363+
static BITSET_CANONICAL: [u64; 56] = [
364364
0b0000000000000000000000000000000000000000000000000000000000000000,
365365
0b1111111111111111110000000000000000000000000011111111111111111111,
366366
0b1010101010101010101010101010101010101010101010101010100000000010,
@@ -418,7 +418,7 @@ pub mod lowercase {
418418
0b1110011001010001001011010010101001001110001001000011000100101001,
419419
0b1110101111000000000000000000000000001111111111111111111111111100,
420420
];
421-
const BITSET_MAPPING: &'static [(u8, u8); 22] = &[
421+
static BITSET_MAPPING: [(u8, u8); 22] = [
422422
(0, 64), (1, 188), (1, 186), (1, 183), (1, 176), (1, 109), (1, 124), (1, 126), (1, 66),
423423
(1, 70), (1, 77), (2, 146), (2, 144), (2, 83), (3, 93), (3, 147), (3, 133), (4, 12), (4, 6),
424424
(5, 187), (6, 78), (7, 132),
@@ -471,14 +471,14 @@ pub mod n {
471471

472472
#[rustfmt::skip]
473473
pub mod uppercase {
474-
const BITSET_CHUNKS_MAP: &'static [u8; 125] = &[
474+
static BITSET_CHUNKS_MAP: [u8; 125] = [
475475
12, 15, 6, 6, 0, 6, 6, 2, 4, 11, 6, 16, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
476476
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
477477
6, 6, 6, 5, 6, 14, 6, 10, 6, 6, 1, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
478478
6, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 13, 6, 6,
479479
6, 6, 9, 6, 3,
480480
];
481-
const BITSET_INDEX_CHUNKS: &'static [[u8; 16]; 17] = &[
481+
static BITSET_INDEX_CHUNKS: [[u8; 16]; 17] = [
482482
[44, 44, 5, 35, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 5, 1],
483483
[44, 44, 5, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44],
484484
[44, 44, 40, 44, 44, 44, 44, 44, 17, 17, 63, 17, 43, 29, 24, 23],
@@ -497,7 +497,7 @@ pub mod uppercase {
497497
[58, 19, 2, 18, 10, 48, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44],
498498
[58, 38, 17, 27, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44],
499499
];
500-
const BITSET_CANONICAL: &'static [u64; 44] = &[
500+
static BITSET_CANONICAL: [u64; 44] = [
501501
0b0000011111111111111111111111111000000000000000000000000000000000,
502502
0b0000000000111111111111111111111111111111111111111111111111111111,
503503
0b0101010101010101010101010101010101010101010101010101010000000001,
@@ -543,7 +543,7 @@ pub mod uppercase {
543543
0b1111011111111111000000000000000000000000000000000000000000000000,
544544
0b1111111100000000111111110000000000111111000000001111111100000000,
545545
];
546-
const BITSET_MAPPING: &'static [(u8, u8); 25] = &[
546+
static BITSET_MAPPING: [(u8, u8); 25] = [
547547
(0, 187), (0, 177), (0, 171), (0, 167), (0, 164), (0, 32), (0, 47), (0, 51), (0, 121),
548548
(0, 117), (0, 109), (1, 150), (1, 148), (1, 142), (1, 134), (1, 131), (1, 64), (2, 164),
549549
(2, 146), (2, 20), (3, 146), (3, 140), (3, 134), (4, 178), (4, 171),

0 commit comments

Comments
 (0)