aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/builder.rs2
-rw-r--r--src/date.rs8
-rw-r--r--src/de.rs4
-rw-r--r--src/events/binary_reader.rs35
-rw-r--r--src/events/xml_reader.rs8
-rw-r--r--src/events/xml_writer.rs3
-rw-r--r--src/ser.rs16
-rw-r--r--src/value.rs28
8 files changed, 51 insertions, 53 deletions
diff --git a/src/builder.rs b/src/builder.rs
index d4d9364..ca9deb5 100644
--- a/src/builder.rs
+++ b/src/builder.rs
@@ -11,7 +11,7 @@ pub struct Builder<T> {
impl<T: Iterator<Item = Result<Event, Error>>> Builder<T> {
pub fn new(stream: T) -> Builder<T> {
Builder {
- stream: stream,
+ stream,
token: None,
}
}
diff --git a/src/date.rs b/src/date.rs
index 4ee1dae..f83b1af 100644
--- a/src/date.rs
+++ b/src/date.rs
@@ -25,7 +25,7 @@ impl Date {
pub(crate) fn from_seconds_since_plist_epoch(timestamp: f64) -> Result<Date, Error> {
// `timestamp` is the number of seconds since the plist epoch of 1/1/2001 00:00:00.
// `PLIST_EPOCH_UNIX_TIMESTAMP` is the unix timestamp of the plist epoch.
- const PLIST_EPOCH_UNIX_TIMESTAMP: u64 = 978307200;
+ const PLIST_EPOCH_UNIX_TIMESTAMP: u64 = 978_307_200;
let plist_epoch = UNIX_EPOCH + Duration::from_secs(PLIST_EPOCH_UNIX_TIMESTAMP);
if !timestamp.is_finite() {
@@ -58,13 +58,13 @@ impl fmt::Debug for Date {
impl From<SystemTime> for Date {
fn from(date: SystemTime) -> Self {
- Date { inner: date.into() }
+ Date { inner: date }
}
}
impl Into<SystemTime> for Date {
fn into(self) -> SystemTime {
- self.inner.into()
+ self.inner
}
}
@@ -76,7 +76,7 @@ pub mod serde_impls {
use Date;
- pub const DATE_NEWTYPE_STRUCT_NAME: &'static str = "PLIST-DATE";
+ pub const DATE_NEWTYPE_STRUCT_NAME: &str = "PLIST-DATE";
impl Serialize for Date {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
diff --git a/src/de.rs b/src/de.rs
index 148b7b7..a9ca16d 100644
--- a/src/de.rs
+++ b/src/de.rs
@@ -322,8 +322,8 @@ where
len: Option<usize>,
) -> MapAndSeqAccess<'a, I> {
MapAndSeqAccess {
- de: de,
- is_struct: is_struct,
+ de,
+ is_struct,
remaining: len,
}
}
diff --git a/src/events/binary_reader.rs b/src/events/binary_reader.rs
index 553040d..6d31518 100644
--- a/src/events/binary_reader.rs
+++ b/src/events/binary_reader.rs
@@ -54,7 +54,7 @@ impl<R: Read + Seek> BinaryReader<R> {
BinaryReader {
stack: Vec::new(),
object_offsets: Vec::new(),
- reader: reader,
+ reader,
ref_size: 0,
finished: false,
max_allocation_bytes: 0,
@@ -127,10 +127,10 @@ impl<R: Read + Seek> BinaryReader<R> {
let mut ints = self.allocate_vec(len, size as usize)?;
for _ in 0..len {
match size {
- 1 => ints.push(self.reader.read_u8()? as u64),
- 2 => ints.push(self.reader.read_u16::<BigEndian>()? as u64),
- 4 => ints.push(self.reader.read_u32::<BigEndian>()? as u64),
- 8 => ints.push(self.reader.read_u64::<BigEndian>()? as u64),
+ 1 => ints.push(self.reader.read_u8()?.into()),
+ 2 => ints.push(self.reader.read_u16::<BigEndian>()?.into()),
+ 4 => ints.push(self.reader.read_u32::<BigEndian>()?.into()),
+ 8 => ints.push(self.reader.read_u64::<BigEndian>()?),
_ => return Err(Error::InvalidData),
}
}
@@ -146,14 +146,14 @@ impl<R: Read + Seek> BinaryReader<R> {
if (len & 0x0f) == 0x0f {
let len_power_of_two = self.reader.read_u8()? & 0x03;
Ok(match len_power_of_two {
- 0 => self.reader.read_u8()? as u64,
- 1 => self.reader.read_u16::<BigEndian>()? as u64,
- 2 => self.reader.read_u32::<BigEndian>()? as u64,
+ 0 => self.reader.read_u8()?.into(),
+ 1 => self.reader.read_u16::<BigEndian>()?.into(),
+ 2 => self.reader.read_u32::<BigEndian>()?.into(),
3 => self.reader.read_u64::<BigEndian>()?,
_ => return Err(Error::InvalidData),
})
} else {
- Ok(len as u64)
+ Ok(len.into())
}
}
@@ -166,8 +166,7 @@ impl<R: Read + Seek> BinaryReader<R> {
fn seek_to_object(&mut self, object_ref: u64) -> Result<u64, Error> {
let object_ref = u64_to_usize(object_ref)?;
- let offset = *self
- .object_offsets
+ let offset = *self.object_offsets
.get(object_ref)
.ok_or(Error::InvalidData)?;
Ok(self.reader.seek(SeekFrom::Start(offset))?)
@@ -214,17 +213,19 @@ impl<R: Read + Seek> BinaryReader<R> {
(0x0, 0x08) => Some(Event::BooleanValue(false)),
(0x0, 0x09) => Some(Event::BooleanValue(true)),
(0x0, 0x0f) => return Err(Error::InvalidData), // fill
- (0x1, 0) => Some(Event::IntegerValue(self.reader.read_u8()? as i64)),
+ (0x1, 0) => Some(Event::IntegerValue(self.reader.read_u8()?.into())),
(0x1, 1) => Some(Event::IntegerValue(
- self.reader.read_u16::<BigEndian>()? as i64
+ self.reader.read_u16::<BigEndian>()?.into(),
)),
(0x1, 2) => Some(Event::IntegerValue(
- self.reader.read_u32::<BigEndian>()? as i64
+ self.reader.read_u32::<BigEndian>()?.into(),
)),
(0x1, 3) => Some(Event::IntegerValue(self.reader.read_i64::<BigEndian>()?)),
(0x1, 4) => return Err(Error::InvalidData), // 128 bit int
(0x1, _) => return Err(Error::InvalidData), // variable length int
- (0x2, 2) => Some(Event::RealValue(self.reader.read_f32::<BigEndian>()? as f64)),
+ (0x2, 2) => Some(Event::RealValue(
+ self.reader.read_f32::<BigEndian>()?.into(),
+ )),
(0x2, 3) => Some(Event::RealValue(self.reader.read_f64::<BigEndian>()?)),
(0x2, _) => return Err(Error::InvalidData), // odd length float
(0x3, 3) => {
@@ -267,7 +268,7 @@ impl<R: Read + Seek> BinaryReader<R> {
self.stack.push(StackItem {
ty: StackType::Array,
- object_refs: object_refs,
+ object_refs,
});
Some(Event::StartArray(Some(len)))
@@ -288,7 +289,7 @@ impl<R: Read + Seek> BinaryReader<R> {
self.stack.push(StackItem {
ty: StackType::Dict,
- object_refs: object_refs,
+ object_refs,
});
Some(Event::StartDictionary(Some(len as u64)))
diff --git a/src/events/xml_reader.rs b/src/events/xml_reader.rs
index 6bb9936..e2fff6a 100644
--- a/src/events/xml_reader.rs
+++ b/src/events/xml_reader.rs
@@ -74,11 +74,9 @@ impl<R: Read> XmlReader<R> {
}))
}
"date" => {
- return Some(
- self.read_content(|s| {
- Ok(Event::DateValue(Date::from_rfc3339(&s)?))
- }),
- )
+ return Some(self.read_content(|s| {
+ Ok(Event::DateValue(Date::from_rfc3339(&s)?))
+ }))
}
"integer" => {
return Some(self.read_content(|s| match FromStr::from_str(&s) {
diff --git a/src/events/xml_writer.rs b/src/events/xml_writer.rs
index a2df5bf..dde1e6e 100644
--- a/src/events/xml_writer.rs
+++ b/src/events/xml_writer.rs
@@ -120,8 +120,7 @@ impl<W: Write> Writer for XmlWriter<W> {
};
return Ok(());
}
- Some(Element::Dictionary(DictionaryState::ExpectValue)) => self
- .stack
+ Some(Element::Dictionary(DictionaryState::ExpectValue)) => self.stack
.push(Element::Dictionary(DictionaryState::ExpectKey)),
Some(other) => self.stack.push(other),
None => {
diff --git a/src/ser.rs b/src/ser.rs
index 4a2a42b..fbdab37 100644
--- a/src/ser.rs
+++ b/src/ser.rs
@@ -18,7 +18,7 @@ pub struct Serializer<W: Writer> {
impl<W: Writer> Serializer<W> {
pub fn new(writer: W) -> Serializer<W> {
- Serializer { writer: writer }
+ Serializer { writer }
}
fn emit(&mut self, event: Event) -> Result<(), Error> {
@@ -60,15 +60,15 @@ impl<'a, W: Writer> ser::Serializer for &'a mut Serializer<W> {
}
fn serialize_i8(self, v: i8) -> Result<(), Self::Error> {
- self.serialize_i64(v as i64)
+ self.serialize_i64(v.into())
}
fn serialize_i16(self, v: i16) -> Result<(), Self::Error> {
- self.serialize_i64(v as i64)
+ self.serialize_i64(v.into())
}
fn serialize_i32(self, v: i32) -> Result<(), Self::Error> {
- self.serialize_i64(v as i64)
+ self.serialize_i64(v.into())
}
fn serialize_i64(self, v: i64) -> Result<(), Self::Error> {
@@ -76,15 +76,15 @@ impl<'a, W: Writer> ser::Serializer for &'a mut Serializer<W> {
}
fn serialize_u8(self, v: u8) -> Result<(), Self::Error> {
- self.serialize_u64(v as u64)
+ self.serialize_u64(v.into())
}
fn serialize_u16(self, v: u16) -> Result<(), Self::Error> {
- self.serialize_u64(v as u64)
+ self.serialize_u64(v.into())
}
fn serialize_u32(self, v: u32) -> Result<(), Self::Error> {
- self.serialize_u64(v as u64)
+ self.serialize_u64(v.into())
}
fn serialize_u64(self, v: u64) -> Result<(), Self::Error> {
@@ -92,7 +92,7 @@ impl<'a, W: Writer> ser::Serializer for &'a mut Serializer<W> {
}
fn serialize_f32(self, v: f32) -> Result<(), Self::Error> {
- self.serialize_f64(v as f64)
+ self.serialize_f64(v.into())
}
fn serialize_f64(self, v: f64) -> Result<(), Self::Error> {
diff --git a/src/value.rs b/src/value.rs
index bb422e7..e0a95e5 100644
--- a/src/value.rs
+++ b/src/value.rs
@@ -222,7 +222,7 @@ impl From<f64> for Value {
impl From<f32> for Value {
fn from(from: f32) -> Value {
- Value::Real(from as f64)
+ Value::Real(from.into())
}
}
@@ -234,37 +234,37 @@ impl From<i64> for Value {
impl From<i32> for Value {
fn from(from: i32) -> Value {
- Value::Integer(from as i64)
+ Value::Integer(from.into())
}
}
impl From<i16> for Value {
fn from(from: i16) -> Value {
- Value::Integer(from as i64)
+ Value::Integer(from.into())
}
}
impl From<i8> for Value {
fn from(from: i8) -> Value {
- Value::Integer(from as i64)
+ Value::Integer(from.into())
}
}
impl From<u32> for Value {
fn from(from: u32) -> Value {
- Value::Integer(from as i64)
+ Value::Integer(from.into())
}
}
impl From<u16> for Value {
fn from(from: u16) -> Value {
- Value::Integer(from as i64)
+ Value::Integer(from.into())
}
}
impl From<u8> for Value {
fn from(from: u8) -> Value {
- Value::Integer(from as i64)
+ Value::Integer(from.into())
}
}
@@ -276,7 +276,7 @@ impl<'a> From<&'a f64> for Value {
impl<'a> From<&'a f32> for Value {
fn from(from: &'a f32) -> Value {
- Value::Real(*from as f64)
+ Value::Real((*from).into())
}
}
@@ -288,37 +288,37 @@ impl<'a> From<&'a i64> for Value {
impl<'a> From<&'a i32> for Value {
fn from(from: &'a i32) -> Value {
- Value::Integer(*from as i64)
+ Value::Integer((*from).into())
}
}
impl<'a> From<&'a i16> for Value {
fn from(from: &'a i16) -> Value {
- Value::Integer(*from as i64)
+ Value::Integer((*from).into())
}
}
impl<'a> From<&'a i8> for Value {
fn from(from: &'a i8) -> Value {
- Value::Integer(*from as i64)
+ Value::Integer((*from).into())
}
}
impl<'a> From<&'a u32> for Value {
fn from(from: &'a u32) -> Value {
- Value::Integer(*from as i64)
+ Value::Integer((*from).into())
}
}
impl<'a> From<&'a u16> for Value {
fn from(from: &'a u16) -> Value {
- Value::Integer(*from as i64)
+ Value::Integer((*from).into())
}
}
impl<'a> From<&'a u8> for Value {
fn from(from: &'a u8) -> Value {
- Value::Integer(*from as i64)
+ Value::Integer((*from).into())
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-01 12:15:44 +0000