Skip to content

Commit e36debb

Browse files
ryan-summersryan-summers
committed
Fixing clippy
1 parent 6c6b39f commit e36debb

File tree

6 files changed

+28
-29
lines changed

6 files changed

+28
-29
lines changed

Diff for: ‎rust-toolchain

-1
This file was deleted.

Diff for: ‎src/de/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,7 @@ where
758758

759759
#[cfg(test)]
760760
mod tests {
761-
use core::str::FromStr;
761+
762762
use serde_derive::Deserialize;
763763

764764
#[derive(Debug, Deserialize, PartialEq)]

Diff for: ‎src/ser/map.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ impl<'a, 'b: 'a> ser::SerializeMap for SerializeMap<'a, 'b> {
2222
Ok(())
2323
}
2424

25-
fn serialize_key<T: ?Sized>(&mut self, key: &T) -> Result<()>
25+
fn serialize_key<T>(&mut self, key: &T) -> Result<()>
2626
where
27-
T: ser::Serialize,
27+
T: ser::Serialize + ?Sized,
2828
{
2929
if !self.first {
3030
self.ser.push(b',')?;
@@ -35,9 +35,9 @@ impl<'a, 'b: 'a> ser::SerializeMap for SerializeMap<'a, 'b> {
3535
Ok(())
3636
}
3737

38-
fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<()>
38+
fn serialize_value<T>(&mut self, value: &T) -> Result<()>
3939
where
40-
T: ser::Serialize,
40+
T: ser::Serialize + ?Sized,
4141
{
4242
value.serialize(&mut *self.ser)?;
4343
Ok(())

Diff for: ‎src/ser/mod.rs

+13-13
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ macro_rules! serialize_unsigned {
186186
macro_rules! serialize_signed {
187187
($self:ident, $N:expr, $v:expr, $ixx:ident, $uxx:ident) => {{
188188
let v = $v;
189-
let (signed, mut v) = if v == $ixx::min_value() {
190-
(true, $ixx::max_value() as $uxx + 1)
189+
let (signed, mut v) = if v == $ixx::MIN {
190+
(true, $ixx::MAX as $uxx + 1)
191191
} else if v < 0 {
192192
(true, -v as $uxx)
193193
} else {
@@ -339,9 +339,9 @@ impl<'a, 'b: 'a> ser::Serializer for &'a mut Serializer<'b> {
339339
self.extend_from_slice(b"null")
340340
}
341341

342-
fn serialize_some<T: ?Sized>(self, value: &T) -> Result<Self::Ok>
342+
fn serialize_some<T>(self, value: &T) -> Result<Self::Ok>
343343
where
344-
T: ser::Serialize,
344+
T: ser::Serialize + ?Sized,
345345
{
346346
value.serialize(self)
347347
}
@@ -363,22 +363,22 @@ impl<'a, 'b: 'a> ser::Serializer for &'a mut Serializer<'b> {
363363
self.serialize_str(variant)
364364
}
365365

366-
fn serialize_newtype_struct<T: ?Sized>(self, _name: &'static str, value: &T) -> Result<Self::Ok>
366+
fn serialize_newtype_struct<T>(self, _name: &'static str, value: &T) -> Result<Self::Ok>
367367
where
368-
T: ser::Serialize,
368+
T: ser::Serialize + ?Sized,
369369
{
370370
value.serialize(self)
371371
}
372372

373-
fn serialize_newtype_variant<T: ?Sized>(
373+
fn serialize_newtype_variant<T>(
374374
self,
375375
_name: &'static str,
376376
_variant_index: u32,
377377
variant: &'static str,
378378
value: &T,
379379
) -> Result<Self::Ok>
380380
where
381-
T: ser::Serialize,
381+
T: ser::Serialize + ?Sized,
382382
{
383383
self.push(b'{')?;
384384
let mut s = SerializeStruct::new(self);
@@ -441,9 +441,9 @@ impl<'a, 'b: 'a> ser::Serializer for &'a mut Serializer<'b> {
441441
Ok(SerializeStructVariant::new(self))
442442
}
443443

444-
fn collect_str<T: ?Sized>(self, value: &T) -> Result<Self::Ok>
444+
fn collect_str<T>(self, value: &T) -> Result<Self::Ok>
445445
where
446-
T: fmt::Display,
446+
T: fmt::Display + ?Sized,
447447
{
448448
self.push(b'"')?;
449449

@@ -715,7 +715,7 @@ mod tests {
715715

716716
assert_eq!(
717717
&*crate::to_string::<_, N>(&Temperature {
718-
temperature: -2.3456789012345e-23
718+
temperature: -2.345_678_8e-23
719719
})
720720
.unwrap(),
721721
r#"{"temperature":-2.3456788e-23}"#
@@ -871,7 +871,7 @@ mod tests {
871871
{
872872
let mut aux: String<{ N }> = String::new();
873873
write!(aux, "{:.2}", self.0).unwrap();
874-
serializer.serialize_bytes(&aux.as_bytes())
874+
serializer.serialize_bytes(aux.as_bytes())
875875
}
876876
}
877877

@@ -881,7 +881,7 @@ mod tests {
881881
let sd2 = SimpleDecimal(0.000);
882882
assert_eq!(&*crate::to_string::<_, N>(&sd2).unwrap(), r#"0.00"#);
883883

884-
let sd3 = SimpleDecimal(22222.777777);
884+
let sd3 = SimpleDecimal(22_222.777);
885885
assert_eq!(&*crate::to_string::<_, N>(&sd3).unwrap(), r#"22222.78"#);
886886
}
887887
}

Diff for: ‎src/ser/seq.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ impl<'a, 'b: 'a> ser::SerializeSeq for SerializeSeq<'a, 'b> {
1717
type Ok = ();
1818
type Error = Error;
1919

20-
fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<()>
20+
fn serialize_element<T>(&mut self, value: &T) -> Result<()>
2121
where
22-
T: ser::Serialize,
22+
T: ser::Serialize + ?Sized,
2323
{
2424
if !self.first {
2525
self.de.push(b',')?;
@@ -40,9 +40,9 @@ impl<'a, 'b: 'a> ser::SerializeTuple for SerializeSeq<'a, 'b> {
4040
type Ok = ();
4141
type Error = Error;
4242

43-
fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<()>
43+
fn serialize_element<T>(&mut self, value: &T) -> Result<()>
4444
where
45-
T: ser::Serialize,
45+
T: ser::Serialize + ?Sized,
4646
{
4747
ser::SerializeSeq::serialize_element(self, value)
4848
}
@@ -56,9 +56,9 @@ impl<'a, 'b: 'a> ser::SerializeTupleStruct for SerializeSeq<'a, 'b> {
5656
type Ok = ();
5757
type Error = Error;
5858

59-
fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<()>
59+
fn serialize_field<T>(&mut self, value: &T) -> Result<()>
6060
where
61-
T: ser::Serialize,
61+
T: ser::Serialize + ?Sized,
6262
{
6363
ser::SerializeSeq::serialize_element(self, value)
6464
}

Diff for: ‎src/ser/struct_.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ impl<'a, 'b: 'a> ser::SerializeStruct for SerializeStruct<'a, 'b> {
1717
type Ok = ();
1818
type Error = Error;
1919

20-
fn serialize_field<T: ?Sized>(&mut self, key: &'static str, value: &T) -> Result<()>
20+
fn serialize_field<T>(&mut self, key: &'static str, value: &T) -> Result<()>
2121
where
22-
T: ser::Serialize,
22+
T: ser::Serialize + ?Sized,
2323
{
2424
// XXX if `value` is `None` we not produce any output for this field
2525
if !self.first {
@@ -57,9 +57,9 @@ impl<'a, 'b: 'a> ser::SerializeStructVariant for SerializeStructVariant<'a, 'b>
5757
type Ok = ();
5858
type Error = Error;
5959

60-
fn serialize_field<T: ?Sized>(&mut self, key: &'static str, value: &T) -> Result<()>
60+
fn serialize_field<T>(&mut self, key: &'static str, value: &T) -> Result<()>
6161
where
62-
T: ser::Serialize,
62+
T: ser::Serialize + ?Sized,
6363
{
6464
// XXX if `value` is `None` we not produce any output for this field
6565
if !self.first {

0 commit comments

Comments
 (0)