Skip to content

Commit 3392e24

Browse files
committed
Clippy
1 parent 9d96bb6 commit 3392e24

File tree

17 files changed

+45
-45
lines changed

17 files changed

+45
-45
lines changed

rmp-serde/benches/buf.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
extern crate test;
44

5-
use rmp_serde;
5+
66

77
use serde::{Deserialize, Serialize};
88

rmp-serde/src/decode.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ impl<'de, 'a, R: ReadSlice<'de> + 'a, C: SerializerConfig> de::MapAccess<'de> fo
773773
fn next_value_seed<V>(&mut self, seed: V) -> Result<V::Value, Self::Error>
774774
where V: DeserializeSeed<'de>
775775
{
776-
Ok(seed.deserialize(&mut *self.de)?)
776+
seed.deserialize(&mut *self.de)
777777
}
778778

779779
#[inline(always)]

rmp-serde/src/lib.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ impl Raw {
151151
pub fn as_err(&self) -> Option<&Utf8Error> {
152152
match self.s {
153153
Ok(..) => None,
154-
Err((_, ref err)) => Some(&err),
154+
Err((_, ref err)) => Some(err),
155155
}
156156
}
157157

@@ -300,7 +300,7 @@ impl<'a> RawRef<'a> {
300300
#[inline]
301301
pub fn as_str(&self) -> Option<&str> {
302302
match self.s {
303-
Ok(ref s) => Some(s),
303+
Ok(s) => Some(s),
304304
Err(..) => None,
305305
}
306306
}
@@ -311,16 +311,16 @@ impl<'a> RawRef<'a> {
311311
pub fn as_err(&self) -> Option<&Utf8Error> {
312312
match self.s {
313313
Ok(..) => None,
314-
Err((_, ref err)) => Some(&err),
314+
Err((_, ref err)) => Some(err),
315315
}
316316
}
317317

318318
/// Returns a byte slice of this raw's contents.
319319
#[inline]
320320
pub fn as_bytes(&self) -> &[u8] {
321321
match self.s {
322-
Ok(ref s) => s.as_bytes(),
323-
Err(ref err) => &err.0[..],
322+
Ok(s) => s.as_bytes(),
323+
Err(ref err) => err.0,
324324
}
325325
}
326326
}

rmp-serde/tests/round.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ fn round_variant_string() {
494494
}
495495
}
496496

497-
do_test!(|b| Serializer::new(b));
497+
do_test!(Serializer::new);
498498
do_test!(|b| Serializer::new(b).with_struct_map());
499499
do_test!(|b| Serializer::new(b).with_struct_tuple());
500500
do_test!(|b| Serializer::new(b).with_struct_map());

rmp/src/decode/bytes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ impl<'a> Bytes<'a> {
6363
/// Get a reference to the remaining bytes in the buffer.
6464
#[inline]
6565
pub fn remaining_slice(&self) -> &'a [u8] {
66-
&self.bytes
66+
self.bytes
6767
}
6868
/// Return the position of the input buffer.
6969
///

rmp/src/decode/str.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ pub fn read_str_data<'r, R>(rd: &mut R,
137137
Ok(decoded) => Ok(decoded),
138138
Err(err) => Err(DecodeStringError::InvalidUtf8(buf, err)),
139139
},
140-
Err(err) => Err(DecodeStringError::InvalidDataRead(From::from(err))),
140+
Err(err) => Err(DecodeStringError::InvalidDataRead(err)),
141141
}
142142
}
143143

rmp/tests/func/decode/bool.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ fn from_bool_true() {
1616
let buf = [0xc3];
1717
let mut cur = Cursor::new(&buf[..]);
1818

19-
assert_eq!(true, read_bool(&mut cur).unwrap());
19+
assert!(read_bool(&mut cur).unwrap());
2020
assert_eq!(1, cur.position());
2121
}

rmp/tests/func/decode/null.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ fn interrupt_safe() {
4949
self.state_ = 1;
5050
Err(Error::new(ErrorKind::Interrupted, "interrupted"))
5151
} else {
52-
assert!(buf.len() > 0);
52+
assert!(!buf.is_empty());
5353

5454
buf[0] = 0xc0;
5555
Ok(1)

rmp/tests/func/decode/string.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ fn from_str_strfix() {
137137
let buf: &[u8] = &[0xaa, 0x6c, 0x65, 0x20, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65];
138138
let mut cur = Cursor::new(buf);
139139

140-
let mut out: &mut [u8] = &mut [0u8; 16];
140+
let out: &mut [u8] = &mut [0u8; 16];
141141

142-
assert_eq!("le message", read_str(&mut cur, &mut out).unwrap());
142+
assert_eq!("le message", read_str(&mut cur, out).unwrap());
143143
assert_eq!(11, cur.position());
144144
}
145145

@@ -148,9 +148,9 @@ fn from_str_strfix_extra_data() {
148148
let buf: &[u8] = &[0xaa, 0x6c, 0x65, 0x20, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x00];
149149
let mut cur = Cursor::new(buf);
150150

151-
let mut out: &mut [u8] = &mut [0u8; 16];
151+
let out: &mut [u8] = &mut [0u8; 16];
152152

153-
assert_eq!("le message", read_str(&mut cur, &mut out).unwrap());
153+
assert_eq!("le message", read_str(&mut cur, out).unwrap());
154154
assert_eq!(11, cur.position());
155155
}
156156

@@ -159,9 +159,9 @@ fn from_str_strfix_exact_buffer() {
159159
let buf: &[u8] = &[0xaa, 0x6c, 0x65, 0x20, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65];
160160
let mut cur = Cursor::new(buf);
161161

162-
let mut out: &mut [u8] = &mut [0u8; 10];
162+
let out: &mut [u8] = &mut [0u8; 10];
163163

164-
assert_eq!("le message", read_str(&mut cur, &mut out).unwrap());
164+
assert_eq!("le message", read_str(&mut cur, out).unwrap());
165165
assert_eq!(11, cur.position());
166166
}
167167

@@ -171,9 +171,9 @@ fn from_str_strfix_invalid_utf8() {
171171
let buf: &[u8] = &[0xa2, 0xc3, 0x28];
172172
let mut cur = Cursor::new(buf);
173173

174-
let mut out: &mut [u8] = &mut [0u8; 16];
174+
let out: &mut [u8] = &mut [0u8; 16];
175175

176-
match read_str(&mut cur, &mut out) {
176+
match read_str(&mut cur, out) {
177177
Err(DecodeStringError::InvalidUtf8(raw, _)) => {
178178
assert_eq!(&[0xc3, 0x28], raw);
179179
}
@@ -188,9 +188,9 @@ fn from_str_strfix_buffer_too_small() {
188188
let buf: &[u8] = &[0xaa, 0x6c, 0x65, 0x20, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65];
189189
let mut cur = Cursor::new(buf);
190190

191-
let mut out: &mut [u8] = &mut [0u8; 9];
191+
let out: &mut [u8] = &mut [0u8; 9];
192192

193-
match read_str(&mut cur, &mut out) {
193+
match read_str(&mut cur, out) {
194194
Err(DecodeStringError::BufferSizeTooSmall(10)) => (),
195195
other => panic!("unexpected result: {:?}", other)
196196
}

rmpv-tests/benches/value.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#![feature(test)]
22

33
extern crate rmp_serde as rmps;
4-
use rmpv;
4+
55
extern crate test;
66

77
use test::Bencher;
@@ -42,7 +42,7 @@ fn from_complex_read_value_ref(b: &mut Bencher) {
4242
#[bench]
4343
fn from_complex_zero_copy_decode(b: &mut Bencher) {
4444
b.iter(|| {
45-
let res: ValueRef<'_> = rmps::from_slice(&COMPLEX[..]).unwrap();
45+
let res: ValueRef<'_> = rmps::from_slice(COMPLEX).unwrap();
4646
test::black_box(res);
4747
});
4848
b.bytes = COMPLEX.len() as u64;

0 commit comments

Comments
 (0)