Skip to content

Commit 3c81d3d

Browse files
zackmdaviszackmdavis
committed
regenerate libcore/char_private.rs
char_private.rs is generated programmatically by char_private.py, using data retrieved from the Unicode Consortium's website. The motivation here was to make `is_printable` crate-visible (with `pub(crate)`), but it would seem that the Unicode data has changed slightly since char_private.rs was last generated.
1 parent 1855aff commit 3c81d3d

File tree

2 files changed

+85
-76
lines changed

2 files changed

+85
-76
lines changed

‎src/etc/char_private.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ def main():
177177
normal1 = compress_normal(normal1)
178178

179179
print("""\
180-
// Copyright 2012-2016 The Rust Project Developers. See the COPYRIGHT
180+
// Copyright 2012-2017 The Rust Project Developers. See the COPYRIGHT
181181
// file at the top-level directory of this distribution and at
182182
// http://rust-lang.org/COPYRIGHT.
183183
//
@@ -226,7 +226,7 @@ def main():
226226
current
227227
}
228228
229-
pub fn is_printable(x: char) -> bool {
229+
pub(crate) fn is_printable(x: char) -> bool {
230230
let x = x as u32;
231231
let lower = x as u16;
232232
if x < 0x10000 {

‎src/libcore/char_private.rs

+83-74
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2012-2016 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2012-2017 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -47,7 +47,7 @@ fn check(x: u16, singletonuppers: &[(u8, u8)], singletonlowers: &[u8],
4747
current
4848
}
4949

50-
pub fn is_printable(x: char) -> bool {
50+
pub(crate) fn is_printable(x: char) -> bool {
5151
let x = x as u32;
5252
let lower = x as u16;
5353
if x < 0x10000 {
@@ -64,7 +64,10 @@ pub fn is_printable(x: char) -> bool {
6464
if 0x2b81e <= x && x < 0x2b820 {
6565
return false;
6666
}
67-
if 0x2cea2 <= x && x < 0x2f800 {
67+
if 0x2cea2 <= x && x < 0x2ceb0 {
68+
return false;
69+
}
70+
if 0x2ebe1 <= x && x < 0x2f800 {
6871
return false;
6972
}
7073
if 0x2fa1e <= x && x < 0xe0100 {
@@ -83,12 +86,12 @@ const SINGLETONS0U: &'static [(u8, u8)] = &[
8386
(0x05, 8),
8487
(0x06, 3),
8588
(0x07, 4),
86-
(0x08, 7),
89+
(0x08, 8),
8790
(0x09, 16),
8891
(0x0a, 27),
89-
(0x0b, 24),
92+
(0x0b, 25),
9093
(0x0c, 22),
91-
(0x0d, 20),
94+
(0x0d, 18),
9295
(0x0e, 22),
9396
(0x0f, 4),
9497
(0x10, 3),
@@ -99,16 +102,15 @@ const SINGLETONS0U: &'static [(u8, u8)] = &[
99102
(0x18, 2),
100103
(0x19, 3),
101104
(0x1a, 7),
102-
(0x1c, 1),
105+
(0x1d, 1),
103106
(0x1f, 22),
104107
(0x20, 3),
105-
(0x23, 1),
106108
(0x2b, 5),
107109
(0x2c, 2),
108110
(0x2d, 11),
109111
(0x2e, 1),
110112
(0x30, 3),
111-
(0x31, 1),
113+
(0x31, 3),
112114
(0x32, 2),
113115
(0xa7, 1),
114116
(0xa8, 2),
@@ -125,19 +127,19 @@ const SINGLETONS0L: &'static [u8] = &[
125127
0xad, 0x78, 0x79, 0x8b, 0x8d, 0xa2, 0x30, 0x57,
126128
0x58, 0x60, 0x88, 0x8b, 0x8c, 0x90, 0x1c, 0x1d,
127129
0xdd, 0x0e, 0x0f, 0x4b, 0x4c, 0x2e, 0x2f, 0x3f,
128-
0x5c, 0x5d, 0xb5, 0xe2, 0x84, 0x8d, 0x8e, 0x91,
129-
0x92, 0xa9, 0xb1, 0xba, 0xbb, 0xc5, 0xc6, 0xc9,
130-
0xca, 0xde, 0xe4, 0xe5, 0x04, 0x11, 0x12, 0x29,
131-
0x31, 0x34, 0x37, 0x3a, 0x3b, 0x3d, 0x49, 0x4a,
132-
0x5d, 0x84, 0x8e, 0x92, 0xa9, 0xb1, 0xb4, 0xba,
133-
0xbb, 0xc6, 0xca, 0xce, 0xcf, 0xe4, 0xe5, 0x04,
134-
0x0d, 0x0e, 0x11, 0x12, 0x29, 0x31, 0x34, 0x3a,
135-
0x3b, 0x45, 0x46, 0x49, 0x4a, 0x5e, 0x64, 0x65,
136-
0x84, 0x91, 0x9b, 0x9d, 0xc9, 0xce, 0xcf, 0x04,
137-
0x0d, 0x11, 0x29, 0x45, 0x49, 0x57, 0x64, 0x65,
138-
0x84, 0x8d, 0x91, 0xa9, 0xb4, 0xba, 0xbb, 0xc5,
139-
0xc9, 0xdf, 0xe4, 0xe5, 0xf0, 0x04, 0x0d, 0x11,
140-
0x3b, 0x3c, 0x45, 0x49, 0x64, 0x65, 0x80, 0x81,
130+
0x5c, 0x5d, 0x5f, 0xb5, 0xe2, 0x84, 0x8d, 0x8e,
131+
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,
141+
0xbb, 0xc5, 0xc9, 0xdf, 0xe4, 0xe5, 0xf0, 0x04,
142+
0x0d, 0x11, 0x45, 0x49, 0x64, 0x65, 0x80, 0x81,
141143
0x84, 0xb2, 0xbc, 0xbe, 0xbf, 0xd5, 0xd7, 0xf0,
142144
0xf1, 0x83, 0x85, 0x86, 0x89, 0x8b, 0x8c, 0x98,
143145
0xa0, 0xa4, 0xa6, 0xa8, 0xa9, 0xac, 0xba, 0xbe,
@@ -148,18 +150,18 @@ const SINGLETONS0L: &'static [u8] = &[
148150
0x11, 0x16, 0x17, 0x5b, 0x5c, 0xf6, 0xf7, 0xfe,
149151
0xff, 0x80, 0x0d, 0x6d, 0x71, 0xde, 0xdf, 0x0e,
150152
0x0f, 0x1f, 0x6e, 0x6f, 0x1c, 0x1d, 0x5f, 0x7d,
151-
0x7e, 0xae, 0xaf, 0xf7, 0x16, 0x17, 0x1e, 0x1f,
153+
0x7e, 0xae, 0xaf, 0xfa, 0x16, 0x17, 0x1e, 0x1f,
152154
0x46, 0x47, 0x4e, 0x4f, 0x58, 0x5a, 0x5c, 0x5e,
153155
0x7e, 0x7f, 0xb5, 0xc5, 0xd4, 0xd5, 0xdc, 0xf0,
154-
0xf1, 0xf5, 0x72, 0x73, 0x8f, 0xff, 0x74, 0x75,
155-
0x96, 0x97, 0xc9, 0x2f, 0x5f, 0x26, 0x2e, 0x2f,
156-
0xa7, 0xaf, 0xb7, 0xbf, 0xc7, 0xcf, 0xd7, 0xdf,
157-
0x9a, 0x40, 0x97, 0x98, 0x8f, 0x1f, 0xff, 0xaf,
158-
0xfe, 0xff, 0xce, 0xff, 0x4e, 0x4f, 0x5a, 0x5b,
159-
0x07, 0x08, 0x0f, 0x10, 0x27, 0x2f, 0xee, 0xef,
160-
0x6e, 0x6f, 0x37, 0x3d, 0x3f, 0x42, 0x45, 0x90,
161-
0x91, 0xfe, 0xff, 0x53, 0x67, 0x75, 0xc8, 0xc9,
162-
0xd0, 0xd1, 0xd8, 0xd9, 0xe7, 0xfe, 0xff,
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,
163165
];
164166
const SINGLETONS1U: &'static [(u8, u8)] = &[
165167
(0x00, 6),
@@ -176,7 +178,9 @@ const SINGLETONS1U: &'static [(u8, u8)] = &[
176178
(0x13, 18),
177179
(0x14, 2),
178180
(0x15, 2),
181+
(0x1a, 3),
179182
(0x1c, 5),
183+
(0x1d, 4),
180184
(0x24, 1),
181185
(0x6a, 3),
182186
(0x6b, 2),
@@ -192,7 +196,7 @@ const SINGLETONS1U: &'static [(u8, u8)] = &[
192196
(0xee, 32),
193197
(0xf0, 4),
194198
(0xf1, 1),
195-
(0xf9, 4),
199+
(0xf9, 1),
196200
];
197201
const SINGLETONS1L: &'static [u8] = &[
198202
0x0c, 0x27, 0x3b, 0x3e, 0x4e, 0x4f, 0x8f, 0x9e,
@@ -202,18 +206,18 @@ const SINGLETONS1L: &'static [u8] = &[
202206
0x89, 0x8e, 0x9e, 0x04, 0x0d, 0x0e, 0x11, 0x12,
203207
0x29, 0x31, 0x34, 0x3a, 0x3b, 0x45, 0x46, 0x49,
204208
0x4a, 0x4e, 0x4f, 0x64, 0x65, 0x5a, 0x5c, 0xb6,
205-
0xb7, 0x09, 0x37, 0x90, 0x91, 0xa8, 0x6f, 0x5f,
206-
0xee, 0xef, 0x5a, 0x62, 0x9a, 0x9b, 0x27, 0x28,
207-
0x55, 0x9d, 0xa0, 0xa1, 0xa3, 0xa4, 0xa7, 0xa8,
208-
0xad, 0xba, 0xbc, 0xc4, 0x06, 0x0b, 0x0c, 0x15,
209-
0x1d, 0x3a, 0x3f, 0x45, 0x51, 0xa6, 0xa7, 0xcc,
210-
0xcd, 0xa0, 0x07, 0x19, 0x1a, 0x22, 0x25, 0xc5,
211-
0xc6, 0x04, 0x20, 0x23, 0x25, 0x26, 0x28, 0x33,
212-
0x38, 0x3a, 0x48, 0x4a, 0x4c, 0x50, 0x53, 0x55,
213-
0x56, 0x58, 0x5a, 0x5c, 0x5e, 0x60, 0x63, 0x65,
214-
0x66, 0x6b, 0x73, 0x78, 0x7d, 0x7f, 0x8a, 0xa4,
215-
0xaa, 0xaf, 0xb0, 0xc0, 0xd0, 0x2f, 0x1f, 0x31,
216-
0x32, 0x3f,
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,
217221
];
218222
const NORMAL0: &'static [u8] = &[
219223
0x00, 0x20,
@@ -224,12 +228,12 @@ const NORMAL0: &'static [u8] = &[
224228
0x05, 0x11,
225229
0x81, 0xac, 0x0e,
226230
0x3b, 0x05,
227-
0x5f, 0x41,
231+
0x6b, 0x35,
228232
0x1e, 0x16,
229233
0x80, 0xdf, 0x03,
230234
0x19, 0x08,
231235
0x01, 0x04,
232-
0x20, 0x05,
236+
0x22, 0x03,
233237
0x0a, 0x04,
234238
0x34, 0x04,
235239
0x07, 0x03,
@@ -238,8 +242,7 @@ const NORMAL0: &'static [u8] = &[
238242
0x10, 0x0b,
239243
0x50, 0x0f,
240244
0x12, 0x07,
241-
0x01, 0x07,
242-
0x4d, 0x08,
245+
0x55, 0x08,
243246
0x02, 0x04,
244247
0x1c, 0x0a,
245248
0x09, 0x03,
@@ -258,8 +261,8 @@ const NORMAL0: &'static [u8] = &[
258261
0x10, 0x08,
259262
0x56, 0x07,
260263
0x02, 0x07,
261-
0x15, 0x0e,
262-
0x4f, 0x04,
264+
0x15, 0x0d,
265+
0x50, 0x04,
263266
0x43, 0x03,
264267
0x2d, 0x03,
265268
0x01, 0x04,
@@ -304,34 +307,32 @@ const NORMAL0: &'static [u8] = &[
304307
0x3c, 0x37,
305308
0x08, 0x08,
306309
0x2a, 0x06,
307-
0x80, 0xf6, 0x05,
308-
0x82, 0x04, 0x11,
310+
0x82, 0xff, 0x11,
309311
0x18, 0x08,
310312
0x2f, 0x11,
311313
0x2d, 0x03,
312-
0x1f, 0x11,
314+
0x20, 0x10,
313315
0x21, 0x0f,
314316
0x80, 0x8c, 0x04,
315317
0x82, 0x97, 0x19,
316318
0x0b, 0x15,
317319
0x87, 0x5a, 0x03,
318-
0x15, 0x1a,
320+
0x16, 0x19,
319321
0x04, 0x10,
320322
0x80, 0xf4, 0x05,
321323
0x2f, 0x05,
322324
0x3b, 0x07,
323325
0x02, 0x0e,
324326
0x18, 0x09,
325-
0x80, 0xa5, 0x3b,
327+
0x80, 0xaa, 0x36,
326328
0x74, 0x0c,
327329
0x80, 0xd6, 0x1a,
328330
0x0c, 0x05,
329331
0x80, 0xff, 0x05,
330-
0x29, 0x03,
331-
0x80, 0x8a, 0x05,
332+
0x80, 0xb6, 0x05,
332333
0x24, 0x0c,
333334
0x9b, 0xc6, 0x0a,
334-
0xd2, 0x16, 0x2a,
335+
0xd2, 0x2b, 0x15,
335336
0x84, 0x8d, 0x03,
336337
0x37, 0x09,
337338
0x81, 0x5c, 0x14,
@@ -378,8 +379,8 @@ const NORMAL1: &'static [u8] = &[
378379
0x1d, 0x03,
379380
0x31, 0x0f,
380381
0x1c, 0x04,
381-
0x24, 0x0c,
382-
0x1b, 0x05,
382+
0x24, 0x09,
383+
0x1e, 0x05,
383384
0x2b, 0x05,
384385
0x44, 0x04,
385386
0x0e, 0x2a,
@@ -447,11 +448,16 @@ const NORMAL1: &'static [u8] = &[
447448
0x0f, 0x04,
448449
0x10, 0x81, 0x60,
449450
0x53, 0x0c,
450-
0x01, 0x81, 0xc0,
451+
0x01, 0x81, 0x00,
452+
0x48, 0x08,
453+
0x53, 0x1d,
451454
0x39, 0x81, 0x07,
452455
0x46, 0x0a,
453456
0x1d, 0x03,
454-
0x47, 0x83, 0x49,
457+
0x47, 0x49,
458+
0x37, 0x03,
459+
0x0e, 0x08,
460+
0x0a, 0x82, 0xa6,
455461
0x83, 0x9a, 0x66,
456462
0x75, 0x0b,
457463
0x80, 0xc4, 0x8a, 0xbc,
@@ -467,10 +473,11 @@ const NORMAL1: &'static [u8] = &[
467473
0x45, 0x0b,
468474
0x2f, 0x10,
469475
0x11, 0x40,
470-
0x01, 0x1f,
476+
0x02, 0x1e,
471477
0x97, 0xed, 0x13,
472478
0x82, 0xf3, 0xa5, 0x0d,
473-
0x02, 0x8b, 0xfe,
479+
0x81, 0x1f, 0x51,
480+
0x81, 0x8c, 0x89, 0x04,
474481
0x6b, 0x05,
475482
0x0d, 0x03,
476483
0x09, 0x07,
@@ -503,20 +510,22 @@ const NORMAL1: &'static [u8] = &[
503510
0x1d, 0x0d,
504511
0x2c, 0x04,
505512
0x09, 0x07,
506-
0x02, 0x80, 0xae,
507-
0x83, 0xd3, 0x0d,
513+
0x02, 0x0e,
514+
0x06, 0x80, 0x9a,
515+
0x83, 0xd5, 0x0b,
508516
0x0d, 0x03,
509-
0x07, 0x09,
517+
0x09, 0x07,
510518
0x74, 0x0c,
511519
0x55, 0x2b,
512520
0x0c, 0x04,
513521
0x38, 0x08,
514522
0x0a, 0x06,
515523
0x28, 0x08,
516-
0x1e, 0x62,
517-
0x18, 0x08,
518-
0x1c, 0x04,
519-
0x0f, 0x21,
520-
0x12, 0x2e,
521-
0x01, 0x86, 0x3f,
524+
0x1e, 0x52,
525+
0x0c, 0x04,
526+
0x3d, 0x03,
527+
0x1c, 0x14,
528+
0x18, 0x28,
529+
0x01, 0x0f,
530+
0x17, 0x86, 0x19,
522531
];

0 commit comments

Comments
 (0)