Skip to content

Commit c9f161f

Browse files
ingydotnetingydotnet
committed
Fix all Clippy pedantic lints
1 parent 337c3f8 commit c9f161f

File tree

13 files changed

+39
-48
lines changed

13 files changed

+39
-48
lines changed

‎src/de.rs‎

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,8 @@ impl<'de> Deserializer<'de> {
121121
}
122122

123123
let mut loader = Loader::new(self.progress)?;
124-
let document = match loader.next_document() {
125-
Some(document) => document,
126-
None => return Err(error::new(ErrorImpl::EndOfStream)),
124+
let Some(document) = loader.next_document() else {
125+
return Err(error::new(ErrorImpl::EndOfStream));
127126
};
128127
let t = f(&mut DeserializerFromEvents {
129128
document: &document,
@@ -859,14 +858,11 @@ fn visit_scalar<'de, V>(visitor: V, scalar: &Scalar<'de>, tagged_already: bool)
859858
where
860859
V: Visitor<'de>,
861860
{
862-
let v = match str::from_utf8(&scalar.value) {
863-
Ok(v) => v,
864-
Err(_) => {
865-
return Err(de::Error::invalid_type(
866-
Unexpected::Bytes(&scalar.value),
867-
&visitor,
868-
))
869-
}
861+
let Ok(v) = str::from_utf8(&scalar.value) else {
862+
return Err(de::Error::invalid_type(
863+
Unexpected::Bytes(&scalar.value),
864+
&visitor,
865+
));
870866
};
871867
if let (Some(tag), false) = (&scalar.tag, tagged_already) {
872868
if tag == Tag::BOOL {
@@ -1190,8 +1186,8 @@ fn invalid_type(event: &Event, exp: &dyn Expected) -> Error {
11901186
}
11911187
}
11921188

1193-
fn parse_tag(libyaml_tag: &Option<Tag>) -> Option<&str> {
1194-
let mut bytes: &[u8] = libyaml_tag.as_ref()?;
1189+
fn parse_tag(libyaml_tag: Option<&Tag>) -> Option<&str> {
1190+
let mut bytes: &[u8] = libyaml_tag?;
11951191
if let (b'!', rest) = bytes.split_first()? {
11961192
if !rest.is_empty() {
11971193
bytes = rest;
@@ -1202,7 +1198,7 @@ fn parse_tag(libyaml_tag: &Option<Tag>) -> Option<&str> {
12021198
}
12031199
}
12041200

1205-
impl<'de, 'document> de::Deserializer<'de> for &mut DeserializerFromEvents<'de, 'document> {
1201+
impl<'de> de::Deserializer<'de> for &mut DeserializerFromEvents<'de, '_> {
12061202
type Error = Error;
12071203

12081204
fn deserialize_any<V>(self, visitor: V) -> Result<V::Value>
@@ -1211,7 +1207,7 @@ impl<'de, 'document> de::Deserializer<'de> for &mut DeserializerFromEvents<'de,
12111207
{
12121208
let tagged_already = self.current_enum.is_some();
12131209
let (next, mark) = self.next_event_mark()?;
1214-
fn enum_tag(tag: &Option<Tag>, tagged_already: bool) -> Option<&str> {
1210+
fn enum_tag(tag: Option<&Tag>, tagged_already: bool) -> Option<&str> {
12151211
if tagged_already {
12161212
return None;
12171213
}
@@ -1221,7 +1217,7 @@ impl<'de, 'document> de::Deserializer<'de> for &mut DeserializerFromEvents<'de,
12211217
match next {
12221218
Event::Alias(mut pos) => break self.jump(&mut pos)?.deserialize_any(visitor),
12231219
Event::Scalar(scalar) => {
1224-
if let Some(tag) = enum_tag(&scalar.tag, tagged_already) {
1220+
if let Some(tag) = enum_tag(scalar.tag.as_ref(), tagged_already) {
12251221
*self.pos -= 1;
12261222
break visitor.visit_enum(EnumAccess {
12271223
de: self,
@@ -1232,7 +1228,7 @@ impl<'de, 'document> de::Deserializer<'de> for &mut DeserializerFromEvents<'de,
12321228
break visit_scalar(visitor, scalar, tagged_already);
12331229
}
12341230
Event::SequenceStart(sequence) => {
1235-
if let Some(tag) = enum_tag(&sequence.tag, tagged_already) {
1231+
if let Some(tag) = enum_tag(sequence.tag.as_ref(), tagged_already) {
12361232
*self.pos -= 1;
12371233
break visitor.visit_enum(EnumAccess {
12381234
de: self,
@@ -1243,7 +1239,7 @@ impl<'de, 'document> de::Deserializer<'de> for &mut DeserializerFromEvents<'de,
12431239
break self.visit_sequence(visitor, mark);
12441240
}
12451241
Event::MappingStart(mapping) => {
1246-
if let Some(tag) = enum_tag(&mapping.tag, tagged_already) {
1242+
if let Some(tag) = enum_tag(mapping.tag.as_ref(), tagged_already) {
12471243
*self.pos -= 1;
12481244
break visitor.visit_enum(EnumAccess {
12491245
de: self,
@@ -1739,7 +1735,7 @@ impl<'de, 'document> de::Deserializer<'de> for &mut DeserializerFromEvents<'de,
17391735
.deserialize_enum(name, variants, visitor)
17401736
}
17411737
Event::Scalar(scalar) => {
1742-
if let Some(tag) = parse_tag(&scalar.tag) {
1738+
if let Some(tag) = parse_tag(scalar.tag.as_ref()) {
17431739
return visitor.visit_enum(EnumAccess {
17441740
de: self,
17451741
name: Some(name),
@@ -1749,7 +1745,7 @@ impl<'de, 'document> de::Deserializer<'de> for &mut DeserializerFromEvents<'de,
17491745
visitor.visit_enum(UnitVariantAccess { de: self })
17501746
}
17511747
Event::MappingStart(mapping) => {
1752-
if let Some(tag) = parse_tag(&mapping.tag) {
1748+
if let Some(tag) = parse_tag(mapping.tag.as_ref()) {
17531749
return visitor.visit_enum(EnumAccess {
17541750
de: self,
17551751
name: Some(name),
@@ -1761,7 +1757,7 @@ impl<'de, 'document> de::Deserializer<'de> for &mut DeserializerFromEvents<'de,
17611757
Err(error::fix_mark(err, mark, self.path))
17621758
}
17631759
Event::SequenceStart(sequence) => {
1764-
if let Some(tag) = parse_tag(&sequence.tag) {
1760+
if let Some(tag) = parse_tag(sequence.tag.as_ref()) {
17651761
return visitor.visit_enum(EnumAccess {
17661762
de: self,
17671763
name: Some(name),

‎src/libyaml/cstr.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ impl Display for CStr<'_> {
5353
}
5454
}
5555

56-
impl<'a> Debug for CStr<'a> {
56+
impl Debug for CStr<'_> {
5757
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
5858
let ptr = self.ptr.as_ptr();
5959
let len = self.len();

‎src/libyaml/emitter.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ unsafe fn write_handler(data: *mut c_void, buffer: *mut u8, size: u64) -> i32 {
210210
}
211211
}
212212

213-
impl<'a> Drop for EmitterPinned<'a> {
213+
impl Drop for EmitterPinned<'_> {
214214
fn drop(&mut self) {
215215
unsafe { sys::yaml_emitter_delete(&mut self.sys) }
216216
}

‎src/libyaml/error.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ impl Error {
1919
pub unsafe fn parse_error(parser: *const sys::yaml_parser_t) -> Self {
2020
Error {
2121
kind: unsafe { (&(*parser)).error },
22-
problem: match NonNull::new(unsafe { (&(*parser)).problem as *mut _ }) {
22+
problem: match NonNull::new(unsafe { (&(*parser)).problem.cast_mut() }) {
2323
Some(problem) => unsafe { CStr::from_ptr(problem) },
2424
None => CStr::from_bytes_with_nul(b"libyaml parser failed but there is no error\0"),
2525
},
2626
problem_offset: unsafe { (&(*parser)).problem_offset },
2727
problem_mark: Mark {
2828
sys: unsafe { (&(*parser)).problem_mark },
2929
},
30-
context: match NonNull::new(unsafe { (&(*parser)).context as *mut _ }) {
30+
context: match NonNull::new(unsafe { (&(*parser)).context.cast_mut() }) {
3131
Some(context) => Some(unsafe { CStr::from_ptr(context) }),
3232
None => None,
3333
},
@@ -40,7 +40,7 @@ impl Error {
4040
pub unsafe fn emit_error(emitter: *const sys::yaml_emitter_t) -> Self {
4141
Error {
4242
kind: unsafe { (&(*emitter)).error },
43-
problem: match NonNull::new(unsafe { (&(*emitter)).problem as *mut _ }) {
43+
problem: match NonNull::new(unsafe { (&(*emitter)).problem.cast_mut() }) {
4444
Some(problem) => unsafe { CStr::from_ptr(problem) },
4545
None => {
4646
CStr::from_bytes_with_nul(b"libyaml emitter failed but there is no error\0")

‎src/loader.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@ impl<'input> Loader<'input> {
4141
}
4242

4343
pub fn next_document(&mut self) -> Option<Document<'input>> {
44-
let parser = match &mut self.parser {
45-
Some(parser) => parser,
46-
None => return None,
44+
let Some(parser) = &mut self.parser else {
45+
return None;
4746
};
4847

4948
let first = self.document_count == 0;

‎src/mapping.rs‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -451,20 +451,16 @@ impl PartialOrd for Mapping {
451451
let mut other = other.into_iter();
452452

453453
loop {
454-
let x = match this.next() {
455-
None => {
456-
if other.next().is_none() {
457-
return Ordering::Equal;
458-
} else {
459-
return Ordering::Less;
460-
}
454+
let Some(x) = this.next() else {
455+
if other.next().is_none() {
456+
return Ordering::Equal;
457+
} else {
458+
return Ordering::Less;
461459
}
462-
Some(val) => val,
463460
};
464461

465-
let y = match other.next() {
466-
None => return Ordering::Greater,
467-
Some(val) => val,
462+
let Some(y) = other.next() else {
463+
return Ordering::Greater;
468464
};
469465

470466
match cmp(x, y) {

‎src/path.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ pub enum Path<'a> {
1010
Unknown { parent: &'a Path<'a> },
1111
}
1212

13-
impl<'a> Display for Path<'a> {
13+
impl Display for Path<'_> {
1414
fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
1515
struct Parent<'a>(&'a Path<'a>);
1616

17-
impl<'a> Display for Parent<'a> {
17+
impl Display for Parent<'_> {
1818
fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
1919
match self.0 {
2020
Path::Root => Ok(()),

‎src/ser.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ where
308308
fn serialize_str(self, value: &str) -> Result<()> {
309309
struct InferScalarStyle;
310310

311-
impl<'de> Visitor<'de> for InferScalarStyle {
311+
impl Visitor<'_> for InferScalarStyle {
312312
type Value = ScalarStyle;
313313

314314
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {

‎src/value/de.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ struct EnumDeserializer<'a> {
492492
value: Option<Value>,
493493
}
494494

495-
impl<'a, 'de> EnumAccess<'de> for EnumDeserializer<'a> {
495+
impl<'de> EnumAccess<'de> for EnumDeserializer<'_> {
496496
type Error = Error;
497497
type Variant = VariantDeserializer;
498498

‎src/value/debug.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ impl Debug for Value {
2121

2222
struct DisplayNumber<'a>(&'a Number);
2323

24-
impl<'a> Debug for DisplayNumber<'a> {
24+
impl Debug for DisplayNumber<'_> {
2525
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
2626
Display::fmt(self.0, formatter)
2727
}

0 commit comments

Comments
 (0)