diff options
| author | bors <bors@rust-lang.org> | 2018-05-31 20:44:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-05-31 20:44:04 +0000 |
| commit | 1ffb321477d85fb3c95a0be2a0cd89c04dff0d8d (patch) | |
| tree | 2bf9c53f13bfbcc7549f2e2a2e2ab7ca92ca59e3 /src/libcore | |
| parent | 5342d40c1f49ef82ebff4c30fdad9f3b6fd339c1 (diff) | |
| parent | 7552c2ea6485a173a3c8241afc82e8fefe061885 (diff) | |
| download | rust-1ffb321477d85fb3c95a0be2a0cd89c04dff0d8d.tar.gz rust-1ffb321477d85fb3c95a0be2a0cd89c04dff0d8d.zip | |
Auto merge of #51257 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 7 pull requests Successful merges: - #49546 (Stabilize short error format) - #51123 (Update build instructions) - #51146 (typeck: Do not pass the field check on field error) - #51193 (Fixes some style issues in rustdoc "implementations on Foreign types") - #51213 (fs: copy: Use File::set_permissions instead of fs::set_permissions) - #51227 (mod.rs isn't beautiful) - #51240 (Two minor parsing tweaks) Failed merges:
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/char/mod.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libcore/char/mod.rs b/src/libcore/char/mod.rs index 4f6c302247d..59bcf1383f4 100644 --- a/src/libcore/char/mod.rs +++ b/src/libcore/char/mod.rs @@ -60,10 +60,10 @@ use fmt::{self, Write}; use iter::FusedIterator; // UTF-8 ranges and tags for encoding characters -const TAG_CONT: u8 = 0b1000_0000; -const TAG_TWO_B: u8 = 0b1100_0000; -const TAG_THREE_B: u8 = 0b1110_0000; -const TAG_FOUR_B: u8 = 0b1111_0000; +const TAG_CONT: u8 = 0b1000_0000; +const TAG_TWO_B: u8 = 0b1100_0000; +const TAG_THREE_B: u8 = 0b1110_0000; +const TAG_FOUR_B: u8 = 0b1111_0000; const MAX_ONE_B: u32 = 0x80; const MAX_TWO_B: u32 = 0x800; const MAX_THREE_B: u32 = 0x10000; |