Skip to content

Commit 56d9bfd

Browse files
committed
Auto merge of #51505 - cuviper:these-go-to-11, r=estebank
Regenerate character tables for Unicode 11 None
2 parents 1abb4ef + f81e34b commit 56d9bfd

File tree

2 files changed

+1214
-1120
lines changed

2 files changed

+1214
-1120
lines changed

src/libcore/unicode/printable.rs

+101-97
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,14 @@ pub(crate) fn is_printable(x: char) -> bool {
8383
const SINGLETONS0U: &'static [(u8, u8)] = &[
8484
(0x00, 1),
8585
(0x03, 5),
86-
(0x05, 8),
86+
(0x05, 6),
8787
(0x06, 3),
88-
(0x07, 4),
88+
(0x07, 6),
8989
(0x08, 8),
90-
(0x09, 16),
91-
(0x0a, 27),
90+
(0x09, 17),
91+
(0x0a, 28),
9292
(0x0b, 25),
93-
(0x0c, 22),
93+
(0x0c, 20),
9494
(0x0d, 18),
9595
(0x0e, 22),
9696
(0x0f, 4),
@@ -102,18 +102,17 @@ const SINGLETONS0U: &'static [(u8, u8)] = &[
102102
(0x18, 2),
103103
(0x19, 3),
104104
(0x1a, 7),
105+
(0x1c, 2),
105106
(0x1d, 1),
106107
(0x1f, 22),
107108
(0x20, 3),
108-
(0x2b, 5),
109+
(0x2b, 6),
109110
(0x2c, 2),
110111
(0x2d, 11),
111112
(0x2e, 1),
112113
(0x30, 3),
113-
(0x31, 3),
114+
(0x31, 2),
114115
(0x32, 2),
115-
(0xa7, 1),
116-
(0xa8, 2),
117116
(0xa9, 2),
118117
(0xaa, 4),
119118
(0xab, 8),
@@ -125,19 +124,19 @@ const SINGLETONS0U: &'static [(u8, u8)] = &[
125124
];
126125
const SINGLETONS0L: &'static [u8] = &[
127126
0xad, 0x78, 0x79, 0x8b, 0x8d, 0xa2, 0x30, 0x57,
128-
0x58, 0x60, 0x88, 0x8b, 0x8c, 0x90, 0x1c, 0x1d,
129-
0xdd, 0x0e, 0x0f, 0x4b, 0x4c, 0x2e, 0x2f, 0x3f,
127+
0x58, 0x8b, 0x8c, 0x90, 0x1c, 0x1d, 0xdd, 0x0e,
128+
0x0f, 0x4b, 0x4c, 0xfb, 0xfc, 0x2e, 0x2f, 0x3f,
130129
0x5c, 0x5d, 0x5f, 0xb5, 0xe2, 0x84, 0x8d, 0x8e,
131130
0x91, 0x92, 0xa9, 0xb1, 0xba, 0xbb, 0xc5, 0xc6,
132-
0xc9, 0xca, 0xde, 0xe4, 0xe5, 0x04, 0x11, 0x12,
133-
0x29, 0x31, 0x34, 0x37, 0x3a, 0x3b, 0x3d, 0x49,
134-
0x4a, 0x5d, 0x84, 0x8e, 0x92, 0xa9, 0xb1, 0xb4,
135-
0xba, 0xbb, 0xc6, 0xca, 0xce, 0xcf, 0xe4, 0xe5,
136-
0x00, 0x04, 0x0d, 0x0e, 0x11, 0x12, 0x29, 0x31,
137-
0x34, 0x3a, 0x3b, 0x45, 0x46, 0x49, 0x4a, 0x5e,
138-
0x64, 0x65, 0x84, 0x91, 0x9b, 0x9d, 0xc9, 0xce,
139-
0xcf, 0x04, 0x0d, 0x11, 0x29, 0x45, 0x49, 0x57,
140-
0x64, 0x65, 0x84, 0x8d, 0x91, 0xa9, 0xb4, 0xba,
131+
0xc9, 0xca, 0xde, 0xe4, 0xe5, 0xff, 0x00, 0x04,
132+
0x11, 0x12, 0x29, 0x31, 0x34, 0x37, 0x3a, 0x3b,
133+
0x3d, 0x49, 0x4a, 0x5d, 0x84, 0x8e, 0x92, 0xa9,
134+
0xb1, 0xb4, 0xba, 0xbb, 0xc6, 0xca, 0xce, 0xcf,
135+
0xe4, 0xe5, 0x00, 0x04, 0x0d, 0x0e, 0x11, 0x12,
136+
0x29, 0x31, 0x34, 0x3a, 0x3b, 0x45, 0x46, 0x49,
137+
0x4a, 0x5e, 0x64, 0x65, 0x84, 0x91, 0x9b, 0x9d,
138+
0xc9, 0xce, 0xcf, 0x0d, 0x11, 0x29, 0x45, 0x49,
139+
0x57, 0x64, 0x65, 0x8d, 0x91, 0xa9, 0xb4, 0xba,
141140
0xbb, 0xc5, 0xc9, 0xdf, 0xe4, 0xe5, 0xf0, 0x04,
142141
0x0d, 0x11, 0x45, 0x49, 0x64, 0x65, 0x80, 0x81,
143142
0x84, 0xb2, 0xbc, 0xbe, 0xbf, 0xd5, 0xd7, 0xf0,
@@ -150,18 +149,18 @@ const SINGLETONS0L: &'static [u8] = &[
150149
0x11, 0x16, 0x17, 0x5b, 0x5c, 0xf6, 0xf7, 0xfe,
151150
0xff, 0x80, 0x0d, 0x6d, 0x71, 0xde, 0xdf, 0x0e,
152151
0x0f, 0x1f, 0x6e, 0x6f, 0x1c, 0x1d, 0x5f, 0x7d,
153-
0x7e, 0xae, 0xaf, 0xfa, 0x16, 0x17, 0x1e, 0x1f,
154-
0x46, 0x47, 0x4e, 0x4f, 0x58, 0x5a, 0x5c, 0x5e,
155-
0x7e, 0x7f, 0xb5, 0xc5, 0xd4, 0xd5, 0xdc, 0xf0,
156-
0xf1, 0xf5, 0x72, 0x73, 0x8f, 0x74, 0x75, 0x96,
157-
0x97, 0xc9, 0x2f, 0x5f, 0x26, 0x2e, 0x2f, 0xa7,
158-
0xaf, 0xb7, 0xbf, 0xc7, 0xcf, 0xd7, 0xdf, 0x9a,
159-
0x40, 0x97, 0x98, 0x2f, 0x30, 0x8f, 0x1f, 0xff,
160-
0xaf, 0xfe, 0xff, 0xce, 0xff, 0x4e, 0x4f, 0x5a,
161-
0x5b, 0x07, 0x08, 0x0f, 0x10, 0x27, 0x2f, 0xee,
162-
0xef, 0x6e, 0x6f, 0x37, 0x3d, 0x3f, 0x42, 0x45,
163-
0x90, 0x91, 0xfe, 0xff, 0x53, 0x67, 0x75, 0xc8,
164-
0xc9, 0xd0, 0xd1, 0xd8, 0xd9, 0xe7, 0xfe, 0xff,
152+
0x7e, 0xae, 0xaf, 0xbb, 0xbc, 0xfa, 0x16, 0x17,
153+
0x1e, 0x1f, 0x46, 0x47, 0x4e, 0x4f, 0x58, 0x5a,
154+
0x5c, 0x5e, 0x7e, 0x7f, 0xb5, 0xc5, 0xd4, 0xd5,
155+
0xdc, 0xf0, 0xf1, 0xf5, 0x72, 0x73, 0x8f, 0x74,
156+
0x75, 0x96, 0x97, 0xc9, 0xff, 0x2f, 0x5f, 0x26,
157+
0x2e, 0x2f, 0xa7, 0xaf, 0xb7, 0xbf, 0xc7, 0xcf,
158+
0xd7, 0xdf, 0x9a, 0x40, 0x97, 0x98, 0x30, 0x8f,
159+
0x1f, 0xff, 0xce, 0xff, 0x4e, 0x4f, 0x5a, 0x5b,
160+
0x07, 0x08, 0x0f, 0x10, 0x27, 0x2f, 0xee, 0xef,
161+
0x6e, 0x6f, 0x37, 0x3d, 0x3f, 0x42, 0x45, 0x90,
162+
0x91, 0xfe, 0xff, 0x53, 0x67, 0x75, 0xc8, 0xc9,
163+
0xd0, 0xd1, 0xd8, 0xd9, 0xe7, 0xfe, 0xff,
165164
];
166165
const SINGLETONS1U: &'static [(u8, u8)] = &[
167166
(0x00, 6),
@@ -170,17 +169,18 @@ const SINGLETONS1U: &'static [(u8, u8)] = &[
170169
(0x04, 2),
171170
(0x08, 8),
172171
(0x09, 2),
173-
(0x0a, 3),
172+
(0x0a, 5),
174173
(0x0b, 2),
175174
(0x10, 1),
176175
(0x11, 4),
177176
(0x12, 5),
178-
(0x13, 18),
177+
(0x13, 17),
179178
(0x14, 2),
180179
(0x15, 2),
181-
(0x1a, 3),
180+
(0x17, 2),
181+
(0x1a, 2),
182182
(0x1c, 5),
183-
(0x1d, 4),
183+
(0x1d, 8),
184184
(0x24, 1),
185185
(0x6a, 3),
186186
(0x6b, 2),
@@ -195,51 +195,49 @@ const SINGLETONS1U: &'static [(u8, u8)] = &[
195195
(0xe8, 2),
196196
(0xee, 32),
197197
(0xf0, 4),
198-
(0xf1, 1),
199-
(0xf9, 1),
198+
(0xf9, 4),
200199
];
201200
const SINGLETONS1L: &'static [u8] = &[
202201
0x0c, 0x27, 0x3b, 0x3e, 0x4e, 0x4f, 0x8f, 0x9e,
203202
0x9e, 0x9f, 0x06, 0x07, 0x09, 0x36, 0x3d, 0x3e,
204-
0x56, 0xf3, 0xd0, 0xd1, 0x04, 0x14, 0x18, 0x56,
205-
0x57, 0xbd, 0x35, 0xce, 0xcf, 0xe0, 0x12, 0x87,
206-
0x89, 0x8e, 0x9e, 0x04, 0x0d, 0x0e, 0x11, 0x12,
207-
0x29, 0x31, 0x34, 0x3a, 0x3b, 0x45, 0x46, 0x49,
208-
0x4a, 0x4e, 0x4f, 0x64, 0x65, 0x5a, 0x5c, 0xb6,
209-
0xb7, 0x84, 0x85, 0x9d, 0x09, 0x37, 0x90, 0x91,
210-
0xa8, 0x07, 0x0a, 0x3b, 0x3e, 0x6f, 0x5f, 0xee,
211-
0xef, 0x5a, 0x62, 0x9a, 0x9b, 0x27, 0x28, 0x55,
212-
0x9d, 0xa0, 0xa1, 0xa3, 0xa4, 0xa7, 0xa8, 0xad,
213-
0xba, 0xbc, 0xc4, 0x06, 0x0b, 0x0c, 0x15, 0x1d,
214-
0x3a, 0x3f, 0x45, 0x51, 0xa6, 0xa7, 0xcc, 0xcd,
215-
0xa0, 0x07, 0x19, 0x1a, 0x22, 0x25, 0xc5, 0xc6,
216-
0x04, 0x20, 0x23, 0x25, 0x26, 0x28, 0x33, 0x38,
217-
0x3a, 0x48, 0x4a, 0x4c, 0x50, 0x53, 0x55, 0x56,
218-
0x58, 0x5a, 0x5c, 0x5e, 0x60, 0x63, 0x65, 0x66,
219-
0x6b, 0x73, 0x78, 0x7d, 0x7f, 0x8a, 0xa4, 0xaa,
220-
0xaf, 0xb0, 0xc0, 0xd0, 0x2f, 0x3f,
203+
0x56, 0xf3, 0xd0, 0xd1, 0x04, 0x14, 0x18, 0x36,
204+
0x37, 0x56, 0x57, 0xbd, 0x35, 0xce, 0xcf, 0xe0,
205+
0x12, 0x87, 0x89, 0x8e, 0x9e, 0x04, 0x0d, 0x0e,
206+
0x11, 0x12, 0x29, 0x31, 0x34, 0x3a, 0x45, 0x46,
207+
0x49, 0x4a, 0x4e, 0x4f, 0x64, 0x65, 0x5a, 0x5c,
208+
0xb6, 0xb7, 0x1b, 0x1c, 0x84, 0x85, 0x09, 0x37,
209+
0x90, 0x91, 0xa8, 0x07, 0x0a, 0x3b, 0x3e, 0x66,
210+
0x69, 0x8f, 0x92, 0x6f, 0x5f, 0xee, 0xef, 0x5a,
211+
0x62, 0x9a, 0x9b, 0x27, 0x28, 0x55, 0x9d, 0xa0,
212+
0xa1, 0xa3, 0xa4, 0xa7, 0xa8, 0xad, 0xba, 0xbc,
213+
0xc4, 0x06, 0x0b, 0x0c, 0x15, 0x1d, 0x3a, 0x3f,
214+
0x45, 0x51, 0xa6, 0xa7, 0xcc, 0xcd, 0xa0, 0x07,
215+
0x19, 0x1a, 0x22, 0x25, 0xc5, 0xc6, 0x04, 0x20,
216+
0x23, 0x25, 0x26, 0x28, 0x33, 0x38, 0x3a, 0x48,
217+
0x4a, 0x4c, 0x50, 0x53, 0x55, 0x56, 0x58, 0x5a,
218+
0x5c, 0x5e, 0x60, 0x63, 0x65, 0x66, 0x6b, 0x73,
219+
0x78, 0x7d, 0x7f, 0x8a, 0xa4, 0xaa, 0xaf, 0xb0,
220+
0xc0, 0xd0, 0x3f, 0x71, 0x72, 0x7b,
221221
];
222222
const NORMAL0: &'static [u8] = &[
223223
0x00, 0x20,
224224
0x5f, 0x22,
225225
0x82, 0xdf, 0x04,
226226
0x82, 0x44, 0x08,
227-
0x1b, 0x05,
228-
0x05, 0x11,
227+
0x1b, 0x04,
228+
0x06, 0x11,
229229
0x81, 0xac, 0x0e,
230-
0x3b, 0x05,
231-
0x6b, 0x35,
232-
0x1e, 0x16,
233-
0x80, 0xdf, 0x03,
230+
0x80, 0xab, 0x35,
231+
0x1e, 0x15,
232+
0x80, 0xe0, 0x03,
234233
0x19, 0x08,
235234
0x01, 0x04,
236-
0x22, 0x03,
237-
0x0a, 0x04,
235+
0x2f, 0x04,
238236
0x34, 0x04,
239237
0x07, 0x03,
240238
0x01, 0x07,
241239
0x06, 0x07,
242-
0x10, 0x0b,
240+
0x11, 0x0a,
243241
0x50, 0x0f,
244242
0x12, 0x07,
245243
0x55, 0x08,
@@ -286,7 +284,7 @@ const NORMAL0: &'static [u8] = &[
286284
0x6a, 0x06,
287285
0x0a, 0x06,
288286
0x1a, 0x06,
289-
0x58, 0x08,
287+
0x59, 0x07,
290288
0x2b, 0x05,
291289
0x46, 0x0a,
292290
0x2c, 0x04,
@@ -304,8 +302,8 @@ const NORMAL0: &'static [u8] = &[
304302
0x74, 0x08,
305303
0x3c, 0x03,
306304
0x0f, 0x03,
307-
0x3c, 0x37,
308-
0x08, 0x08,
305+
0x3c, 0x07,
306+
0x38, 0x08,
309307
0x2a, 0x06,
310308
0x82, 0xff, 0x11,
311309
0x18, 0x08,
@@ -316,28 +314,25 @@ const NORMAL0: &'static [u8] = &[
316314
0x80, 0x8c, 0x04,
317315
0x82, 0x97, 0x19,
318316
0x0b, 0x15,
319-
0x87, 0x5a, 0x03,
320-
0x16, 0x19,
321-
0x04, 0x10,
322-
0x80, 0xf4, 0x05,
317+
0x88, 0x94, 0x05,
323318
0x2f, 0x05,
324319
0x3b, 0x07,
325320
0x02, 0x0e,
326321
0x18, 0x09,
327-
0x80, 0xaa, 0x36,
322+
0x80, 0xaf, 0x31,
328323
0x74, 0x0c,
329324
0x80, 0xd6, 0x1a,
330325
0x0c, 0x05,
331326
0x80, 0xff, 0x05,
332327
0x80, 0xb6, 0x05,
333328
0x24, 0x0c,
334329
0x9b, 0xc6, 0x0a,
335-
0xd2, 0x2b, 0x15,
330+
0xd2, 0x30, 0x10,
336331
0x84, 0x8d, 0x03,
337332
0x37, 0x09,
338333
0x81, 0x5c, 0x14,
339334
0x80, 0xb8, 0x08,
340-
0x80, 0xb8, 0x3f,
335+
0x80, 0xba, 0x3d,
341336
0x35, 0x04,
342337
0x0a, 0x06,
343338
0x38, 0x08,
@@ -402,9 +397,8 @@ const NORMAL1: &'static [u8] = &[
402397
0x01, 0x40,
403398
0x38, 0x04,
404399
0x4b, 0x05,
405-
0x28, 0x04,
406-
0x03, 0x04,
407-
0x09, 0x08,
400+
0x2f, 0x04,
401+
0x0a, 0x07,
408402
0x09, 0x07,
409403
0x40, 0x20,
410404
0x27, 0x04,
@@ -417,14 +411,17 @@ const NORMAL1: &'static [u8] = &[
417411
0x49, 0x37,
418412
0x33, 0x0d,
419413
0x33, 0x07,
420-
0x06, 0x81, 0x60,
421-
0x1f, 0x81, 0x81,
414+
0x2e, 0x08,
415+
0x0a, 0x81, 0x26,
416+
0x1f, 0x80, 0x81,
417+
0x28, 0x08,
418+
0x2a, 0x80, 0xa6,
422419
0x4e, 0x04,
423420
0x1e, 0x0f,
424421
0x43, 0x0e,
425422
0x19, 0x07,
426423
0x0a, 0x06,
427-
0x44, 0x0c,
424+
0x47, 0x09,
428425
0x27, 0x09,
429426
0x75, 0x0b,
430427
0x3f, 0x41,
@@ -435,7 +432,7 @@ const NORMAL1: &'static [u8] = &[
435432
0x01, 0x05,
436433
0x10, 0x03,
437434
0x05, 0x80, 0x8b,
438-
0x5e, 0x22,
435+
0x5f, 0x21,
439436
0x48, 0x08,
440437
0x0a, 0x80, 0xa6,
441438
0x5e, 0x22,
@@ -444,9 +441,9 @@ const NORMAL1: &'static [u8] = &[
444441
0x0d, 0x13,
445442
0x38, 0x08,
446443
0x0a, 0x36,
447-
0x1a, 0x03,
448-
0x0f, 0x04,
449-
0x10, 0x81, 0x60,
444+
0x2c, 0x04,
445+
0x10, 0x80, 0xc0,
446+
0x3c, 0x64,
450447
0x53, 0x0c,
451448
0x01, 0x81, 0x00,
452449
0x48, 0x08,
@@ -457,7 +454,10 @@ const NORMAL1: &'static [u8] = &[
457454
0x47, 0x49,
458455
0x37, 0x03,
459456
0x0e, 0x08,
460-
0x0a, 0x82, 0xa6,
457+
0x0a, 0x06,
458+
0x39, 0x07,
459+
0x0a, 0x81, 0x36,
460+
0x19, 0x81, 0x07,
461461
0x83, 0x9a, 0x66,
462462
0x75, 0x0b,
463463
0x80, 0xc4, 0x8a, 0xbc,
@@ -469,12 +469,13 @@ const NORMAL1: &'static [u8] = &[
469469
0x26, 0x0a,
470470
0x46, 0x0a,
471471
0x28, 0x05,
472-
0x13, 0x83, 0x70,
472+
0x13, 0x82, 0xb0,
473+
0x5b, 0x65,
473474
0x45, 0x0b,
474475
0x2f, 0x10,
475476
0x11, 0x40,
476477
0x02, 0x1e,
477-
0x97, 0xed, 0x13,
478+
0x97, 0xf2, 0x0e,
478479
0x82, 0xf3, 0xa5, 0x0d,
479480
0x81, 0x1f, 0x51,
480481
0x81, 0x8c, 0x89, 0x04,
@@ -485,17 +486,19 @@ const NORMAL1: &'static [u8] = &[
485486
0x80, 0xf6, 0x0a,
486487
0x73, 0x08,
487488
0x6e, 0x17,
488-
0x46, 0x80, 0xba,
489+
0x46, 0x80, 0x9a,
490+
0x14, 0x0c,
489491
0x57, 0x09,
490-
0x12, 0x80, 0x8e,
492+
0x19, 0x80, 0x87,
491493
0x81, 0x47, 0x03,
492494
0x85, 0x42, 0x0f,
493495
0x15, 0x85, 0x50,
494496
0x2b, 0x87, 0xd5,
495497
0x80, 0xd7, 0x29,
496498
0x4b, 0x05,
497499
0x0a, 0x04,
498-
0x02, 0x84, 0xa0,
500+
0x02, 0x83, 0x11,
501+
0x44, 0x81, 0x4b,
499502
0x3c, 0x06,
500503
0x01, 0x04,
501504
0x55, 0x05,
@@ -514,18 +517,19 @@ const NORMAL1: &'static [u8] = &[
514517
0x06, 0x80, 0x9a,
515518
0x83, 0xd5, 0x0b,
516519
0x0d, 0x03,
517-
0x09, 0x07,
520+
0x0a, 0x06,
518521
0x74, 0x0c,
519-
0x55, 0x2b,
522+
0x59, 0x27,
520523
0x0c, 0x04,
521524
0x38, 0x08,
522525
0x0a, 0x06,
523526
0x28, 0x08,
524527
0x1e, 0x52,
525528
0x0c, 0x04,
526-
0x3d, 0x03,
527-
0x1c, 0x14,
528-
0x18, 0x28,
529-
0x01, 0x0f,
530-
0x17, 0x86, 0x19,
529+
0x67, 0x03,
530+
0x29, 0x0d,
531+
0x0a, 0x06,
532+
0x03, 0x0d,
533+
0x30, 0x60,
534+
0x0e, 0x85, 0x92,
531535
];

0 commit comments

Comments
 (0)