Skip to content

Commit 904909f

Browse files
authored
Rollup merge of #69929 - cuviper:unicode-13.0.0, r=Mark-Simulacrum
Regenerate tables for Unicode 13.0.0
2 parents 5570a23 + 543832b commit 904909f

File tree

2 files changed

+462
-445
lines changed

2 files changed

+462
-445
lines changed

src/libcore/unicode/printable.rs

+92-81
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ pub(crate) fn is_printable(x: char) -> bool {
4444
} else if x < 0x20000 {
4545
check(lower, SINGLETONS1U, SINGLETONS1L, NORMAL1)
4646
} else {
47-
if 0x2a6d7 <= x && x < 0x2a700 {
47+
if 0x2a6de <= x && x < 0x2a700 {
4848
return false;
4949
}
5050
if 0x2b735 <= x && x < 0x2b740 {
@@ -59,7 +59,10 @@ pub(crate) fn is_printable(x: char) -> bool {
5959
if 0x2ebe1 <= x && x < 0x2f800 {
6060
return false;
6161
}
62-
if 0x2fa1e <= x && x < 0xe0100 {
62+
if 0x2fa1e <= x && x < 0x30000 {
63+
return false;
64+
}
65+
if 0x3134b <= x && x < 0xe0100 {
6366
return false;
6467
}
6568
if 0xe01f0 <= x && x < 0x110000 {
@@ -81,7 +84,7 @@ const SINGLETONS0U: &[(u8, u8)] = &[
8184
(0x0a, 28),
8285
(0x0b, 25),
8386
(0x0c, 20),
84-
(0x0d, 18),
87+
(0x0d, 16),
8588
(0x0e, 13),
8689
(0x0f, 4),
8790
(0x10, 3),
@@ -96,7 +99,7 @@ const SINGLETONS0U: &[(u8, u8)] = &[
9699
(0x1d, 1),
97100
(0x1f, 22),
98101
(0x20, 3),
99-
(0x2b, 4),
102+
(0x2b, 3),
100103
(0x2c, 2),
101104
(0x2d, 11),
102105
(0x2e, 1),
@@ -129,29 +132,29 @@ const SINGLETONS0L: &[u8] = &[
129132
0x4a, 0x5e, 0x64, 0x65, 0x84, 0x91, 0x9b, 0x9d,
130133
0xc9, 0xce, 0xcf, 0x0d, 0x11, 0x29, 0x45, 0x49,
131134
0x57, 0x64, 0x65, 0x8d, 0x91, 0xa9, 0xb4, 0xba,
132-
0xbb, 0xc5, 0xc9, 0xdf, 0xe4, 0xe5, 0xf0, 0x04,
133-
0x0d, 0x11, 0x45, 0x49, 0x64, 0x65, 0x80, 0x81,
134-
0x84, 0xb2, 0xbc, 0xbe, 0xbf, 0xd5, 0xd7, 0xf0,
135-
0xf1, 0x83, 0x85, 0x8b, 0xa4, 0xa6, 0xbe, 0xbf,
136-
0xc5, 0xc7, 0xce, 0xcf, 0xda, 0xdb, 0x48, 0x98,
137-
0xbd, 0xcd, 0xc6, 0xce, 0xcf, 0x49, 0x4e, 0x4f,
138-
0x57, 0x59, 0x5e, 0x5f, 0x89, 0x8e, 0x8f, 0xb1,
139-
0xb6, 0xb7, 0xbf, 0xc1, 0xc6, 0xc7, 0xd7, 0x11,
140-
0x16, 0x17, 0x5b, 0x5c, 0xf6, 0xf7, 0xfe, 0xff,
141-
0x80, 0x0d, 0x6d, 0x71, 0xde, 0xdf, 0x0e, 0x0f,
142-
0x1f, 0x6e, 0x6f, 0x1c, 0x1d, 0x5f, 0x7d, 0x7e,
143-
0xae, 0xaf, 0xbb, 0xbc, 0xfa, 0x16, 0x17, 0x1e,
144-
0x1f, 0x46, 0x47, 0x4e, 0x4f, 0x58, 0x5a, 0x5c,
145-
0x5e, 0x7e, 0x7f, 0xb5, 0xc5, 0xd4, 0xd5, 0xdc,
146-
0xf0, 0xf1, 0xf5, 0x72, 0x73, 0x8f, 0x74, 0x75,
147-
0x96, 0x97, 0x2f, 0x5f, 0x26, 0x2e, 0x2f, 0xa7,
148-
0xaf, 0xb7, 0xbf, 0xc7, 0xcf, 0xd7, 0xdf, 0x9a,
149-
0x40, 0x97, 0x98, 0x30, 0x8f, 0x1f, 0xc0, 0xc1,
150-
0xce, 0xff, 0x4e, 0x4f, 0x5a, 0x5b, 0x07, 0x08,
151-
0x0f, 0x10, 0x27, 0x2f, 0xee, 0xef, 0x6e, 0x6f,
152-
0x37, 0x3d, 0x3f, 0x42, 0x45, 0x90, 0x91, 0xfe,
153-
0xff, 0x53, 0x67, 0x75, 0xc8, 0xc9, 0xd0, 0xd1,
154-
0xd8, 0xd9, 0xe7, 0xfe, 0xff,
135+
0xbb, 0xc5, 0xc9, 0xdf, 0xe4, 0xe5, 0xf0, 0x0d,
136+
0x11, 0x45, 0x49, 0x64, 0x65, 0x80, 0x84, 0xb2,
137+
0xbc, 0xbe, 0xbf, 0xd5, 0xd7, 0xf0, 0xf1, 0x83,
138+
0x85, 0x8b, 0xa4, 0xa6, 0xbe, 0xbf, 0xc5, 0xc7,
139+
0xce, 0xcf, 0xda, 0xdb, 0x48, 0x98, 0xbd, 0xcd,
140+
0xc6, 0xce, 0xcf, 0x49, 0x4e, 0x4f, 0x57, 0x59,
141+
0x5e, 0x5f, 0x89, 0x8e, 0x8f, 0xb1, 0xb6, 0xb7,
142+
0xbf, 0xc1, 0xc6, 0xc7, 0xd7, 0x11, 0x16, 0x17,
143+
0x5b, 0x5c, 0xf6, 0xf7, 0xfe, 0xff, 0x80, 0x0d,
144+
0x6d, 0x71, 0xde, 0xdf, 0x0e, 0x0f, 0x1f, 0x6e,
145+
0x6f, 0x1c, 0x1d, 0x5f, 0x7d, 0x7e, 0xae, 0xaf,
146+
0xbb, 0xbc, 0xfa, 0x16, 0x17, 0x1e, 0x1f, 0x46,
147+
0x47, 0x4e, 0x4f, 0x58, 0x5a, 0x5c, 0x5e, 0x7e,
148+
0x7f, 0xb5, 0xc5, 0xd4, 0xd5, 0xdc, 0xf0, 0xf1,
149+
0xf5, 0x72, 0x73, 0x8f, 0x74, 0x75, 0x96, 0x2f,
150+
0x5f, 0x26, 0x2e, 0x2f, 0xa7, 0xaf, 0xb7, 0xbf,
151+
0xc7, 0xcf, 0xd7, 0xdf, 0x9a, 0x40, 0x97, 0x98,
152+
0x30, 0x8f, 0x1f, 0xc0, 0xc1, 0xce, 0xff, 0x4e,
153+
0x4f, 0x5a, 0x5b, 0x07, 0x08, 0x0f, 0x10, 0x27,
154+
0x2f, 0xee, 0xef, 0x6e, 0x6f, 0x37, 0x3d, 0x3f,
155+
0x42, 0x45, 0x90, 0x91, 0xfe, 0xff, 0x53, 0x67,
156+
0x75, 0xc8, 0xc9, 0xd0, 0xd1, 0xd8, 0xd9, 0xe7,
157+
0xfe, 0xff,
155158
];
156159
#[rustfmt::skip]
157160
const SINGLETONS1U: &[(u8, u8)] = &[
@@ -163,14 +166,15 @@ const SINGLETONS1U: &[(u8, u8)] = &[
163166
(0x09, 2),
164167
(0x0a, 5),
165168
(0x0b, 2),
169+
(0x0e, 4),
166170
(0x10, 1),
167-
(0x11, 4),
171+
(0x11, 2),
168172
(0x12, 5),
169173
(0x13, 17),
170-
(0x14, 2),
174+
(0x14, 1),
171175
(0x15, 2),
172176
(0x17, 2),
173-
(0x19, 4),
177+
(0x19, 13),
174178
(0x1c, 5),
175179
(0x1d, 8),
176180
(0x24, 1),
@@ -188,32 +192,35 @@ const SINGLETONS1U: &[(u8, u8)] = &[
188192
(0xe8, 2),
189193
(0xee, 32),
190194
(0xf0, 4),
191-
(0xf9, 6),
195+
(0xf8, 2),
196+
(0xf9, 2),
192197
(0xfa, 2),
198+
(0xfb, 1),
193199
];
194200
#[rustfmt::skip]
195201
const SINGLETONS1L: &[u8] = &[
196202
0x0c, 0x27, 0x3b, 0x3e, 0x4e, 0x4f, 0x8f, 0x9e,
197203
0x9e, 0x9f, 0x06, 0x07, 0x09, 0x36, 0x3d, 0x3e,
198204
0x56, 0xf3, 0xd0, 0xd1, 0x04, 0x14, 0x18, 0x36,
199-
0x37, 0x56, 0x57, 0xbd, 0x35, 0xce, 0xcf, 0xe0,
200-
0x12, 0x87, 0x89, 0x8e, 0x9e, 0x04, 0x0d, 0x0e,
201-
0x11, 0x12, 0x29, 0x31, 0x34, 0x3a, 0x45, 0x46,
202-
0x49, 0x4a, 0x4e, 0x4f, 0x64, 0x65, 0x5a, 0x5c,
203-
0xb6, 0xb7, 0x1b, 0x1c, 0xa8, 0xa9, 0xd8, 0xd9,
204-
0x09, 0x37, 0x90, 0x91, 0xa8, 0x07, 0x0a, 0x3b,
205-
0x3e, 0x66, 0x69, 0x8f, 0x92, 0x6f, 0x5f, 0xee,
206-
0xef, 0x5a, 0x62, 0x9a, 0x9b, 0x27, 0x28, 0x55,
207-
0x9d, 0xa0, 0xa1, 0xa3, 0xa4, 0xa7, 0xa8, 0xad,
208-
0xba, 0xbc, 0xc4, 0x06, 0x0b, 0x0c, 0x15, 0x1d,
209-
0x3a, 0x3f, 0x45, 0x51, 0xa6, 0xa7, 0xcc, 0xcd,
210-
0xa0, 0x07, 0x19, 0x1a, 0x22, 0x25, 0x3e, 0x3f,
211-
0xc5, 0xc6, 0x04, 0x20, 0x23, 0x25, 0x26, 0x28,
212-
0x33, 0x38, 0x3a, 0x48, 0x4a, 0x4c, 0x50, 0x53,
213-
0x55, 0x56, 0x58, 0x5a, 0x5c, 0x5e, 0x60, 0x63,
214-
0x65, 0x66, 0x6b, 0x73, 0x78, 0x7d, 0x7f, 0x8a,
215-
0xa4, 0xaa, 0xaf, 0xb0, 0xc0, 0xd0, 0x0c, 0x72,
216-
0xa3, 0xa4, 0xcb, 0xcc, 0x6e, 0x6f,
205+
0x37, 0x56, 0x57, 0x7f, 0xaa, 0xae, 0xaf, 0xbd,
206+
0x35, 0xe0, 0x12, 0x87, 0x89, 0x8e, 0x9e, 0x04,
207+
0x0d, 0x0e, 0x11, 0x12, 0x29, 0x31, 0x34, 0x3a,
208+
0x45, 0x46, 0x49, 0x4a, 0x4e, 0x4f, 0x64, 0x65,
209+
0x5c, 0xb6, 0xb7, 0x1b, 0x1c, 0x07, 0x08, 0x0a,
210+
0x0b, 0x14, 0x17, 0x36, 0x39, 0x3a, 0xa8, 0xa9,
211+
0xd8, 0xd9, 0x09, 0x37, 0x90, 0x91, 0xa8, 0x07,
212+
0x0a, 0x3b, 0x3e, 0x66, 0x69, 0x8f, 0x92, 0x6f,
213+
0x5f, 0xee, 0xef, 0x5a, 0x62, 0x9a, 0x9b, 0x27,
214+
0x28, 0x55, 0x9d, 0xa0, 0xa1, 0xa3, 0xa4, 0xa7,
215+
0xa8, 0xad, 0xba, 0xbc, 0xc4, 0x06, 0x0b, 0x0c,
216+
0x15, 0x1d, 0x3a, 0x3f, 0x45, 0x51, 0xa6, 0xa7,
217+
0xcc, 0xcd, 0xa0, 0x07, 0x19, 0x1a, 0x22, 0x25,
218+
0x3e, 0x3f, 0xc5, 0xc6, 0x04, 0x20, 0x23, 0x25,
219+
0x26, 0x28, 0x33, 0x38, 0x3a, 0x48, 0x4a, 0x4c,
220+
0x50, 0x53, 0x55, 0x56, 0x58, 0x5a, 0x5c, 0x5e,
221+
0x60, 0x63, 0x65, 0x66, 0x6b, 0x73, 0x78, 0x7d,
222+
0x7f, 0x8a, 0xa4, 0xaa, 0xaf, 0xb0, 0xc0, 0xd0,
223+
0xae, 0xaf, 0x79, 0xcc, 0x6e, 0x6f, 0x93,
217224
];
218225
#[rustfmt::skip]
219226
const NORMAL0: &[u8] = &[
@@ -225,7 +232,7 @@ const NORMAL0: &[u8] = &[
225232
0x06, 0x11,
226233
0x81, 0xac, 0x0e,
227234
0x80, 0xab, 0x35,
228-
0x1e, 0x15,
235+
0x28, 0x0b,
229236
0x80, 0xe0, 0x03,
230237
0x19, 0x08,
231238
0x01, 0x04,
@@ -237,8 +244,8 @@ const NORMAL0: &[u8] = &[
237244
0x11, 0x0a,
238245
0x50, 0x0f,
239246
0x12, 0x07,
240-
0x55, 0x08,
241-
0x02, 0x04,
247+
0x55, 0x07,
248+
0x03, 0x04,
242249
0x1c, 0x0a,
243250
0x09, 0x03,
244251
0x08, 0x03,
@@ -292,7 +299,7 @@ const NORMAL0: &[u8] = &[
292299
0x0b, 0x03,
293300
0x80, 0xac, 0x06,
294301
0x0a, 0x06,
295-
0x1f, 0x41,
302+
0x21, 0x3f,
296303
0x4c, 0x04,
297304
0x2d, 0x03,
298305
0x74, 0x08,
@@ -315,21 +322,19 @@ const NORMAL0: &[u8] = &[
315322
0x3b, 0x07,
316323
0x02, 0x0e,
317324
0x18, 0x09,
318-
0x80, 0xb0, 0x30,
325+
0x80, 0xb3, 0x2d,
319326
0x74, 0x0c,
320327
0x80, 0xd6, 0x1a,
321328
0x0c, 0x05,
322329
0x80, 0xff, 0x05,
323-
0x80, 0xb6, 0x05,
324-
0x24, 0x0c,
325-
0x9b, 0xc6, 0x0a,
326-
0xd2, 0x30, 0x10,
330+
0x80, 0xdf, 0x0c,
331+
0xee, 0x0d, 0x03,
327332
0x84, 0x8d, 0x03,
328333
0x37, 0x09,
329334
0x81, 0x5c, 0x14,
330335
0x80, 0xb8, 0x08,
331-
0x80, 0xc7, 0x30,
332-
0x35, 0x04,
336+
0x80, 0xcb, 0x2a,
337+
0x38, 0x03,
333338
0x0a, 0x06,
334339
0x38, 0x08,
335340
0x46, 0x08,
@@ -341,7 +346,7 @@ const NORMAL0: &[u8] = &[
341346
0x80, 0x83, 0x18,
342347
0x1c, 0x0a,
343348
0x16, 0x09,
344-
0x48, 0x08,
349+
0x4c, 0x04,
345350
0x80, 0x8a, 0x06,
346351
0xab, 0xa4, 0x0c,
347352
0x17, 0x04,
@@ -365,7 +370,7 @@ const NORMAL1: &[u8] = &[
365370
0x7b, 0x05,
366371
0x03, 0x04,
367372
0x2d, 0x03,
368-
0x65, 0x04,
373+
0x66, 0x03,
369374
0x01, 0x2f,
370375
0x2e, 0x80, 0x82,
371376
0x1d, 0x03,
@@ -410,16 +415,17 @@ const NORMAL1: &[u8] = &[
410415
0x33, 0x07,
411416
0x2e, 0x08,
412417
0x0a, 0x81, 0x26,
413-
0x1f, 0x80, 0x81,
418+
0x52, 0x4e,
414419
0x28, 0x08,
415-
0x2a, 0x80, 0x86,
420+
0x2a, 0x56,
421+
0x1c, 0x14,
416422
0x17, 0x09,
417423
0x4e, 0x04,
418424
0x1e, 0x0f,
419425
0x43, 0x0e,
420426
0x19, 0x07,
421427
0x0a, 0x06,
422-
0x47, 0x09,
428+
0x48, 0x08,
423429
0x27, 0x09,
424430
0x75, 0x0b,
425431
0x3f, 0x41,
@@ -430,7 +436,7 @@ const NORMAL1: &[u8] = &[
430436
0x01, 0x05,
431437
0x10, 0x03,
432438
0x05, 0x80, 0x8b,
433-
0x60, 0x20,
439+
0x62, 0x1e,
434440
0x48, 0x08,
435441
0x0a, 0x80, 0xa6,
436442
0x5e, 0x22,
@@ -443,7 +449,8 @@ const NORMAL1: &[u8] = &[
443449
0x10, 0x80, 0xc0,
444450
0x3c, 0x64,
445451
0x53, 0x0c,
446-
0x01, 0x80, 0xa0,
452+
0x48, 0x09,
453+
0x0a, 0x46,
447454
0x45, 0x1b,
448455
0x48, 0x08,
449456
0x53, 0x1d,
@@ -456,7 +463,8 @@ const NORMAL1: &[u8] = &[
456463
0x0a, 0x06,
457464
0x39, 0x07,
458465
0x0a, 0x81, 0x36,
459-
0x19, 0x80, 0xc7,
466+
0x19, 0x80, 0xb7,
467+
0x01, 0x0f,
460468
0x32, 0x0d,
461469
0x83, 0x9b, 0x66,
462470
0x75, 0x0b,
@@ -474,9 +482,11 @@ const NORMAL1: &[u8] = &[
474482
0x4b, 0x04,
475483
0x39, 0x07,
476484
0x11, 0x40,
477-
0x04, 0x1c,
485+
0x05, 0x0b,
486+
0x02, 0x0e,
478487
0x97, 0xf8, 0x08,
479-
0x82, 0xf3, 0xa5, 0x0d,
488+
0x84, 0xd6, 0x2a,
489+
0x09, 0xa2, 0xf7,
480490
0x81, 0x1f, 0x31,
481491
0x03, 0x11,
482492
0x04, 0x08,
@@ -515,30 +525,31 @@ const NORMAL1: &[u8] = &[
515525
0x2c, 0x04,
516526
0x64, 0x0c,
517527
0x56, 0x0a,
518-
0x0d, 0x03,
519-
0x5d, 0x03,
520-
0x3d, 0x39,
528+
0x80, 0xae, 0x38,
521529
0x1d, 0x0d,
522530
0x2c, 0x04,
523531
0x09, 0x07,
524532
0x02, 0x0e,
525533
0x06, 0x80, 0x9a,
526-
0x83, 0xd6, 0x0a,
534+
0x83, 0xd8, 0x08,
535+
0x0d, 0x03,
527536
0x0d, 0x03,
528-
0x0b, 0x05,
529537
0x74, 0x0c,
530538
0x59, 0x07,
531539
0x0c, 0x14,
532540
0x0c, 0x04,
533541
0x38, 0x08,
534542
0x0a, 0x06,
535543
0x28, 0x08,
536-
0x1e, 0x52,
537-
0x77, 0x03,
538-
0x31, 0x03,
539-
0x80, 0xa6, 0x0c,
540-
0x14, 0x04,
544+
0x22, 0x4e,
545+
0x81, 0x54, 0x0c,
546+
0x15, 0x03,
541547
0x03, 0x05,
548+
0x07, 0x09,
549+
0x19, 0x07,
550+
0x07, 0x09,
542551
0x03, 0x0d,
543-
0x06, 0x85, 0x6a,
552+
0x07, 0x29,
553+
0x80, 0xcb, 0x25,
554+
0x0a, 0x84, 0x06,
544555
];

0 commit comments

Comments
 (0)