Skip to content

Commit

Permalink
Clippy
Browse files Browse the repository at this point in the history
  • Loading branch information
@kornelski
kornelski committed Jul 21, 2023
1 parent f4ad0d0 commit 4f35516
Show file tree
Hide file tree
Showing 10 changed files with 41 additions and 41 deletions.
6 changes: 3 additions & 3 deletions rmp-serde/src/decode.rs
View file
Expand Up @@ -307,7 +307,7 @@ impl<'de, R: ReadSlice<'de>, C: SerializerConfig> Deserializer<R, C> {
fn read_str_data<V>(&mut self, len: u32, visitor: V) -> Result<V::Value, Error>
where V: Visitor<'de>
{
match read_bin_data(&mut self.rd, len as u32)? {
match read_bin_data(&mut self.rd, len)? {
Reference::Borrowed(buf) => {
match str::from_utf8(buf) {
Ok(s) => visitor.visit_borrowed_str(s),
Expand Down Expand Up @@ -384,7 +384,7 @@ fn ext_len<R: Read>(rd: &mut R, marker: Marker) -> Result<u32, Error> {
Marker::FixExt16 => 16,
Marker::Ext8 => read_u8(rd)? as u32,
Marker::Ext16 => read_u16(rd)? as u32,
Marker::Ext32 => read_u32(rd)? as u32,
Marker::Ext32 => read_u32(rd)?,
_ => return Err(Error::TypeMismatch(marker)),
})
}
Expand Down Expand Up @@ -625,7 +625,7 @@ impl<'de, 'a, R: ReadSlice<'de>, C: SerializerConfig> serde::Deserializer<'de> f
self.marker = None;
visitor.visit_enum(VariantAccess::new(self))
}
n => Err(Error::LengthMismatch(n as u32)),
n => Err(Error::LengthMismatch(n)),
},
// TODO: Check this is a string
Err(_) => visitor.visit_enum(UnitVariantAccess::new(self)),
Expand Down
4 changes: 2 additions & 2 deletions rmp-serde/src/lib.rs
View file
Expand Up @@ -327,8 +327,8 @@ impl<'a> Serialize for RawRef<'a> {
S: serde::Serializer,
{
match self.s {
Ok(ref s) => se.serialize_str(s),
Err((ref b, ..)) => se.serialize_bytes(b),
Ok(s) => se.serialize_str(s),
Err((b, ..)) => se.serialize_bytes(b),
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions rmp/src/marker.rs
View file
Expand Up @@ -151,9 +151,9 @@ impl From<u8> for Marker {
}
}

impl Into<u8> for Marker {
impl From<Marker> for u8 {
#[inline]
fn into(self) -> u8 {
self.to_u8()
fn from(val: Marker) -> Self {
val.to_u8()
}
}
2 changes: 1 addition & 1 deletion rmp/tests/func/decode/bool.rs
View file
Expand Up @@ -7,7 +7,7 @@ fn from_bool_false() {
let buf = [0xc2];
let mut cur = Cursor::new(&buf[..]);

assert_eq!(false, read_bool(&mut cur).unwrap());
assert!(!read_bool(&mut cur).unwrap());
assert_eq!(1, cur.position());
}

Expand Down
8 changes: 4 additions & 4 deletions rmpv/src/decode/mod.rs
View file
Expand Up @@ -91,13 +91,13 @@ impl From<ValueReadError> for Error {
}
}

impl Into<io::Error> for Error {
impl From<Error> for io::Error {
#[cold]
fn into(self) -> io::Error {
match self {
fn from(val: Error) -> Self {
match val {
Error::InvalidMarkerRead(err) |
Error::InvalidDataRead(err) => err,
Error::DepthLimitExceeded => io::Error::new(self.kind(), self),
Error::DepthLimitExceeded => io::Error::new(val.kind(), val),
}
}
}
2 changes: 1 addition & 1 deletion rmpv/src/encode/value.rs
View file
Expand Up @@ -57,7 +57,7 @@ pub fn write_value<W>(wr: &mut W, val: &Value) -> Result<(), Error>
}
Value::Map(ref map) => {
write_map_len(wr, map.len() as u32)?;
for &(ref key, ref val) in map {
for (key, val) in map {
write_value(wr, key)?;
write_value(wr, val)?;
}
Expand Down
2 changes: 1 addition & 1 deletion rmpv/src/encode/value_ref.rs
View file
Expand Up @@ -69,7 +69,7 @@ pub fn write_value_ref<W>(wr: &mut W, val: &ValueRef<'_>) -> Result<(), Error>
}
ValueRef::Map(ref map) => {
write_map_len(wr, map.len() as u32)?;
for &(ref key, ref val) in map {
for (key, val) in map {
write_value_ref(wr, key)?;
write_value_ref(wr, val)?;
}
Expand Down
16 changes: 8 additions & 8 deletions rmpv/src/ext/de.rs
View file
Expand Up @@ -570,7 +570,7 @@ impl<'de> Deserializer<'de> for &'de ValueRef<'de> {
where V: Visitor<'de>
{
match self {
&ValueRef::Array(ref v) => {
ValueRef::Array(v) => {
let len = v.len();
let mut iter = v.iter();
if !(len == 1 || len == 2) {
Expand Down Expand Up @@ -614,7 +614,7 @@ impl<'de> Deserializer<'de> for &'de ValueRef<'de> {
where V: Visitor<'de>
{
match self {
&ValueRef::Array(ref v) => {
ValueRef::Array(v) => {
if v.is_empty() {
visitor.visit_unit()
} else {
Expand Down Expand Up @@ -968,7 +968,7 @@ impl<'de> de::MapAccess<'de> for MapRefDeserializer<'de> {
where T: DeserializeSeed<'de>
{
match self.iter.next() {
Some(&(ref key, ref val)) => {
Some((key, val)) => {
self.val = Some(val);
seed.deserialize(key).map(Some)
}
Expand Down Expand Up @@ -1040,7 +1040,7 @@ impl<'de> de::VariantAccess<'de> for VariantRefDeserializer<'de> {
fn unit_variant(self) -> Result<(), Error> {
// Can accept only [u32].
match self.value {
Some(&ValueRef::Array(ref v)) => {
Some(ValueRef::Array(v)) => {
if v.is_empty() {
Ok(())
} else {
Expand All @@ -1057,7 +1057,7 @@ impl<'de> de::VariantAccess<'de> for VariantRefDeserializer<'de> {
{
// Can accept both [u32, T...] and [u32, [T]] cases.
match self.value {
Some(&ValueRef::Array(ref v)) => {
Some(ValueRef::Array(v)) => {
let len = v.len();
let mut iter = v.iter();
if len > 1 {
Expand Down Expand Up @@ -1085,7 +1085,7 @@ impl<'de> de::VariantAccess<'de> for VariantRefDeserializer<'de> {
{
// Can accept [u32, [T...]].
match self.value {
Some(&ValueRef::Array(ref v)) => {
Some(ValueRef::Array(v)) => {
Deserializer::deserialize_any(SeqDeserializer::new(v.iter()), visitor)
}
Some(v) => Err(de::Error::invalid_type(v.unexpected(), &"tuple variant")),
Expand All @@ -1097,10 +1097,10 @@ impl<'de> de::VariantAccess<'de> for VariantRefDeserializer<'de> {
where V: Visitor<'de>,
{
match self.value {
Some(&ValueRef::Array(ref v)) => {
Some(ValueRef::Array(v)) => {
Deserializer::deserialize_any(SeqDeserializer::new(v.iter()), visitor)
}
Some(&ValueRef::Map(ref v)) => {
Some(ValueRef::Map(v)) => {
Deserializer::deserialize_any(MapRefDeserializer::new(v.iter()), visitor)
}
Some(v) => Err(de::Error::invalid_type(v.unexpected(), &"struct variant")),
Expand Down
10 changes: 5 additions & 5 deletions rmpv/src/ext/se.rs
View file
Expand Up @@ -42,7 +42,7 @@ impl Serialize for Value {
}
Value::Map(ref map) => {
let mut state = s.serialize_map(Some(map.len()))?;
for &(ref key, ref val) in map {
for (key, val) in map {
state.serialize_entry(key, val)?;
}
state.end()
Expand Down Expand Up @@ -696,7 +696,7 @@ impl SerializeSeq for SerializeVec {
fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
where T: Serialize
{
self.vec.push(to_value(&value)?);
self.vec.push(to_value(value)?);
Ok(())
}

Expand Down Expand Up @@ -748,7 +748,7 @@ impl ser::SerializeTupleVariant for SerializeTupleVariant {
fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
where T: Serialize
{
self.vec.push(to_value(&value)?);
self.vec.push(to_value(value)?);
Ok(())
}

Expand Down Expand Up @@ -777,7 +777,7 @@ impl ser::SerializeMap for DefaultSerializeMap {
// expected failure.
let key = self.next_key.take()
.expect("`serialize_value` called before `serialize_key`");
self.map.push((key, to_value(&value)?));
self.map.push((key, to_value(value)?));
Ok(())
}

Expand Down Expand Up @@ -812,7 +812,7 @@ impl ser::SerializeStructVariant for SerializeStructVariant {
fn serialize_field<T: ?Sized>(&mut self, _key: &'static str, value: &T) -> Result<(), Error>
where T: Serialize
{
self.vec.push(to_value(&value)?);
self.vec.push(to_value(value)?);
Ok(())
}

Expand Down
26 changes: 13 additions & 13 deletions rmpv/src/lib.rs
View file
Expand Up @@ -142,7 +142,7 @@ impl From<u32> for Integer {
impl From<u64> for Integer {
#[inline]
fn from(n: u64) -> Self {
Integer { n: IntPriv::PosInt(n as u64) }
Integer { n: IntPriv::PosInt(n) }
}
}

Expand Down Expand Up @@ -190,7 +190,7 @@ impl From<i64> for Integer {
#[inline]
fn from(n: i64) -> Self {
if n < 0 {
Integer { n: IntPriv::NegInt(n as i64) }
Integer { n: IntPriv::NegInt(n) }
} else {
Integer { n: IntPriv::PosInt(n as u64) }
}
Expand Down Expand Up @@ -415,9 +415,9 @@ impl<'a> From<&'a str> for Utf8StringRef<'a> {
}
}

impl<'a> Into<Utf8String> for Utf8StringRef<'a> {
fn into(self) -> Utf8String {
match self.s {
impl<'a> From<Utf8StringRef<'a>> for Utf8String {
fn from(val: Utf8StringRef<'a>) -> Self {
match val.s {
Ok(s) => Utf8String { s: Ok(s.into()) },
Err((buf, err)) => Utf8String { s: Err((buf.into(), err)) }
}
Expand Down Expand Up @@ -509,7 +509,7 @@ impl Value {
ValueRef::Array(val.iter().map(|v| v.as_ref()).collect())
}
Value::Map(ref val) => {
ValueRef::Map(val.iter().map(|&(ref k, ref v)| (k.as_ref(), v.as_ref())).collect())
ValueRef::Map(val.iter().map(|(k, v)| (k.as_ref(), v.as_ref())).collect())
}
Value::Ext(ty, ref buf) => ValueRef::Ext(ty, buf.as_slice()),
}
Expand Down Expand Up @@ -839,7 +839,7 @@ impl Value {
#[inline]
pub fn as_array(&self) -> Option<&Vec<Value>> {
if let Value::Array(ref array) = *self {
Some(&*array)
Some(array)
} else {
None
}
Expand Down Expand Up @@ -1208,15 +1208,15 @@ impl Display for Value {
write!(f, "{{")?;

match vec.iter().take(1).next() {
Some(&(ref k, ref v)) => {
Some((k, v)) => {
write!(f, "{}: {}", k, v)?;
}
None => {
write!(f, "")?;
}
}

for &(ref k, ref v) in vec.iter().skip(1) {
for (k, v) in vec.iter().skip(1) {
write!(f, ", {}: {}", k, v)?;
}

Expand Down Expand Up @@ -1300,7 +1300,7 @@ impl<'a> ValueRef<'a> {
Value::Array(val.iter().map(|v| v.to_owned()).collect())
}
ValueRef::Map(ref val) => {
Value::Map(val.iter().map(|&(ref k, ref v)| (k.to_owned(), v.to_owned())).collect())
Value::Map(val.iter().map(|(k, v)| (k.to_owned(), v.to_owned())).collect())
}
ValueRef::Ext(ty, buf) => Value::Ext(ty, buf.to_vec()),
}
Expand Down Expand Up @@ -1342,7 +1342,7 @@ impl<'a> ValueRef<'a> {
/// ```
pub fn as_array(&self) -> Option<&Vec<ValueRef<'_>>> {
if let ValueRef::Array(ref array) = *self {
Some(&*array)
Some(array)
} else {
None
}
Expand Down Expand Up @@ -1556,15 +1556,15 @@ impl<'a> Display for ValueRef<'a> {
write!(f, "{{")?;

match vec.iter().take(1).next() {
Some(&(ref k, ref v)) => {
Some((k, v)) => {
write!(f, "{}: {}", k, v)?;
}
None => {
write!(f, "")?;
}
}

for &(ref k, ref v) in vec.iter().skip(1) {
for (k, v) in vec.iter().skip(1) {
write!(f, ", {}: {}", k, v)?;
}

Expand Down

0 comments on commit 4f35516

Please sign in to comment.