From c5073e83e56ae16e52abdc8356aceaec3e9654a0 Mon Sep 17 00:00:00 2001 From: Cobrand Date: Fri, 8 Jul 2016 15:53:43 +0200 Subject: [PATCH] pub used InvalidEncoding in serde+rustc_serialize so it shows in `cargo doc` (#82) * Removed unused import warning * pub use InvalidEncoding in serde+rustc_serialize * Made both fields of InvalidEncoding public so it can be used without Display or Debug traits (e.g. pattern matching) * Export of InvalidEncoding in rustc_serialize/serde make them visible in `cargo doc` --- src/rustc_serialize/mod.rs | 2 +- src/rustc_serialize/reader.rs | 4 ++-- src/serde/mod.rs | 2 +- src/serde/reader.rs | 5 ++--- tests/test.rs | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/rustc_serialize/mod.rs b/src/rustc_serialize/mod.rs index 694eb24..2b75e80 100644 --- a/src/rustc_serialize/mod.rs +++ b/src/rustc_serialize/mod.rs @@ -7,7 +7,7 @@ use std::io::{Write, Read}; use ::SizeLimit; pub use self::writer::{SizeChecker, EncoderWriter, EncodingResult, EncodingError}; -pub use self::reader::{DecoderReader, DecodingResult, DecodingError}; +pub use self::reader::{DecoderReader, DecodingResult, DecodingError, InvalidEncoding}; mod reader; mod writer; diff --git a/src/rustc_serialize/reader.rs b/src/rustc_serialize/reader.rs index b8af40f..ba1fd31 100644 --- a/src/rustc_serialize/reader.rs +++ b/src/rustc_serialize/reader.rs @@ -11,8 +11,8 @@ use ::SizeLimit; #[derive(Eq, PartialEq, Clone, Debug)] pub struct InvalidEncoding { - desc: &'static str, - detail: Option, + pub desc: &'static str, + pub detail: Option, } impl fmt::Display for InvalidEncoding { diff --git a/src/serde/mod.rs b/src/serde/mod.rs index 76f648a..e570111 100644 --- a/src/serde/mod.rs +++ b/src/serde/mod.rs @@ -9,6 +9,7 @@ pub use self::reader::{ Deserializer, DeserializeResult, DeserializeError, + InvalidEncoding }; pub use self::writer::{ @@ -120,4 +121,3 @@ pub fn deserialize(bytes: &[u8]) -> DeserializeResult let mut reader = bytes; deserialize_from(&mut reader, SizeLimit::Infinite) } - diff --git a/src/serde/reader.rs b/src/serde/reader.rs index 3d58e34..b5d1691 100644 --- a/src/serde/reader.rs +++ b/src/serde/reader.rs @@ -8,14 +8,13 @@ use byteorder::{BigEndian, ReadBytesExt}; use num_traits; use serde_crate as serde; use serde_crate::de::value::ValueDeserializer; -use serde_crate::de::Deserializer as SerdeDeserializer; use ::SizeLimit; #[derive(Eq, PartialEq, Clone, Debug)] pub struct InvalidEncoding { - desc: &'static str, - detail: Option, + pub desc: &'static str, + pub detail: Option, } impl fmt::Display for InvalidEncoding { diff --git a/tests/test.rs b/tests/test.rs index 9039e9e..d114f64 100644 --- a/tests/test.rs +++ b/tests/test.rs @@ -9,7 +9,7 @@ use std::fmt::Debug; use std::collections::HashMap; use std::ops::Deref; -use rustc_serialize::{Encoder, Decoder, Encodable, Decodable}; +use rustc_serialize::{Encodable, Decodable}; use bincode::{RefBox, StrBox, SliceBox};