Skip to content

Commit c0a9406

Browse files
committed
Fix clippy warnings
1 parent fb270ef commit c0a9406

File tree

6 files changed

+10
-14
lines changed

6 files changed

+10
-14
lines changed

src/common.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ macro_rules! werr {
1515
}
1616

1717
pub(crate) fn to_utf16<P: AsRef<OsStr>>(s: P) -> Vec<u16> {
18-
s.as_ref()
19-
.encode_wide()
20-
.chain(Some(0).into_iter())
21-
.collect()
18+
s.as_ref().encode_wide().chain(Some(0)).collect()
2219
}
2320

2421
pub(crate) fn v16_to_v8(v: &[u16]) -> Vec<u8> {

src/decoder/serialization_serde.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ impl Error for DecoderError {
1414
}
1515
}
1616

17-
impl<'de, 'a> Deserializer<'de> for &'a mut Decoder {
17+
impl<'de> Deserializer<'de> for &mut Decoder {
1818
type Error = DecoderError;
1919
fn deserialize_any<V>(self, visitor: V) -> DecodeResult<V::Value>
2020
where

src/encoder/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ impl Encoder<&Transaction> {
101101
key: &RegKey,
102102
tr: &'a Transaction,
103103
) -> EncodeResult<Encoder<&'a Transaction>> {
104-
key.open_subkey_transacted_with_flags("", &tr, ENCODER_SAM)
104+
key.open_subkey_transacted_with_flags("", tr, ENCODER_SAM)
105105
.map(|k| Encoder::new_transacted(k, tr))
106106
.map_err(EncoderError::IoError)
107107
}

src/encoder/serialization_serde.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -458,9 +458,9 @@ impl serde::Serializer for MapKeySerializer {
458458
Err(EncoderError::KeyMustBeAString)
459459
}
460460

461-
fn collect_str<T: ?Sized>(self, value: &T) -> EncodeResult<String>
461+
fn collect_str<T>(self, value: &T) -> EncodeResult<String>
462462
where
463-
T: fmt::Display,
463+
T: fmt::Display + ?Sized,
464464
{
465465
Ok(value.to_string())
466466
}
@@ -471,7 +471,7 @@ pub struct StructMapEncoder<'a, Tr: AsRef<Transaction>> {
471471
is_root: bool,
472472
}
473473

474-
impl<'a, Tr: AsRef<Transaction>> SerializeStruct for StructMapEncoder<'a, Tr> {
474+
impl<Tr: AsRef<Transaction>> SerializeStruct for StructMapEncoder<'_, Tr> {
475475
type Ok = ();
476476
type Error = EncoderError;
477477

@@ -492,7 +492,7 @@ impl<'a, Tr: AsRef<Transaction>> SerializeStruct for StructMapEncoder<'a, Tr> {
492492
}
493493
}
494494

495-
impl<'a, Tr: AsRef<Transaction>> SerializeMap for StructMapEncoder<'a, Tr> {
495+
impl<Tr: AsRef<Transaction>> SerializeMap for StructMapEncoder<'_, Tr> {
496496
type Ok = ();
497497
type Error = EncoderError;
498498

src/reg_key.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ impl RegKey {
670670
match unsafe {
671671
winapi_reg::RegQueryValueExW(
672672
self.hkey,
673-
c_name.as_ptr() as *const u16,
673+
c_name.as_ptr(),
674674
ptr::null_mut(),
675675
&mut buf_type,
676676
buf.as_mut_ptr() as LPBYTE,
@@ -1020,7 +1020,7 @@ pub struct EnumKeys<'key> {
10201020
index: DWORD,
10211021
}
10221022

1023-
impl<'key> Iterator for EnumKeys<'key> {
1023+
impl Iterator for EnumKeys<'_> {
10241024
type Item = io::Result<String>;
10251025

10261026
fn next(&mut self) -> Option<io::Result<String>> {
@@ -1045,7 +1045,7 @@ pub struct EnumValues<'key> {
10451045
index: DWORD,
10461046
}
10471047

1048-
impl<'key> Iterator for EnumValues<'key> {
1048+
impl Iterator for EnumValues<'_> {
10491049
type Item = io::Result<(String, RegValue)>;
10501050

10511051
fn next(&mut self) -> Option<io::Result<(String, RegValue)>> {

src/transaction.rs

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
//! }
3838
//!}
3939
//!```
40-
#![cfg(feature = "transactions")]
4140
use std::io;
4241
use std::ptr;
4342
use winapi::um::handleapi;

0 commit comments

Comments
 (0)