Skip to content

Commit 836c2ce

Browse files
authored
chore: bump Rust toolchain to 1.85.0 (#383)
1 parent 39ca9a8 commit 836c2ce

File tree

16 files changed

+30
-31
lines changed

16 files changed

+30
-31
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/dpapi/src/rpc/pdu.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ pub struct DataRepr {
147147

148148
impl Encode for DataRepr {
149149
fn encode(&self, mut writer: impl Write) -> Result<()> {
150-
let first_octet = (self.byte_order.as_u8()) << 4 | self.character.as_u8();
150+
let first_octet = ((self.byte_order.as_u8()) << 4) | self.character.as_u8();
151151
writer.write_u8(first_octet)?;
152152
writer.write_u8(self.floating_point.as_u8())?;
153153

crates/winscard/src/scard.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ enum SCardState {
480480
PinVerified,
481481
}
482482

483-
impl<'a> WinScard for SmartCard<'a> {
483+
impl WinScard for SmartCard<'_> {
484484
fn status(&self) -> WinScardResult<winscard::Status> {
485485
Ok(winscard::Status {
486486
readers: vec![self.reader_name.clone()],

crates/winscard/src/scard_context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ impl<'a> ScardContext<'a> {
394394
}
395395
}
396396

397-
impl<'a> WinScardContext for ScardContext<'a> {
397+
impl WinScardContext for ScardContext<'_> {
398398
fn connect(
399399
&self,
400400
reader_name: &str,

crates/winscard/src/winscard.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ impl From<[u8; 17]> for Atr {
208208
#[derive(Debug, Clone)]
209209
pub struct Icon<'a>(Cow<'a, [u8]>);
210210

211-
impl<'a> AsRef<[u8]> for Icon<'a> {
211+
impl AsRef<[u8]> for Icon<'_> {
212212
fn as_ref(&self) -> &[u8] {
213213
self.0.as_ref()
214214
}
@@ -439,7 +439,7 @@ pub struct Status<'a> {
439439
pub atr: Atr,
440440
}
441441

442-
impl<'a> Status<'a> {
442+
impl Status<'_> {
443443
/// Returns owned [Status].
444444
pub fn into_owned(self) -> Status<'static> {
445445
let Status {

ffi/src/sspi/sec_handle.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ impl SspiImpl for SspiHandle {
115115
fn initialize_security_context_impl<'a>(
116116
&'a mut self,
117117
builder: &'a mut sspi::builders::FilledInitializeSecurityContext<'a, Self::CredentialsHandle>,
118-
) -> Result<sspi::generator::GeneratorInitSecurityContext> {
118+
) -> Result<sspi::generator::GeneratorInitSecurityContext<'a>> {
119119
let mut context = self.sspi_context.lock()?;
120120
Ok(context.initialize_security_context_sync(builder).into())
121121
}
@@ -187,7 +187,7 @@ impl Sspi for SspiHandle {
187187
fn change_password<'a>(
188188
&'a mut self,
189189
change_password: sspi::builders::ChangePassword<'a>,
190-
) -> Result<sspi::generator::GeneratorChangePassword> {
190+
) -> Result<sspi::generator::GeneratorChangePassword<'a>> {
191191
let mut context = self.sspi_context.lock()?;
192192
Ok(context.change_password_sync(change_password).into())
193193
}

ffi/src/sspi/sec_pkg_info.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ pub unsafe extern "system" fn EnumerateSecurityPackagesA(
167167
let mut size = size_of::<SecPkgInfoA>() * packages.len();
168168

169169
for package in &packages {
170-
size += package.name.as_ref().as_bytes().len() + 1 /* null byte */ + package.comment.as_bytes().len() + 1 /* null byte */;
170+
size += package.name.as_ref().len() + 1 /* null byte */ + package.comment.len() + 1 /* null byte */;
171171
}
172172

173173
let raw_packages = libc::malloc(size);

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "1.82.0"
2+
channel = "1.85.0"
33
components = [ "rustfmt", "clippy" ]

src/builders/acq_cred_handle.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ where
5252
pub auth_data: Option<&'a AuthData>,
5353
}
5454

55-
impl<'a, CredsHandle, AuthData, CredentialUseSet> Debug
56-
for AcquireCredentialsHandle<'a, CredsHandle, AuthData, CredentialUseSet>
55+
impl<CredsHandle, AuthData, CredentialUseSet> Debug
56+
for AcquireCredentialsHandle<'_, CredsHandle, AuthData, CredentialUseSet>
5757
where
5858
CredentialUseSet: ToAssign,
5959
AuthData: Debug,
@@ -128,8 +128,8 @@ where
128128
}
129129
}
130130

131-
impl<'a, CredsHandle, AuthData, CredentialUseSet> Default
132-
for AcquireCredentialsHandle<'a, CredsHandle, AuthData, CredentialUseSet>
131+
impl<CredsHandle, AuthData, CredentialUseSet> Default
132+
for AcquireCredentialsHandle<'_, CredsHandle, AuthData, CredentialUseSet>
133133
where
134134
CredentialUseSet: ToAssign,
135135
{
@@ -157,7 +157,7 @@ impl<'b, 'a: 'b, CredsHandle, AuthData> FilledAcquireCredentialsHandle<'a, Creds
157157
}
158158
}
159159

160-
impl<'a, CredsHandle, AuthData> FilledAcquireCredentialsHandle<'a, CredsHandle, AuthData> {
160+
impl<CredsHandle, AuthData> FilledAcquireCredentialsHandle<'_, CredsHandle, AuthData> {
161161
/// Executes the SSPI function that the builder represents.
162162
pub fn execute(
163163
self,

src/builders/change_password.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ impl<'a> ChangePasswordBuilder<'a> {
102102
}
103103
}
104104

105-
impl<'a> Default for ChangePasswordBuilder<'a> {
105+
impl Default for ChangePasswordBuilder<'_> {
106106
fn default() -> Self {
107107
Self::new()
108108
}

0 commit comments

Comments
 (0)