commit_hash stringlengths 40 40 | author stringlengths 1 57 | date timestamp[s]date 2010-07-26 04:45:09 2026-04-14 18:21:10 | message stringlengths 8 1.39M | diff stringlengths 68 51.2k | files_changed int64 1 136 | insertions int64 0 2.35k | deletions int64 0 1.9k |
|---|---|---|---|---|---|---|---|
da98438fcbbc2aaf918823f5d880606aaeae14e6 | Evgeny Safronov | 2015-08-17T07:39:16 | Decoder: an ability to borrow the underlying R.
Or to consume the decoder obtaining the underlying reader. | diff --git a/src/decode.rs b/src/decode.rs
index 06c1fbc..e95b9e0 100644
--- a/src/decode.rs
+++ b/src/decode.rs
@@ -1810,7 +1810,20 @@ impl<R: Read> Decoder<R> {
}
}
- // TODO: Add an ability to borrow underlying reader and to destruct this decoder.
+ /// Gets a reference to the underlying reader... | 4 | 58 | 4 |
19725abcf659e3237612489f7c73c0bc3c064213 | Evgeny Safronov | 2015-08-16T11:44:49 | Misc: marked unreachable branch.
We have already processed every possible value in [0; 255]. | diff --git a/src/init.rs b/src/init.rs
index ce1ed12..27ca627 100644
--- a/src/init.rs
+++ b/src/init.rs
@@ -84,7 +84,7 @@ impl Marker {
0xdd => Marker::Array32,
0xde => Marker::Map16,
0xdf => Marker::Map32,
- _ => Marker::Reserved,
+ _ => unreachable!(),
... | 1 | 1 | 1 |
9e667201bcafa11f0923b5158bc9a61753376867 | Evgeny Safronov | 2015-08-16T11:42:53 | API: major renaming to better fit Rust convention.
This is the breaking change. Also this commit closes #28. | diff --git a/src/decode.rs b/src/decode.rs
index 7a5d4fd..06c1fbc 100644
--- a/src/decode.rs
+++ b/src/decode.rs
@@ -347,7 +347,7 @@ pub fn read_pfix<R>(rd: &mut R) -> Result<u8, FixedValueReadError>
where R: Read
{
match try!(read_marker(rd)) {
- Marker::PositiveFixnum(val) => Ok(val),
+ Marke... | 9 | 94 | 99 |
42668248ed8d8c805909f744e157af11b3bf18d6 | Evgeny Safronov | 2015-08-16T09:49:39 | Misc: code style. | diff --git a/src/decode.rs b/src/decode.rs
index cd2eebd..7a5d4fd 100644
--- a/src/decode.rs
+++ b/src/decode.rs
@@ -2077,10 +2077,16 @@ impl ::std::error::Error for Error {
}
impl serde::de::Error for Error {
- fn syntax(msg: &str) -> Error { Error::Syntax(format!("syntax error: {}", msg)) }
- fn length_mism... | 1 | 22 | 7 |
6c1f7c18fc036e746c787441450f209aec86cba0 | Evgeny Safronov | 2015-08-12T09:32:09 | Serde: bytes serialization. | diff --git a/src/encode.rs b/src/encode.rs
index 3134021..c6df2a2 100644
--- a/src/encode.rs
+++ b/src/encode.rs
@@ -1214,6 +1214,7 @@ use super::{
write_str,
write_array_len,
write_map_len,
+ write_bin_len,
};
use super::{
@@ -1493,6 +1494,11 @@ impl<'a> serde::Serializer for Serializer<'a> {
... | 2 | 19 | 0 |
380a68be68c7468c4f53e240fe149a557ee31357 | Evgeny Safronov | 2015-08-12T08:10:01 | Serde: deserialize binaries using ByteBuf. | diff --git a/src/decode.rs b/src/decode.rs
index 8e9464a..cd2eebd 100644
--- a/src/decode.rs
+++ b/src/decode.rs
@@ -2044,6 +2044,7 @@ use super::{
read_numeric_data,
read_str_data,
read_marker,
+ read_full,
};
/// Unstable: docs; incomplete
@@ -2212,6 +2213,21 @@ impl<R: Read> Deserializer<R> {
... | 2 | 72 | 1 |
6591a92f21a0cd34a05a4bed18fd1913fa152b88 | Evgeny Safronov | 2015-08-12T07:23:24 | Misc: planning. | diff --git a/src/decode.rs b/src/decode.rs
index 51e0dc8..8e9464a 100644
--- a/src/decode.rs
+++ b/src/decode.rs
@@ -2274,6 +2274,7 @@ impl<R: Read> serde::Deserializer for Deserializer<R> {
self.read_map(len, visitor)
}
Marker::Reserved => Err(Error::TypeMismatch(Marker::Rese... | 1 | 1 | 0 |
50878894f581e242dd2a0c47a125c57008ed9198 | Evgeny Safronov | 2015-08-08T17:10:14 | Misc: using iterators API.
Now the code in `value` module looks more pretty because of using
iterators API instead of manual vector filling. | diff --git a/src/value.rs b/src/value.rs
index aa095f5..cfc7485 100644
--- a/src/value.rs
+++ b/src/value.rs
@@ -99,20 +99,10 @@ impl<'a> ValueRef<'a> {
&ValueRef::String(val) => Value::String(val.to_string()),
&ValueRef::Binary(val) => Value::Binary(val.to_vec()),
&ValueRef::Arra... | 1 | 2 | 12 |
7e6ffc9c7c1039a095f85f996e3d168d83c0ed93 | Erick Tryzelaar | 2015-08-10T05:00:03 | Initial support for a serde deserializer | diff --git a/src/decode.rs b/src/decode.rs
index bc959db..9625750 100644
--- a/src/decode.rs
+++ b/src/decode.rs
@@ -1968,4 +1968,339 @@ impl<R: Read> serialize::Decoder for Decoder<R> {
}
+pub mod serde {
+
+use std::convert::From;
+use std::fmt;
+use std::io::Read;
+use std::result;
+
+use serde;
+
+use super::s... | 4 | 810 | 0 |
706ee7173265fae0d77b3abbcf60e54d706ead3b | Erick Tryzelaar | 2015-08-09T01:02:27 | Initial support for serde serializer | diff --git a/Cargo.toml b/Cargo.toml
index 2e89171..3e529c0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,3 +19,5 @@ license = "MIT"
[dependencies]
byteorder = "*"
rustc-serialize = "0.3"
+serde = "*"
+serde_macros = { version = "*", optional = true }
diff --git a/src/encode.rs b/src/encode.rs
index 8d59415..e0144... | 6 | 641 | 0 |
4bbba51d4f910ea3de9dca4d8a3986296ab3bf78 | Evgeny Safronov | 2015-08-07T10:04:25 | Decoder: generalized integer decoding.
Now the `Decoder` should properly map integers to the result type if the
decoded value fits in result type's range. | diff --git a/src/decode.rs b/src/decode.rs
index bc959db..5a177bd 100644
--- a/src/decode.rs
+++ b/src/decode.rs
@@ -893,6 +893,63 @@ pub fn read_i64_loosely<R>(rd: &mut R) -> Result<i64, ValueReadError>
}
}
+use super::value::Integer;
+
+macro_rules! make_read_int_fit {
+ ($name:ident, $ty:ty) => {
+ ... | 2 | 106 | 16 |
32dbc3d60ab6d9277d4802cc25c29ad12291dde0 | Evgeny Safronov | 2015-08-07T10:04:08 | Encoder: fixed encoding signed integers.
Now the `Encoder` should encode signed integers using the most
effective underlying representation. | diff --git a/src/encode.rs b/src/encode.rs
index 8d59415..f27c1b6 100644
--- a/src/encode.rs
+++ b/src/encode.rs
@@ -534,11 +534,48 @@ pub fn write_sint<W>(wr: &mut W, val: i64) -> Result<Marker, ValueWriteError>
}
}
-#[allow(dead_code, unused_variables)]
-fn write_int<W>(wr: &mut W, val: i64) -> Result<Marker,... | 1 | 42 | 5 |
93b510027d576a798dc45ce4c3dcc7099d041063 | Evgeny Safronov | 2015-08-01T13:07:20 | Misc: trait renaming.
BufRead is now called BorrowRead to avoid naming colisions. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 5a899e4..0068c10 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -108,14 +108,14 @@ fn read_len<R, D>(rd: &mut R) -> Result<D, ReadError>
}
fn read_num<'a, R, D>(mut rd: &mut R) -> Result<D, Error<'a>>
- where R: BufRead<'... | 2 | 18 | 19 |
86cf8714e50e163ffa028b61d7b2bbb09a54d89e | Evgeny Safronov | 2015-08-01T12:29:14 | Misc: one task less. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 70619be..5a899e4 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -41,7 +41,6 @@ impl ToUnsigned for u32 {
}
}
-// TODO: Display trait.
#[derive(Debug)]
pub enum Error<'r> {
/// Failed to read the type marker value. | 1 | 0 | 1 |
01fa09ccff6da0edc4933a2f45e346db1ce0e687 | Evgeny Safronov | 2015-08-01T12:28:43 | ValueRef: more documentation for decoding.
Added some documentation with examples for `read_value_ref` function. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 3fdca60..70619be 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -289,7 +289,36 @@ impl<'a> BufRead<'a> for Cursor<&'a [u8]> {
}
}
-// TODO: Doc, examples.
+/// Attempts to read the data from the given reader until either... | 1 | 30 | 1 |
51a6ea2b45b6d8a1008fa3194a826675779aa325 | Evgeny Safronov | 2015-08-01T11:35:40 | Misc: wording. | diff --git a/src/encode/value_ref.rs b/src/encode/value_ref.rs
index 225c401..33a71ab 100644
--- a/src/encode/value_ref.rs
+++ b/src/encode/value_ref.rs
@@ -64,7 +64,7 @@ impl From<ValueWriteError> for Error {
}
}
-/// Encodes and attempts to write the given non-owning ValueRef into the given Write.
+/// Encode... | 1 | 1 | 1 |
f78528fac11780f6f3658c7fdf9341df23dfcb9e | Evgeny Safronov | 2015-08-01T11:35:01 | Misc: planning. | diff --git a/src/encode/value_ref.rs b/src/encode/value_ref.rs
index 47913eb..225c401 100644
--- a/src/encode/value_ref.rs
+++ b/src/encode/value_ref.rs
@@ -5,6 +5,7 @@ use std::error;
use std::fmt;
use std::io::Write;
+// TODO: Includes cleanup is required.
use super::super::value::{Float, Integer, ValueRef};
us... | 1 | 1 | 0 |
b3c4d8d08c7fe47a1798ef158746934c1394b727 | Evgeny Safronov | 2015-08-01T11:32:56 | ValueRef: documentation added.
Added documentation with an example for `write_value_ref` function. | diff --git a/src/encode/value_ref.rs b/src/encode/value_ref.rs
index 97fa32e..47913eb 100644
--- a/src/encode/value_ref.rs
+++ b/src/encode/value_ref.rs
@@ -63,6 +63,24 @@ impl From<ValueWriteError> for Error {
}
}
+/// Encodes and attempts to write the given non-owning ValueRef into the given Write.
+///
+/// ... | 1 | 18 | 0 |
b3e30e6bc79cd356afd42de39a167337ccb905b0 | Evgeny Safronov | 2015-08-01T11:20:50 | Misc: style. | diff --git a/src/value.rs b/src/value.rs
index 9150f56..aa095f5 100644
--- a/src/value.rs
+++ b/src/value.rs
@@ -120,7 +120,7 @@ impl<'a> ValueRef<'a> {
}
// For some weird reasons I can't implement it manually.
-// It gives me: conflicting implementations for trait `collections::borrow::ToOwned`
+// It gives: conf... | 1 | 1 | 1 |
ae60f1ec31f4f885851ef154446cf75bc355c555 | Evgeny Safronov | 2015-08-01T08:24:16 | Doc: `to_owned` method has been documented.
With example. | diff --git a/src/value.rs b/src/value.rs
index e246058..9150f56 100644
--- a/src/value.rs
+++ b/src/value.rs
@@ -59,8 +59,37 @@ pub enum ValueRef<'a> {
}
impl<'a> ValueRef<'a> {
- /// Converts the current non-owning value to the owned one.
- // TODO: Documentation with examples.
+ /// Converts the current ... | 1 | 31 | 2 |
e1330a32fdf116ca44d40bb23ddbc5e538fc17bc | Evgeny Safronov | 2015-08-01T07:50:10 | Bench: converting to owned. | diff --git a/benches/bench.rs b/benches/bench.rs
index d19ce72..9fd00a0 100644
--- a/benches/bench.rs
+++ b/benches/bench.rs
@@ -98,6 +98,28 @@ fn from_complex_read_value_ref(b: &mut Bencher) {
});
}
+#[bench]
+fn from_complex_read_value_ref_to_owned(b: &mut Bencher) {
+ let buf = [
+ 0x95, // Fixed a... | 1 | 22 | 0 |
4b975e32ca7f37080e38922963bf02076b96bd3a | Evgeny Safronov | 2015-08-01T07:26:47 | ValueRef: to owned value conversion. | diff --git a/src/value.rs b/src/value.rs
index b0c740d..35baa06 100644
--- a/src/value.rs
+++ b/src/value.rs
@@ -57,3 +57,39 @@ pub enum ValueRef<'a> {
/// array where type information is an integer whose meaning is defined by applications.
Ext(i8, &'a [u8]),
}
+
+impl<'a> ValueRef<'a> {
+ pub fn to_owned(&... | 2 | 87 | 0 |
b56c3ea42be7acff6b74fee4ea647895d4b5b81a | Evgeny Safronov | 2015-08-01T07:26:21 | Value: integers and float enums are now Copy. | diff --git a/src/value.rs b/src/value.rs
index 8225be0..b0c740d 100644
--- a/src/value.rs
+++ b/src/value.rs
@@ -1,4 +1,4 @@
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Copy, Clone, Debug, PartialEq)]
pub enum Integer {
/// Every non-negative integer is treated as u64, even if it fits in i64.
U64(u64),
@@ ... | 1 | 2 | 2 |
8ab09fd3b0fed89d1d268ec3b44c290801bc7d94 | Evgeny Safronov | 2015-07-31T22:50:32 | Misc: planning. | diff --git a/src/decode.rs b/src/decode.rs
index d601fb1..bc959db 100644
--- a/src/decode.rs
+++ b/src/decode.rs
@@ -44,6 +44,7 @@ impl Error for ReadError {
fn description(&self) -> &str {
match *self {
ReadError::UnexpectedEOF => "unexpected end of file while reading MessagePack value",
+ ... | 2 | 2 | 0 |
72db127fc8e04bbe96398511404df16487fae6db | Evgeny Safronov | 2015-07-31T22:50:13 | ValueRef: display and error traits for decoding. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index a671f5e..ae374be 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -1,6 +1,8 @@
//! This module is UNSTABLE, the reason is - recently added.
use std::convert::From;
+use std::error;
+use std::fmt;
use std::io::{Cursor, Read};
... | 1 | 35 | 0 |
1de534a0caaee0b42e407d720d710864da5f5692 | Evgeny Safronov | 2015-07-31T20:45:18 | UT: minor renaming. | diff --git a/src/encode/value_ref.rs b/src/encode/value_ref.rs
index 4e396c4..97fa32e 100644
--- a/src/encode/value_ref.rs
+++ b/src/encode/value_ref.rs
@@ -127,7 +127,7 @@ mod test {
}
#[test]
- fn error_trait_description() {
+ fn error_trait() {
// Delegates to I/O Error.
let err =... | 1 | 1 | 1 |
108add51d6596ac99d0300c4c0f3bbfad33b6e7b | Evgeny Safronov | 2015-07-31T20:44:24 | UT: more checks. | diff --git a/src/encode/value_ref.rs b/src/encode/value_ref.rs
index b7d338a..4e396c4 100644
--- a/src/encode/value_ref.rs
+++ b/src/encode/value_ref.rs
@@ -134,6 +134,7 @@ mod test {
fn test<E: error::Error>(err: E) {
assert_eq!("error while writing MessagePack'ed value", err.description());
... | 1 | 1 | 0 |
f636dc8ecfcb45d072b40c05014741362c0d64d9 | Evgeny Safronov | 2015-07-31T20:12:34 | ValueRef: error trait for encode error. | diff --git a/src/encode/value_ref.rs b/src/encode/value_ref.rs
index 1721d79..b7d338a 100644
--- a/src/encode/value_ref.rs
+++ b/src/encode/value_ref.rs
@@ -1,6 +1,7 @@
//! This module is UNSTABLE, the reason is - recently added.
use std::convert::From;
+use std::error;
use std::fmt;
use std::io::Write;
@@ -31,... | 1 | 32 | 4 |
0a2fefa5f8110d135b939654c2330bd3d5351029 | Evgeny Safronov | 2015-07-30T19:10:12 | ValueRef: display trait for encode error. | diff --git a/src/encode/value_ref.rs b/src/encode/value_ref.rs
index 4d9f399..1721d79 100644
--- a/src/encode/value_ref.rs
+++ b/src/encode/value_ref.rs
@@ -1,6 +1,7 @@
//! This module is UNSTABLE, the reason is - recently added.
use std::convert::From;
+use std::fmt;
use std::io::Write;
use super::super::value... | 1 | 24 | 0 |
880bfbe37b6ae90c40cbe24bf5ef2310006a633e | Evgeny Safronov | 2015-07-28T19:53:33 | ValueRef: fixed includes for PR. | diff --git a/src/encode/value_ref.rs b/src/encode/value_ref.rs
index f0754e1..4d9f399 100644
--- a/src/encode/value_ref.rs
+++ b/src/encode/value_ref.rs
@@ -4,10 +4,20 @@ use std::convert::From;
use std::io::Write;
use super::super::value::{Float, Integer, ValueRef};
-use super::*;
-
-// TODO: Make pub sometimes.
-... | 1 | 14 | 4 |
3c08e68a4ce44ebb6f5fe12abc6f7bd2989ebe4a | Evgeny Safronov | 2015-07-28T19:46:21 | ValueRef: writing exts. | diff --git a/src/encode/value_ref.rs b/src/encode/value_ref.rs
index d19f62e..f0754e1 100644
--- a/src/encode/value_ref.rs
+++ b/src/encode/value_ref.rs
@@ -69,7 +69,10 @@ pub fn write_value_ref<W>(wr: &mut W, val: &ValueRef) -> Result<(), Error>
try!(write_value_ref(wr, val));
}
... | 2 | 12 | 1 |
c82483c89ee996e91c501a1352be836dc1feeba9 | Evgeny Safronov | 2015-07-28T19:39:33 | ValueRef: writing maps. | diff --git a/src/encode/value_ref.rs b/src/encode/value_ref.rs
index 2c1d38a..d19f62e 100644
--- a/src/encode/value_ref.rs
+++ b/src/encode/value_ref.rs
@@ -59,6 +59,16 @@ pub fn write_value_ref<W>(wr: &mut W, val: &ValueRef) -> Result<(), Error>
try!(write_value_ref(wr, item));
}
... | 2 | 21 | 1 |
732085795a8b7a721ca9e44a113c757981adf864 | Evgeny Safronov | 2015-07-28T19:37:27 | ValueRef: writing arrays. | diff --git a/src/encode/value_ref.rs b/src/encode/value_ref.rs
index 19d9998..2c1d38a 100644
--- a/src/encode/value_ref.rs
+++ b/src/encode/value_ref.rs
@@ -50,6 +50,15 @@ pub fn write_value_ref<W>(wr: &mut W, val: &ValueRef) -> Result<(), Error>
&ValueRef::Binary(val) => {
try!(write_bin(wr, val)... | 2 | 23 | 0 |
4e095afecc94433c5b2fcd319b2934e085a3038a | Evgeny Safronov | 2015-07-28T19:29:17 | ValueRef: writing binaries. | diff --git a/src/encode/value_ref.rs b/src/encode/value_ref.rs
index f04effd..19d9998 100644
--- a/src/encode/value_ref.rs
+++ b/src/encode/value_ref.rs
@@ -47,6 +47,9 @@ pub fn write_value_ref<W>(wr: &mut W, val: &ValueRef) -> Result<(), Error>
&ValueRef::String(val) => {
try!(write_str(wr, val))... | 2 | 11 | 0 |
31f60be301547aaf31e6d29b3804b96207a11562 | Evgeny Safronov | 2015-07-28T19:27:24 | ValueRef: writing strings. | diff --git a/src/encode/value_ref.rs b/src/encode/value_ref.rs
index 874763b..f04effd 100644
--- a/src/encode/value_ref.rs
+++ b/src/encode/value_ref.rs
@@ -6,6 +6,9 @@ use std::io::Write;
use super::super::value::{Float, Integer, ValueRef};
use super::*;
+// TODO: Make pub sometimes.
+use super::{write_str, write_... | 2 | 18 | 2 |
35df38bdaf42d0423970eee041de377e124bc796 | Evgeny Safronov | 2015-07-28T19:23:18 | ValueRef: writing floats. | diff --git a/src/encode/value_ref.rs b/src/encode/value_ref.rs
index d697bd2..874763b 100644
--- a/src/encode/value_ref.rs
+++ b/src/encode/value_ref.rs
@@ -3,7 +3,7 @@
use std::convert::From;
use std::io::Write;
-use super::super::value::{Integer, ValueRef};
+use super::super::value::{Float, Integer, ValueRef};
u... | 2 | 28 | 2 |
ffafe809fba22a48d0c733dcdc80719d38f552a9 | Evgeny Safronov | 2015-07-28T19:16:30 | Misc: planning. | diff --git a/src/encode.rs b/src/encode.rs
index caec210..94b1ffd 100644
--- a/src/encode.rs
+++ b/src/encode.rs
@@ -810,12 +810,14 @@ pub fn write_value<W>(wr: &mut W, val: &Value) -> Result<(), Error>
match val {
&Value::Nil => try!(write_nil(wr)),
&Value::Boolean(val) => try!(write_bool(wr, va... | 1 | 2 | 0 |
7a9af115892cc2f0ba124e9bd31a5d9dbf0dd2ef | Evgeny Safronov | 2015-07-28T19:12:07 | ValueRef: writing unsinged integers. | diff --git a/src/encode/value_ref.rs b/src/encode/value_ref.rs
index fff1c03..d697bd2 100644
--- a/src/encode/value_ref.rs
+++ b/src/encode/value_ref.rs
@@ -32,6 +32,9 @@ pub fn write_value_ref<W>(wr: &mut W, val: &ValueRef) -> Result<(), Error>
match val {
&ValueRef::Nil => try!(write_nil(wr)),
... | 2 | 14 | 0 |
56cf5445d8ac84ca740f761307dc494cd6a90747 | Evgeny Safronov | 2015-07-28T19:10:23 | ValueRef: writing signed integers. | diff --git a/src/encode/value_ref.rs b/src/encode/value_ref.rs
index 8ae7736..fff1c03 100644
--- a/src/encode/value_ref.rs
+++ b/src/encode/value_ref.rs
@@ -3,7 +3,7 @@
use std::convert::From;
use std::io::Write;
-use super::super::value::ValueRef;
+use super::super::value::{Integer, ValueRef};
use super::*;
#[... | 2 | 25 | 1 |
6ed1384e5367dfbfbcbedcb8f679d60db5030125 | Evgeny Safronov | 2015-07-28T19:04:37 | ValueRef: encoding bool values. | diff --git a/src/encode/value_ref.rs b/src/encode/value_ref.rs
index ae32feb..8ae7736 100644
--- a/src/encode/value_ref.rs
+++ b/src/encode/value_ref.rs
@@ -22,6 +22,7 @@ pub fn write_value_ref<W>(wr: &mut W, val: &ValueRef) -> Result<(), Error>
{
match val {
&ValueRef::Nil => try!(write_nil(wr)),
+ ... | 2 | 12 | 0 |
4c37608f940610023b52a5a2518f3e421e3da877 | Evgeny Safronov | 2015-07-26T17:39:14 | UT: tested writing into a too small buffer. | diff --git a/tests/func/encode/value_ref.rs b/tests/func/encode/value_ref.rs
index 5cb77eb..183ebf3 100644
--- a/tests/func/encode/value_ref.rs
+++ b/tests/func/encode/value_ref.rs
@@ -11,3 +11,15 @@ fn pack_nil() {
assert_eq!([0xc0], buf);
}
+
+#[test]
+fn pack_nil_when_buffer_is_tool_small() {
+ let mut bu... | 1 | 12 | 0 |
d0c1bc0dd766a74200ec22e977aeb8d89e9f84cb | Evgeny Safronov | 2015-07-26T17:35:04 | UT: enable some value & value_ref tests. | diff --git a/tests/func/encode/value.rs b/tests/func/encode/value.rs
new file mode 100644
index 0000000..59f2b35
--- /dev/null
+++ b/tests/func/encode/value.rs
@@ -0,0 +1,13 @@
+use msgpack::Value;
+use msgpack::encode::value::write_value;
+
+#[test]
+fn pack_nil() {
+ let mut buf = [0x00];
+
+ let val = Value::N... | 2 | 26 | 0 |
defa516a69fe62d9e6453d39f10453b623a2782d | Evgeny Safronov | 2015-07-26T17:32:36 | ValueRef: writing nil value. | diff --git a/src/encode/value_ref.rs b/src/encode/value_ref.rs
index 7c2f682..ae32feb 100644
--- a/src/encode/value_ref.rs
+++ b/src/encode/value_ref.rs
@@ -1 +1,29 @@
//! This module is UNSTABLE, the reason is - recently added.
+
+use std::convert::From;
+use std::io::Write;
+
+use super::super::value::ValueRef;
+use... | 1 | 28 | 0 |
9b2d8a9103508f2225bb8e459af6bbbb36ec794d | Evgeny Safronov | 2015-07-26T17:22:18 | Misc: func tests decomposition.
One task less. | diff --git a/src/encode.rs b/src/encode.rs
index c6f7dd3..caec210 100644
--- a/src/encode.rs
+++ b/src/encode.rs
@@ -846,26 +846,7 @@ pub fn write_value<W>(wr: &mut W, val: &Value) -> Result<(), Error>
Ok(())
}
-// TODO: Move tests outside.
-#[cfg(test)]
-mod tests {
-
-use super::*;
-
-#[test]
-fn pack_nil() {... | 2 | 3 | 20 |
bc7a6215193b6c4000ae34f066ffc1d1a1bc7541 | Evgeny Safronov | 2015-07-25T15:24:33 | UT: example with Vec write. | diff --git a/tests/func/encode/encoder.rs b/tests/func/encode/encoder.rs
index e3d35db..34cc9f7 100644
--- a/tests/func/encode/encoder.rs
+++ b/tests/func/encode/encoder.rs
@@ -308,3 +308,19 @@ fn pass_encodong_struct_into_vec() {
assert_eq!(vec![0x92, 0x2a, 0xaa, 0x74, 0x68, 0x65, 0x20, 0x41, 0x6e, 0x73, 0x77, ... | 1 | 16 | 0 |
977c243e082070f343202298dac5bea0e6ef7ce8 | Evgeny Safronov | 2015-07-25T15:24:16 | ValueRef: encoder - the beginning. | diff --git a/src/encode.rs b/src/encode.rs
index d6d870a..c6f7dd3 100644
--- a/src/encode.rs
+++ b/src/encode.rs
@@ -10,6 +10,9 @@ use byteorder::WriteBytesExt;
use super::Marker;
+#[path = "encode/value_ref.rs"]
+pub mod value_ref;
+
/// Represents an error that can occur when attempting to write MessagePack'ed ... | 2 | 4 | 0 |
4b80c2baf8799ee394256ea82a07214140c6bf84 | Evgeny Safronov | 2015-07-21T18:10:53 | Bench: added complex value ref reader benchmark. | diff --git a/benches/bench.rs b/benches/bench.rs
index 26d5d7c..d19ce72 100644
--- a/benches/bench.rs
+++ b/benches/bench.rs
@@ -76,6 +76,27 @@ fn from_complex_read_value(b: &mut Bencher) {
});
}
+#[bench]
+fn from_complex_read_value_ref(b: &mut Bencher) {
+ let buf = [
+ 0x95, // Fixed array with 5 l... | 1 | 21 | 0 |
e87e6e99cdd15c4993f37719e3ac3dac5bc9c72d | Evgeny Safronov | 2015-07-21T18:07:53 | Misc: proper variable names. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 0e57b4f..a671f5e 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -80,10 +80,10 @@ fn read_num<'a, R, D>(mut rd: &mut R) -> Result<D, Error<'a>>
D::read(&mut rd).map_err(|err| Error::InvalidDataRead(From::from(err)))
}
-fn... | 1 | 11 | 11 |
54994ef432026b5b7c64adb96028372dc3dca958 | Evgeny Safronov | 2015-07-21T18:01:05 | Misc: renaming again. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index f984468..0e57b4f 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -66,19 +66,18 @@ impl<'r> From<MarkerReadError> for Error<'r> {
}
}
-fn read_num<'a, R, D>(mut rd: &mut R) -> Result<D, Error<'a>>
- where R: BufRead<'a>... | 1 | 19 | 20 |
4aef10faf0dd37eb4092264cfcc4935e52055903 | Evgeny Safronov | 2015-07-21T17:59:16 | ValueRef: minor renaming. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 4b83b10..f984468 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -14,25 +14,25 @@ use super::{BigEndianRead};
use super::super::init::Marker;
use super::super::value::{Float, Integer, ValueRef};
-trait USizeCast {
+trait ToUn... | 1 | 9 | 9 |
6a0f5400bb147551357f8601d6b3661875aa7cdd | Evgeny Safronov | 2015-07-21T17:56:34 | ValueRef: code decomposition. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 6528735..4b83b10 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -157,6 +157,28 @@ fn read_ext_value<'a, R, U>(mut buf: &mut R, len: U) -> Result<ValueRef<'a>, Err
Ok(ValueRef::Ext(ty, buf))
}
+#[inline]
+fn read_array_va... | 1 | 33 | 28 |
2a29afcabf6fbac4a9069c2bdff31890ef25e84b | Evgeny Safronov | 2015-07-21T17:49:41 | ValueRef: handling the reserved type. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 4f550cd..6528735 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -56,6 +56,8 @@ pub enum Error<'r> {
InvalidUtf8(&'r [u8], Utf8Error),
/// Failed to read ext type.
InvalidExtTypeRead(ReadError),
+ /// Using Rese... | 2 | 18 | 4 |
7943eb08265c1cb6db934723ee0202f565f0c7c6 | Evgeny Safronov | 2015-07-21T17:19:53 | ValueRef: more docs. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 6f84784..4f550cd 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -184,10 +184,10 @@ fn read_map<'a, R>(rd: &mut R, len: usize) -> Result<Vec<(ValueRef<'a>, ValueRef
Ok(vec)
}
-// TODO: Make more generic for [u8], Vec<u8>,... | 1 | 6 | 4 |
0d2f5114aabb70c90d4134129e4ed864c1b82089 | Evgeny Safronov | 2015-07-21T16:51:14 | ValueRef: weak type restrictions for decoding.
Now it's possible to decode from all Read traits that also implement
special ReadBuf<'a> trait with borrowing from buffer directly.
Currently it's implemented for &'a [u8] and Cursor<'a [u8]>.
Massive refactoring done. Got rid of manual bytes counting in favor of
using ... | diff --git a/benches/bench.rs b/benches/bench.rs
index 01ae7de..26d5d7c 100644
--- a/benches/bench.rs
+++ b/benches/bench.rs
@@ -48,10 +48,8 @@ fn from_string_read_value_ref(b: &mut Bencher) {
0x20, 0x61, 0x6d, 0x65, 0x74, 0x2e
];
- let mut rd = &buf[..];
-
b.iter(|| {
- let res = read_va... | 3 | 257 | 144 |
603fb9ec3546e61ca9b30f8f8cfafbe73fad6817 | Evgeny Safronov | 2015-07-20T19:59:51 | Misc: dead comments elimination. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index d28e03d..5ce704c 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -379,6 +379,3 @@ pub fn read_value_ref<R>(rd: &mut R) -> Result<ValueRef, Error>
let res = try!(read_value_ref_impl(buf)).0;
Ok(res)
}
-
-// TODO: Concep... | 1 | 0 | 3 |
769379e594b8275a3f43f30cde0e132655930a2f | Evgeny Safronov | 2015-07-20T19:38:39 | ValueRef: all types can now be decoded. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 37442f1..d28e03d 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -191,15 +191,9 @@ fn read_value_ref_impl(buf: &[u8]) -> Result<(ValueRef, usize), Error> {
pos += 1;
let val = match marker {
- Marker::Null => {... | 2 | 30 | 9 |
9ec90a859e2d8d969eae11e7f5bb630b44fe2c4c | Evgeny Safronov | 2015-07-20T19:35:09 | ValueRef: all floats now can be decoded. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 00fd0f7..37442f1 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -12,7 +12,7 @@ use super::{
use super::{BigEndianRead};
use super::super::init::Marker;
-use super::super::value::{Integer, ValueRef};
+use super::super::value:... | 3 | 43 | 19 |
1d71629f689ff9dc4e8e2c385a3178b62d9dc086 | Evgeny Safronov | 2015-07-20T19:23:18 | ValueRef: replace marker placeholder. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 0c9f0c3..00fd0f7 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -191,6 +191,15 @@ fn read_value_ref_impl(buf: &[u8]) -> Result<(ValueRef, usize), Error> {
pos += 1;
let val = match marker {
+ Marker::Null => {... | 1 | 16 | 1 |
d155e10d979dda35f1d80fd2c9ccb3a9ada140fc | Evgeny Safronov | 2015-07-20T19:16:54 | UT: uncomment one test case. | diff --git a/tests/func/decode/value_ref.rs b/tests/func/decode/value_ref.rs
index 5164331..5ae7c24 100644
--- a/tests/func/decode/value_ref.rs
+++ b/tests/func/decode/value_ref.rs
@@ -286,16 +286,16 @@ fn from_ext32() {
#[test]
fn from_fixmap() {
let buf = [
- 0x81, // size: 2
- // 0x2a, // 42
- ... | 1 | 4 | 4 |
557f7dd58ed5e456ed8b5ef316dcd257b3609d75 | Evgeny Safronov | 2015-07-20T19:16:00 | ValueRef: decoding all signed integer types. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 2acb853..0c9f0c3 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -218,16 +218,24 @@ fn read_value_ref_impl(buf: &[u8]) -> Result<(ValueRef, usize), Error> {
ValueRef::Integer(Integer::I64(val as i64))
}
... | 2 | 48 | 4 |
8a8d98aa1fb4d182cba1fe0f0c620ea926f808d7 | Evgeny Safronov | 2015-07-20T19:12:52 | ValueRef: decoding all unsigned integers. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 709b6a8..2acb853 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -71,6 +71,12 @@ impl<'r> From<MarkerReadError> for Error<'r> {
}
}
+fn read_int<D>(mut rd: &[u8]) -> Result<D, Error>
+ where D: BigEndianRead
+{
+ D:... | 2 | 54 | 4 |
e6371c4d181364d2becdf4dcc7a77a2865317217 | Evgeny Safronov | 2015-07-20T17:24:14 | ValueRef: decoding fixed negative integers. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 45bfc33..709b6a8 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -188,6 +188,33 @@ fn read_value_ref_impl(buf: &[u8]) -> Result<(ValueRef, usize), Error> {
Marker::PositiveFixnum(val) => {
ValueRef::Integer(... | 2 | 36 | 0 |
65569959ed85b56dc1a0b262507f5a34341ea2d2 | Evgeny Safronov | 2015-07-20T08:53:41 | ValueRef: decoding positive fixnum. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 600b278..45bfc33 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -12,7 +12,7 @@ use super::{
use super::{BigEndianRead};
use super::super::init::Marker;
-use super::super::value::ValueRef;
+use super::super::value::{Integer, ... | 4 | 17 | 4 |
b4aa8507ec8dd0d152f782cb9881a963256083bd | Evgeny Safronov | 2015-07-19T20:55:17 | ValueRef: decoding all types of arrays. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 84d18f7..600b278 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -226,10 +226,18 @@ fn read_value_ref_impl(buf: &[u8]) -> Result<(ValueRef, usize), Error> {
ValueRef::Array(vec)
}
Marker::Array16 =>... | 2 | 40 | 2 |
85cd6739300e1bdfa201cf27afa4962c5313a5cb | Evgeny Safronov | 2015-07-19T20:50:54 | ValueRef: array decoding, first blood. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 8aacd41..84d18f7 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -142,6 +142,19 @@ fn read_ext_value<U>(mut buf: &[u8], len: U) -> Result<ValueRef, Error>
Ok(ValueRef::Ext(ty, buf))
}
+fn read_array(buf: &[u8], len: usize... | 3 | 49 | 4 |
b8ba23df8e48a6457ae5ebd85982d5d2e2447461 | Evgeny Safronov | 2015-07-19T20:35:15 | ValueRef: decoding all types of maps. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 997a72d..8aacd41 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -212,6 +212,18 @@ fn read_value_ref_impl(buf: &[u8]) -> Result<(ValueRef, usize), Error> {
pos += bytes;
ValueRef::Map(map)
}
+ ... | 2 | 44 | 0 |
1a6a047ca7758715c3c33fb8ce2b364d96cf3761 | Evgeny Safronov | 2015-07-19T20:26:36 | ValueRef: code reuse. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 8b48a50..997a72d 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -262,81 +262,9 @@ fn read_value_ref_impl(buf: &[u8]) -> Result<(ValueRef, usize), Error> {
pub fn read_value_ref<R>(rd: &mut R) -> Result<ValueRef, Error>
whe... | 1 | 3 | 75 |
aeb5957b7a1698324f3c8cd2f91b855f47e979e7 | Evgeny Safronov | 2015-07-19T20:23:45 | ValueRef: planning. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 74a87cd..8b48a50 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -159,7 +159,9 @@ fn read_map(buf: &[u8], len: usize) -> Result<(Vec<(ValueRef, ValueRef)>, usize)
Ok((vec, pos))
}
-// TODO: Valid for [u8], Vec<u8>... all ... | 1 | 3 | 1 |
552d190040df5508d62a72346ff1245051fb7477 | Evgeny Safronov | 2015-07-18T17:08:47 | Bench: value ref benchmark added. | diff --git a/benches/bench.rs b/benches/bench.rs
index ff45d65..01ae7de 100644
--- a/benches/bench.rs
+++ b/benches/bench.rs
@@ -39,6 +39,23 @@ fn from_string_read_value(b: &mut Bencher) {
});
}
+#[bench]
+fn from_string_read_value_ref(b: &mut Bencher) {
+ // Lorem ipsum dolor sit amet.
+ let buf = [
+ ... | 1 | 17 | 0 |
3aab5ba663473843096e2f8dcdbb578a94b1a953 | Evgeny Safronov | 2015-07-18T17:05:05 | Misc: minor code style. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 22e8354..74a87cd 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -142,8 +142,7 @@ fn read_ext_value<U>(mut buf: &[u8], len: U) -> Result<ValueRef, Error>
Ok(ValueRef::Ext(ty, buf))
}
-fn read_map(buf: &[u8], len: usize) -... | 1 | 1 | 2 |
c413ca32d382eade9720c27249eebc1188bd3de9 | Evgeny Safronov | 2015-07-18T17:04:39 | ValueRef: map - code clean. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 0adeefa..22e8354 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -145,23 +145,19 @@ fn read_ext_value<U>(mut buf: &[u8], len: U) -> Result<ValueRef, Error>
fn read_map(buf: &[u8], len: usize) -> Result<(Vec<(ValueRef, ValueRef)>... | 1 | 3 | 7 |
867c6bf55ffd7e6d418d417e274364a475a5181d | Evgeny Safronov | 2015-07-18T16:57:22 | ValueRef: map decoding, first blood. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index b77c067..0adeefa 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -142,6 +142,125 @@ fn read_ext_value<U>(mut buf: &[u8], len: U) -> Result<ValueRef, Error>
Ok(ValueRef::Ext(ty, buf))
}
+fn read_map(buf: &[u8], len: usize)... | 3 | 146 | 2 |
54ed9998a9844439ae383e0c4417165fa8fe07bc | Evgeny Safronov | 2015-07-17T22:21:04 | ValueRef: decoding all types of exts now. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index ceda98a..b77c067 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -201,13 +201,16 @@ pub fn read_value_ref<R>(rd: &mut R) -> Result<ValueRef, Error>
try!(read_ext_value(&mut buf, len))
}
Marker::Ext8... | 2 | 36 | 3 |
07b2357a89451b30ea541a8b3446282246bfceec | Evgeny Safronov | 2015-07-17T22:09:07 | ValueRef: decoding all fixed ext types. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index b3df024..ceda98a 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -181,20 +181,24 @@ pub fn read_value_ref<R>(rd: &mut R) -> Result<ValueRef, Error>
try!(read_bin_value(buf, len))
}
Marker::FixExt1 =... | 2 | 53 | 5 |
83adebd0305303d80d369836ddbed8393d405eb0 | Evgeny Safronov | 2015-07-17T22:01:14 | ValueRef: ext1 decoding. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 4e166c7..b3df024 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -61,6 +61,8 @@ pub enum Error<'r> {
///
/// Contains untouched bytearray with the underlying decoding error.
InvalidUtf8(&'r [u8], Utf8Error),
+ /... | 3 | 75 | 5 |
270ae56f55bb5131ca36ee05617ddb2804ec57d2 | Evgeny Safronov | 2015-07-17T21:12:54 | ValueRef: done with binary decoding. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 8a19b88..4e166c7 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -147,10 +147,12 @@ pub fn read_value_ref<R>(rd: &mut R) -> Result<ValueRef, Error>
try!(read_bin_value(buf, len))
}
Marker::Bin16 => ... | 2 | 24 | 2 |
b2a29de21348889ddf61d1ac544e1ae18788ff17 | Evgeny Safronov | 2015-07-17T21:11:13 | Misc: code reuse. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 3ddc361..8a19b88 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -55,10 +55,8 @@ pub enum Error<'r> {
InvalidLengthRead(ReadError),
/// Failed to read packed non-marker data.
InvalidDataRead(ReadError),
-
/// ... | 1 | 1 | 8 |
dc3e6f92e7b7ef8613f6421df435ff192c3d5d57 | Evgeny Safronov | 2015-07-17T21:07:03 | ValueRef: decomposition. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 80fffd5..3ddc361 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -92,6 +92,17 @@ fn read_str(buf: &[u8], len: usize) -> Result<&str, Error> {
Ok(res)
}
+fn read_bin(buf: &[u8], len: usize) -> Result<&[u8], Error> {
+ i... | 1 | 23 | 11 |
5a2fee0b7b75512e5bad5ad6d142f80a7ae1b053 | Evgeny Safronov | 2015-07-17T21:01:52 | ValueRef: naive bin8 decoding. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 780bb9b..80fffd5 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -128,6 +128,25 @@ pub fn read_value_ref<R>(rd: &mut R) -> Result<ValueRef, Error>
let len: u32 = try!(read_length(&mut buf).map_err(|err| Error::Invali... | 3 | 46 | 2 |
1bae03cea50064f6eaff4f0cc0f5655294df10dc | Evgeny Safronov | 2015-07-17T17:32:58 | ValueRef: functional decomposition.
Here we have the first untestable on x86_64 error case - an `u16/u32 as
usize` overflow, which may only trigger on systems with pointer size
less than u16/u32. I'm not sure what to do in that case, so it
definetely need to discuss about. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 4b24be2..780bb9b 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -14,6 +14,31 @@ use super::{BigEndianRead};
use super::super::init::Marker;
use super::super::value::ValueRef;
+trait USizeCast {
+ fn from(v: Self) -> Optio... | 1 | 41 | 20 |
ad90960ef6494657eca42accd69f185358612b25 | Evgeny Safronov | 2015-07-17T17:12:25 | ValueRef: decoding all types of strings.
Green light. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 8e8a35e..4b24be2 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -100,7 +100,12 @@ pub fn read_value_ref<R>(rd: &mut R) -> Result<ValueRef, Error>
ValueRef::String(res)
}
Marker::Str32 => {
- ... | 2 | 24 | 1 |
cbbe83beeaefe1e3364d83c866cb543acf0c8b6a | Evgeny Safronov | 2015-07-17T17:09:34 | ValueRef: decoding strings with 2-byte length. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index c3c2cb4..8e8a35e 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -92,7 +92,12 @@ pub fn read_value_ref<R>(rd: &mut R) -> Result<ValueRef, Error>
ValueRef::String(res)
}
Marker::Str16 => {
- ... | 2 | 24 | 1 |
cb7b6c6ba6afb1861edf9ecd872eb2f027a55dd9 | Evgeny Safronov | 2015-07-17T17:09:05 | Doc: wording. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 23c3c64..c3c2cb4 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -1,4 +1,4 @@
-//! This module is UNSTABLE, the reason is - just added.
+//! This module is UNSTABLE, the reason is - recently added.
use std::convert::From;
use... | 1 | 1 | 1 |
ec314e7f6a70e5b785d574dd15205cf32003c371 | Evgeny Safronov | 2015-07-17T08:56:54 | Encode: make write_{str, bin} pub. | diff --git a/src/encode.rs b/src/encode.rs
index d6d870a..f847edb 100644
--- a/src/encode.rs
+++ b/src/encode.rs
@@ -597,8 +597,14 @@ pub fn write_str_len<W>(wr: &mut W, len: u32) -> Result<Marker, ValueWriteError>
}
}
+/// Encodes and attempts to write the most efficient string implementation to the given `Wri... | 1 | 14 | 4 |
b852ce9517fd6fdae91faf7ab736f1abcf462957 | Evgeny Safronov | 2015-07-17T08:53:43 | Cleanup: minor. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 5758fbc..23c3c64 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -31,7 +31,7 @@ pub enum Error<'r> {
/// Failed to read packed non-marker data.
InvalidDataRead(ReadError),
- // length overflow
+ // length overfl... | 1 | 7 | 5 |
bcc34fd3dcc41bf90c00e29abc1364dbf881aeee | Evgeny Safronov | 2015-07-16T17:55:48 | Refactoring: code decomposition. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 279717e..5758fbc 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -52,6 +52,20 @@ fn read_length<R, D>(rd: &mut R) -> Result<D, ReadError>
D::read(rd).map_err(From::from)
}
+fn read_str(buf: &[u8], len: usize) -> Result<&s... | 1 | 16 | 18 |
60ac9053dac0c387c0b3dc6b6e965d272438c83b | Evgeny Safronov | 2015-07-16T17:55:32 | Wording. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index b78bc26..279717e 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -64,7 +64,7 @@ pub fn read_value_ref<R>(rd: &mut R) -> Result<ValueRef, Error>
let val = match marker {
Marker::FixedString(len) => {
- /... | 1 | 2 | 2 |
5349d362f327117ea6d7646ae18c812854731f6e | Evgeny Safronov | 2015-07-16T07:53:03 | Marker: rename planning. | diff --git a/src/init.rs b/src/init.rs
index 7107707..6ad150e 100644
--- a/src/init.rs
+++ b/src/init.rs
@@ -4,7 +4,9 @@ const FIXMAP_SIZE : u8 = 0x0f;
#[derive(Clone, Copy, PartialEq, Debug)]
pub enum Marker {
+ // TODO: Possibly will be renamed to `FixPos`.
PositiveFixnum(u8),
+ // TODO: Possibly wil... | 1 | 5 | 0 |
32b0c6fed0d6814b584ba829de020121818ee93a | Evgeny Safronov | 2015-07-16T07:52:49 | ValueRef: decoding fixed strings.
Green light -> refactoring. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index c991715..b78bc26 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -63,6 +63,22 @@ pub fn read_value_ref<R>(rd: &mut R) -> Result<ValueRef, Error>
let marker = try!(read_marker(&mut buf));
let val = match marker {
+ ... | 2 | 25 | 1 |
f6c797c5c3afe77f5edccc8832c1dcd12ed5c8a8 | Evgeny Safronov | 2015-07-15T22:18:07 | Doc: more comments. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 64f6452..c991715 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -32,6 +32,10 @@ pub enum Error<'r> {
InvalidDataRead(ReadError),
// length overflow
+
+ /// Failed to interpret a byte slice as a UTF-8 string.
+ ... | 1 | 4 | 0 |
65282fd945bbdeb4d4fd4a45ff2583e73e9b4fc4 | Evgeny Safronov | 2015-07-15T22:05:25 | ValueRef: handling UTF-8 errors. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index d3699f2..64f6452 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -2,7 +2,7 @@
use std::convert::From;
use std::io::{self, Read, BufRead};
-use std::str::from_utf8;
+use std::str::{from_utf8, Utf8Error};
use super::{read_ma... | 2 | 60 | 15 |
17a770acebd8108dd520d8ff59d900e21b2df2fd | Evgeny Safronov | 2015-07-15T22:05:03 | Planning: minor notice. | diff --git a/src/decode.rs b/src/decode.rs
index add8d04..d601fb1 100644
--- a/src/decode.rs
+++ b/src/decode.rs
@@ -1042,6 +1042,7 @@ fn read_str_data<'r, R>(rd: &mut R, len: u32, buf: &'r mut[u8]) -> Result<&'r st
///
// TODO: it is better to return &str; may panic on len mismatch; extend documentation.
// TODO: A... | 1 | 1 | 0 |
ff75c0ea09efc9ef04aaa8c34d7a05f70ecca22e | Evgeny Safronov | 2015-07-15T20:53:00 | ValueRef: handle EOF while reading length. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 8050141..d3699f2 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -1,14 +1,16 @@
//! This module is UNSTABLE, the reason is - just added.
use std::convert::From;
-use std::io::{self, BufRead};
+use std::io::{self, Read, BufRea... | 2 | 26 | 3 |
9baeafa1521dde69fd13da7164163ca29c4816d7 | Evgeny Safronov | 2015-07-15T20:34:46 | Doc: minor update. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index f4da63c..8050141 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -15,6 +15,10 @@ use super::super::value::ValueRef;
// TODO: Display trait.
#[derive(Debug)]
pub enum Error {
+ /// Unable to fill the internal reader buffer.
... | 1 | 4 | 0 |
3aff372f975591f56acdb67c5e0407d7cbc6b527 | Evgeny Safronov | 2015-07-15T20:30:38 | ValueRef: buffer fill error conversion. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 8f07645..f4da63c 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -1,5 +1,7 @@
+//! This module is UNSTABLE, the reason is - just added.
+
use std::convert::From;
-use std::io::BufRead;
+use std::io::{self, BufRead};
use std::st... | 2 | 34 | 9 |
427ada8fac6b7e31e670bdfc22d0fcaaf5e73cfa | Evgeny Safronov | 2015-07-14T06:56:59 | ValueRef: marker error conversion. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 156f46f..8f07645 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -1,22 +1,46 @@
+use std::convert::From;
use std::io::BufRead;
use std::str::from_utf8;
use super::{read_marker, read_numeric_data};
+use super::{
+ ReadErro... | 2 | 44 | 4 |
a8e480f148fb942de87fa5a7b5952d380f17830b | Evgeny Safronov | 2015-07-13T20:14:59 | [ValueRef] Planning. | diff --git a/src/decode/value_ref.rs b/src/decode/value_ref.rs
index 5ca7660..156f46f 100644
--- a/src/decode/value_ref.rs
+++ b/src/decode/value_ref.rs
@@ -12,12 +12,16 @@ pub struct Error;
pub fn read_value_ref<R>(rd: &mut R) -> Result<ValueRef, Error>
where R: BufRead
{
- // Reading the marker involves eit... | 1 | 9 | 5 |
ba037c94ef0c86cd498307fdb192745b25a7383d | Evgeny Safronov | 2015-07-13T17:26:36 | [ValueRef] Proof on concept. | diff --git a/src/decode.rs b/src/decode.rs
index b6846db..add8d04 100644
--- a/src/decode.rs
+++ b/src/decode.rs
@@ -24,6 +24,10 @@ use byteorder::ReadBytesExt;
use super::Marker;
+#[path = "decode/value_ref.rs"]
+pub mod value_ref;
+pub use self::value_ref::read_value_ref;
+
/// Represents an error that can occu... | 6 | 66 | 23 |
ab473b14b2db8a61473994234dd6203144faadf5 | Evgeny Safronov | 2015-07-12T20:40:23 | [Doc] Notice about EINTR behavior.
It appears, that all functions and methods will silently restart their operations on receiving EINTR. Since in the most (if not all) cases it's an recoverable error it's okay to do what we do. | diff --git a/src/decode.rs b/src/decode.rs
index 8faf686..b6846db 100644
--- a/src/decode.rs
+++ b/src/decode.rs
@@ -1,3 +1,17 @@
+//! # Note
+//!
+//! Most of the function defined in this module will silently handle interruption error (EINTR)
+//! received from the given `Read` to be in consistent state with the `Writ... | 2 | 202 | 41 |
81f0116027e7566e2c9d93069d693ad6720b1c94 | Evgeny Safronov | 2015-07-11T10:22:39 | [Doc] Removed notice about interruption safety.
Now documentation says about its behavior on receiving EINTR. | diff --git a/src/decode.rs b/src/decode.rs
index 7657486..8faf686 100644
--- a/src/decode.rs
+++ b/src/decode.rs
@@ -268,7 +268,7 @@ fn read_marker<R>(rd: &mut R) -> Result<Marker, MarkerReadError>
///
/// # Note
///
-/// This function is **interruption-safe**. It will silently retry on every EINTR received until
+/... | 1 | 4 | 4 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.