Skip to content

Commit 9e66720

Browse files
3Hren3Hren
committed
API: major renaming to better fit Rust convention.
This is the breaking change. Also this commit closes #28.
1 parent 45f9ca2 commit 9e66720

9 files changed

Lines changed: 94 additions & 99 deletions

File tree

‎src/decode.rs‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ pub fn read_pfix<R>(rd: &mut R) -> Result<u8, FixedValueReadError>
347347
where R: Read
348348
{
349349
match try!(read_marker(rd)) {
350-
Marker::PositiveFixnum(val) => Ok(val),
350+
Marker::FixPos(val) => Ok(val),
351351
marker => Err(FixedValueReadError::TypeMismatch(marker)),
352352
}
353353
}
@@ -374,7 +374,7 @@ pub fn read_nfix<R>(rd: &mut R) -> Result<i8, FixedValueReadError>
374374
where R: Read
375375
{
376376
match try!(read_marker(rd)) {
377-
Marker::NegativeFixnum(val) => Ok(val),
377+
Marker::FixNeg(val) => Ok(val),
378378
marker => Err(FixedValueReadError::TypeMismatch(marker)),
379379
}
380380
}
@@ -659,7 +659,7 @@ pub fn read_u8_loosely<R>(rd: &mut R) -> Result<u8, ValueReadError>
659659
where R: Read
660660
{
661661
match try!(read_marker(rd)) {
662-
Marker::PositiveFixnum(val) => Ok(val),
662+
Marker::FixPos(val) => Ok(val),
663663
Marker::U8 => Ok(try!(read_numeric_data(rd))),
664664
marker => Err(ValueReadError::TypeMismatch(marker)),
665665
}
@@ -689,7 +689,7 @@ pub fn read_u16_loosely<R>(rd: &mut R) -> Result<u16, ValueReadError>
689689
where R: Read
690690
{
691691
match try!(read_marker(rd)) {
692-
Marker::PositiveFixnum(val) => Ok(val as u16),
692+
Marker::FixPos(val) => Ok(val as u16),
693693
Marker::U8 => Ok(try!(read_numeric_data::<R, u8>(rd)) as u16),
694694
Marker::U16 => Ok(try!(read_numeric_data(rd))),
695695
marker => Err(ValueReadError::TypeMismatch(marker)),
@@ -720,7 +720,7 @@ pub fn read_u32_loosely<R>(rd: &mut R) -> Result<u32, ValueReadError>
720720
where R: Read
721721
{
722722
match try!(read_marker(rd)) {
723-
Marker::PositiveFixnum(val) => Ok(val as u32),
723+
Marker::FixPos(val) => Ok(val as u32),
724724
Marker::U8 => Ok(try!(read_numeric_data::<R, u8>(rd)) as u32),
725725
Marker::U16 => Ok(try!(read_numeric_data::<R, u16>(rd)) as u32),
726726
Marker::U32 => Ok(try!(read_numeric_data(rd))),
@@ -755,7 +755,7 @@ pub fn read_u64_loosely<R>(rd: &mut R) -> Result<u64, ValueReadError>
755755
where R: Read
756756
{
757757
match try!(read_marker(rd)) {
758-
Marker::PositiveFixnum(val) => Ok(val as u64),
758+
Marker::FixPos(val) => Ok(val as u64),
759759
Marker::U8 => Ok(try!(read_numeric_data::<R, u8>(rd)) as u64),
760760
Marker::U16 => Ok(try!(read_numeric_data::<R, u16>(rd)) as u64),
761761
Marker::U32 => Ok(try!(read_numeric_data::<R, u32>(rd)) as u64),
@@ -788,7 +788,7 @@ pub fn read_i8_loosely<R>(rd: &mut R) -> Result<i8, ValueReadError>
788788
where R: Read
789789
{
790790
match try!(read_marker(rd)) {
791-
Marker::NegativeFixnum(val) => Ok(val),
791+
Marker::FixNeg(val) => Ok(val),
792792
Marker::I8 => Ok(try!(read_numeric_data(rd))),
793793
marker => Err(ValueReadError::TypeMismatch(marker)),
794794
}
@@ -818,7 +818,7 @@ pub fn read_i16_loosely<R>(rd: &mut R) -> Result<i16, ValueReadError>
818818
where R: Read
819819
{
820820
match try!(read_marker(rd)) {
821-
Marker::NegativeFixnum(val) => Ok(val as i16),
821+
Marker::FixNeg(val) => Ok(val as i16),
822822
Marker::I8 => Ok(try!(read_numeric_data::<R, i8>(rd)) as i16),
823823
Marker::I16 => Ok(try!(read_numeric_data(rd))),
824824
marker => Err(ValueReadError::TypeMismatch(marker)),
@@ -849,7 +849,7 @@ pub fn read_i32_loosely<R>(rd: &mut R) -> Result<i32, ValueReadError>
849849
where R: Read
850850
{
851851
match try!(read_marker(rd)) {
852-
Marker::NegativeFixnum(val) => Ok(val as i32),
852+
Marker::FixNeg(val) => Ok(val as i32),
853853
Marker::I8 => Ok(try!(read_numeric_data::<R, i8>(rd)) as i32),
854854
Marker::I16 => Ok(try!(read_numeric_data::<R, i16>(rd)) as i32),
855855
Marker::I32 => Ok(try!(read_numeric_data(rd))),
@@ -884,7 +884,7 @@ pub fn read_i64_loosely<R>(rd: &mut R) -> Result<i64, ValueReadError>
884884
where R: Read
885885
{
886886
match try!(read_marker(rd)) {
887-
Marker::NegativeFixnum(val) => Ok(val as i64),
887+
Marker::FixNeg(val) => Ok(val as i64),
888888
Marker::I8 => Ok(try!(read_numeric_data::<R, i8>(rd)) as i64),
889889
Marker::I16 => Ok(try!(read_numeric_data::<R, i16>(rd)) as i64),
890890
Marker::I32 => Ok(try!(read_numeric_data::<R, i32>(rd)) as i64),
@@ -904,8 +904,8 @@ macro_rules! make_read_int_fit {
904904
let marker = try!(read_marker(rd));
905905
let val = match marker {
906906
// TODO: From trait.
907-
Marker::PositiveFixnum(val) => Ok(Integer::U64(val as u64)),
908-
Marker::NegativeFixnum(val) => Ok(Integer::I64(val as i64)),
907+
Marker::FixPos(val) => Ok(Integer::U64(val as u64)),
908+
Marker::FixNeg(val) => Ok(Integer::I64(val as i64)),
909909
Marker::U8 => Ok(Integer::U64(try!(read_numeric_data::<R, u8>(rd)) as u64)),
910910
Marker::I8 => Ok(Integer::I64(try!(read_numeric_data::<R, i8>(rd)) as i64)),
911911
Marker::U16 => Ok(Integer::U64(try!(read_numeric_data::<R, u16>(rd)) as u64)),
@@ -1022,7 +1022,7 @@ pub fn read_str_len<R>(rd: &mut R) -> Result<u32, ValueReadError>
10221022
where R: Read
10231023
{
10241024
match try!(read_marker(rd)) {
1025-
Marker::FixedString(size) => Ok(size as u32),
1025+
Marker::FixStr(size) => Ok(size as u32),
10261026
Marker::Str8 => Ok(try!(read_numeric_data::<R, u8>(rd)) as u32),
10271027
Marker::Str16 => Ok(try!(read_numeric_data::<R, u16>(rd)) as u32),
10281028
Marker::Str32 => Ok(try!(read_numeric_data(rd))),
@@ -1124,7 +1124,7 @@ pub fn read_array_size<R>(rd: &mut R) -> Result<u32, ValueReadError>
11241124
where R: Read
11251125
{
11261126
match try!(read_marker(rd)) {
1127-
Marker::FixedArray(size) => Ok(size as u32),
1127+
Marker::FixArray(size) => Ok(size as u32),
11281128
Marker::Array16 => Ok(try!(read_numeric_data::<R, u16>(rd)) as u32),
11291129
Marker::Array32 => Ok(try!(read_numeric_data(rd))),
11301130
marker => Err(ValueReadError::TypeMismatch(marker))
@@ -1146,7 +1146,7 @@ pub fn read_map_size<R>(rd: &mut R) -> Result<u32, ValueReadError>
11461146
where R: Read
11471147
{
11481148
match try!(read_marker(rd)) {
1149-
Marker::FixedMap(size) => Ok(size as u32),
1149+
Marker::FixMap(size) => Ok(size as u32),
11501150
Marker::Map16 => Ok(try!(read_numeric_data::<R, u16>(rd)) as u32),
11511151
Marker::Map32 => Ok(try!(read_numeric_data(rd))),
11521152
marker => Err(ValueReadError::TypeMismatch(marker))
@@ -1566,8 +1566,8 @@ pub fn read_value<R>(rd: &mut R) -> Result<Value, Error>
15661566
Marker::Null => Value::Nil,
15671567
Marker::True => Value::Boolean(true),
15681568
Marker::False => Value::Boolean(false),
1569-
Marker::PositiveFixnum(val) => Value::Integer(Integer::U64(val as u64)),
1570-
Marker::NegativeFixnum(val) => Value::Integer(Integer::I64(val as i64)),
1569+
Marker::FixPos(val) => Value::Integer(Integer::U64(val as u64)),
1570+
Marker::FixNeg(val) => Value::Integer(Integer::I64(val as i64)),
15711571
Marker::U8 => Value::Integer(Integer::U64(try!(read_numeric_data::<R, u8>(rd)) as u64)),
15721572
Marker::U16 => Value::Integer(Integer::U64(try!(read_numeric_data::<R, u16>(rd)) as u64)),
15731573
Marker::U32 => Value::Integer(Integer::U64(try!(read_numeric_data::<R, u32>(rd)) as u64)),
@@ -1578,7 +1578,7 @@ pub fn read_value<R>(rd: &mut R) -> Result<Value, Error>
15781578
Marker::I64 => Value::Integer(Integer::I64(try!(read_numeric_data(rd)))),
15791579
Marker::F32 => Value::Float(Float::F32(try!(read_numeric_data(rd)))),
15801580
Marker::F64 => Value::Float(Float::F64(try!(read_numeric_data(rd)))),
1581-
Marker::FixedString(len) => {
1581+
Marker::FixStr(len) => {
15821582
let len = len as u32;
15831583
let res = try!(read_str(rd, len));
15841584
Value::String(res)
@@ -1598,7 +1598,7 @@ pub fn read_value<R>(rd: &mut R) -> Result<Value, Error>
15981598
let res = try!(read_str(rd, len));
15991599
Value::String(res)
16001600
}
1601-
Marker::FixedArray(len) => {
1601+
Marker::FixArray(len) => {
16021602
let len = len as usize;
16031603
let vec = try!(read_array(rd, len));
16041604
Value::Array(vec)
@@ -1613,7 +1613,7 @@ pub fn read_value<R>(rd: &mut R) -> Result<Value, Error>
16131613
let vec = try!(read_array(rd, len));
16141614
Value::Array(vec)
16151615
}
1616-
Marker::FixedMap(len) => {
1616+
Marker::FixMap(len) => {
16171617
let len = len as usize;
16181618
let map = try!(read_map(rd, len));
16191619
Value::Map(map)
@@ -2088,12 +2088,12 @@ impl serde::de::Error for Error {
20882088
fn type_mismatch(ty: serde::de::Type) -> Error {
20892089
match ty {
20902090
serde::de::Type::Bool => Error::TypeMismatch(Marker::True),
2091-
serde::de::Type::Usize => Error::TypeMismatch(Marker::PositiveFixnum(0)),
2091+
serde::de::Type::Usize => Error::TypeMismatch(Marker::FixPos(0)),
20922092
serde::de::Type::U8 => Error::TypeMismatch(Marker::U8),
20932093
serde::de::Type::U16 => Error::TypeMismatch(Marker::U16),
20942094
serde::de::Type::U32 => Error::TypeMismatch(Marker::U32),
20952095
serde::de::Type::U64 => Error::TypeMismatch(Marker::U64),
2096-
serde::de::Type::Isize => Error::TypeMismatch(Marker::NegativeFixnum(0)),
2096+
serde::de::Type::Isize => Error::TypeMismatch(Marker::FixNeg(0)),
20972097
serde::de::Type::I8 => Error::TypeMismatch(Marker::I8),
20982098
serde::de::Type::I16 => Error::TypeMismatch(Marker::I16),
20992099
serde::de::Type::I32 => Error::TypeMismatch(Marker::I32),
@@ -2257,8 +2257,8 @@ impl<R: Read> serde::Deserializer for Deserializer<R> {
22572257
Marker::Null => visitor.visit_unit(),
22582258
Marker::True => visitor.visit_bool(true),
22592259
Marker::False => visitor.visit_bool(false),
2260-
Marker::PositiveFixnum(val) => visitor.visit_u8(val),
2261-
Marker::NegativeFixnum(val) => visitor.visit_i8(val),
2260+
Marker::FixPos(val) => visitor.visit_u8(val),
2261+
Marker::FixNeg(val) => visitor.visit_i8(val),
22622262
Marker::U8 => visitor.visit_u8(try!(read_numeric_data(&mut self.rd))),
22632263
Marker::U16 => visitor.visit_u16(try!(read_numeric_data(&mut self.rd))),
22642264
Marker::U32 => visitor.visit_u32(try!(read_numeric_data(&mut self.rd))),
@@ -2269,7 +2269,7 @@ impl<R: Read> serde::Deserializer for Deserializer<R> {
22692269
Marker::I64 => visitor.visit_i64(try!(read_numeric_data(&mut self.rd))),
22702270
Marker::F32 => visitor.visit_f32(try!(read_numeric_data(&mut self.rd))),
22712271
Marker::F64 => visitor.visit_f64(try!(read_numeric_data(&mut self.rd))),
2272-
Marker::FixedString(len) => self.read_str(len as u32, visitor),
2272+
Marker::FixStr(len) => self.read_str(len as u32, visitor),
22732273
Marker::Str8 => {
22742274
let len: u8 = try!(read_numeric_data(&mut self.rd));
22752275
self.read_str(len as u32, visitor)
@@ -2282,7 +2282,7 @@ impl<R: Read> serde::Deserializer for Deserializer<R> {
22822282
let len: u32 = try!(read_numeric_data(&mut self.rd));
22832283
self.read_str(len, visitor)
22842284
}
2285-
Marker::FixedArray(len) => {
2285+
Marker::FixArray(len) => {
22862286
self.read_array(len as u32, visitor)
22872287
}
22882288
Marker::Array16 => {
@@ -2293,7 +2293,7 @@ impl<R: Read> serde::Deserializer for Deserializer<R> {
22932293
let len: u32 = try!(read_numeric_data(&mut self.rd));
22942294
self.read_array(len, visitor)
22952295
}
2296-
Marker::FixedMap(len) => {
2296+
Marker::FixMap(len) => {
22972297
self.read_map(len as u32, visitor)
22982298
}
22992299
Marker::Map16 => {

‎src/decode/value_ref.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ pub fn read_value_ref<'a, R>(rd: &mut R) -> Result<ValueRef<'a>, Error<'a>>
330330
Marker::Null => ValueRef::Nil,
331331
Marker::True => ValueRef::Boolean(true),
332332
Marker::False => ValueRef::Boolean(false),
333-
Marker::PositiveFixnum(val) => {
333+
Marker::FixPos(val) => {
334334
ValueRef::Integer(Integer::U64(val as u64))
335335
}
336336
Marker::U8 => {
@@ -349,7 +349,7 @@ pub fn read_value_ref<'a, R>(rd: &mut R) -> Result<ValueRef<'a>, Error<'a>>
349349
let val: u64 = try!(read_num(rd));
350350
ValueRef::Integer(Integer::U64(val))
351351
}
352-
Marker::NegativeFixnum(val) => {
352+
Marker::FixNeg(val) => {
353353
ValueRef::Integer(Integer::I64(val as i64))
354354
}
355355
Marker::I8 => {
@@ -376,7 +376,7 @@ pub fn read_value_ref<'a, R>(rd: &mut R) -> Result<ValueRef<'a>, Error<'a>>
376376
let val: f64 = try!(read_num(rd));
377377
ValueRef::Float(Float::F64(val))
378378
}
379-
Marker::FixedString(len) => {
379+
Marker::FixStr(len) => {
380380
try!(read_str_value(rd, len))
381381
}
382382
Marker::Str8 => {
@@ -403,7 +403,7 @@ pub fn read_value_ref<'a, R>(rd: &mut R) -> Result<ValueRef<'a>, Error<'a>>
403403
let len: u32 = try!(read_len(rd).map_err(|err| Error::InvalidLengthRead(err)));
404404
try!(read_bin_value(rd, len))
405405
}
406-
Marker::FixedArray(len) => {
406+
Marker::FixArray(len) => {
407407
try!(read_array_value(rd, len))
408408
}
409409
Marker::Array16 => {
@@ -414,7 +414,7 @@ pub fn read_value_ref<'a, R>(rd: &mut R) -> Result<ValueRef<'a>, Error<'a>>
414414
let len: u32 = try!(read_len(&mut rd).map_err(|err| Error::InvalidLengthRead(err)));
415415
try!(read_array_value(rd, len))
416416
}
417-
Marker::FixedMap(len) => {
417+
Marker::FixMap(len) => {
418418
try!(read_map_value(rd, len))
419419
}
420420
Marker::Map16 => {

‎src/encode.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ pub fn write_pfix<W>(wr: &mut W, val: u8) -> Result<(), FixedValueWriteError>
200200
{
201201
assert!(val < 128);
202202

203-
write_fixval(wr, Marker::PositiveFixnum(val))
203+
write_fixval(wr, Marker::FixPos(val))
204204
}
205205

206206
/// Encodes and attempts to write a negative small integer value as a negative fixnum into the
@@ -228,7 +228,7 @@ pub fn write_nfix<W>(wr: &mut W, val: i8) -> Result<(), FixedValueWriteError>
228228
{
229229
assert!(-32 <= val && val < 0);
230230

231-
write_fixval(wr, Marker::NegativeFixnum(val))
231+
write_fixval(wr, Marker::FixNeg(val))
232232
}
233233

234234
// TODO: Eliminate this or not?
@@ -481,7 +481,7 @@ pub fn write_uint<W>(wr: &mut W, val: u64) -> Result<Marker, ValueWriteError>
481481
where W: Write
482482
{
483483
if val < 128 {
484-
let marker = Marker::PositiveFixnum(val as u8);
484+
let marker = Marker::FixPos(val as u8);
485485

486486
try!(write_fixval(wr, marker));
487487

@@ -518,7 +518,7 @@ pub fn write_sint<W>(wr: &mut W, val: i64) -> Result<Marker, ValueWriteError>
518518
where W: Write
519519
{
520520
if -32 <= val && val <= 0 {
521-
let marker = Marker::NegativeFixnum(val as i8);
521+
let marker = Marker::FixNeg(val as i8);
522522

523523
try!(write_fixval(wr, marker));
524524

@@ -540,7 +540,7 @@ fn write_sint_eff<W>(wr: &mut W, val: i64) -> Result<Marker, ValueWriteError>
540540
{
541541
match val {
542542
val if -32 <= val && val < 0 => {
543-
let marker = Marker::NegativeFixnum(val as i8);
543+
let marker = Marker::FixNeg(val as i8);
544544
try!(write_fixval(wr, marker));
545545

546546
Ok(marker)
@@ -558,7 +558,7 @@ fn write_sint_eff<W>(wr: &mut W, val: i64) -> Result<Marker, ValueWriteError>
558558
write_i64(wr, val).and(Ok(Marker::I64))
559559
}
560560
val if 0 <= val && val < 128 => {
561-
let marker = Marker::PositiveFixnum(val as u8);
561+
let marker = Marker::FixPos(val as u8);
562562
try!(write_fixval(wr, marker));
563563

564564
Ok(marker)
@@ -622,7 +622,7 @@ pub fn write_str_len<W>(wr: &mut W, len: u32) -> Result<Marker, ValueWriteError>
622622
where W: Write
623623
{
624624
if len < 32 {
625-
let marker = Marker::FixedString(len as u8);
625+
let marker = Marker::FixStr(len as u8);
626626
try!(write_fixval(wr, marker));
627627
Ok(marker)
628628
} else if len < 256 {
@@ -701,7 +701,7 @@ pub fn write_array_len<W>(wr: &mut W, len: u32) -> Result<Marker, ValueWriteErro
701701
where W: Write
702702
{
703703
if len < 16 {
704-
let marker = Marker::FixedArray(len as u8);
704+
let marker = Marker::FixArray(len as u8);
705705
try!(write_fixval(wr, marker));
706706
Ok(marker)
707707
} else if len < 65536 {
@@ -724,7 +724,7 @@ pub fn write_map_len<W>(wr: &mut W, len: u32) -> Result<Marker, ValueWriteError>
724724
where W: Write
725725
{
726726
if len < 16 {
727-
let marker = Marker::FixedMap(len as u8);
727+
let marker = Marker::FixMap(len as u8);
728728
try!(write_fixval(wr, marker));
729729
Ok(marker)
730730
} else if len < 65536 {

0 commit comments

Comments
 (0)