berkus
/
bincode
mirror of https://git.sr.ht/~stygianentity/bincode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove use of the unicode library

This commit is contained in:
Ty Overby 2015-04-12 21:12:24 -07:00
parent cb3c84acd6
commit 31572a2da5
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib.rs
View File

@ -7,7 +7,6 @@
extern crate rustc_serialize; extern crate rustc_serialize;
extern crate byteorder; extern crate byteorder;
extern crate unicode;
use rustc_serialize::{Encodable, Decodable}; use rustc_serialize::{Encodable, Decodable};

28
src/reader.rs
View File

@ -8,9 +8,6 @@ use rustc_serialize::Decoder;
use byteorder::{BigEndian, ReadBytesExt}; use byteorder::{BigEndian, ReadBytesExt};
use byteorder::Error as ByteOrderError; use byteorder::Error as ByteOrderError;
use unicode;
use super::SizeLimit; use super::SizeLimit;
#[derive(Eq, PartialEq, Clone, Debug)] #[derive(Eq, PartialEq, Clone, Debug)]
@ -210,7 +207,7 @@ impl<'a, R: Read> Decoder for DecoderReader<'a, R> {
let _ = try!(self.reader.read(&mut buf[..])); let _ = try!(self.reader.read(&mut buf[..]));
let first_byte = buf[0]; let first_byte = buf[0];
let width = unicode::str::utf8_char_width(first_byte); let width = utf8_char_width(first_byte);
if width == 1 { return Ok(first_byte as char) } if width == 1 { return Ok(first_byte as char) }
if width == 0 { return Err(error)} if width == 0 { return Err(error)}
@ -351,3 +348,26 @@ impl<'a, R: Read> Decoder for DecoderReader<'a, R> {
}) })
} }
} }
static UTF8_CHAR_WIDTH: [u8; 256] = [
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x1F
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x3F
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x5F
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x7F
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,0,0,0,0,0,0,0, // 0x9F
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,0,0,0,0,0,0,0, // 0xBF
0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, // 0xDF
3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, // 0xEF
4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0, // 0xFF
];
fn utf8_char_width(b: u8) -> usize {
UTF8_CHAR_WIDTH[b as usize] as usize
}