summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chris Wailes <chriswailes@google.com> 2025-01-06 14:15:30 -0800
committer Chris Wailes <chriswailes@google.com> 2025-01-15 17:06:03 -0800
commit67add89955e1d5e64835d74861397eee8cc11143 (patch)
treea5f586d69196a9143d9c78ad81d28ef7fca96090
parente52da38516e7a580de8b914b4177f1fd63264ef1 (diff)
Code changes for Rust 1.83.0
Test: m rust Bug: 384401387 Change-Id: I647a63976830e5071cb4dac8c0480a00ecf4d973
-rw-r--r--system/rust/src/core/shared_box.rs6
-rw-r--r--tools/rootcanal/rust/src/lmp/procedure/mod.rs4
2 files changed, 5 insertions, 5 deletions
diff --git a/system/rust/src/core/shared_box.rs b/system/rust/src/core/shared_box.rs
index 5dd1118185..accd1ae6ec 100644
--- a/system/rust/src/core/shared_box.rs
+++ b/system/rust/src/core/shared_box.rs
@@ -79,7 +79,7 @@ impl<T: ?Sized> Clone for WeakBox<T> {
/// A strong reference to the contents within a SharedBox<>.
pub struct WeakBoxRef<'a, T: ?Sized>(&'a T, Weak<T>);
-impl<'a, T: ?Sized> WeakBoxRef<'a, T> {
+impl<T: ?Sized> WeakBoxRef<'_, T> {
/// Downgrade to a weak reference (with static lifetime) to the contents
/// within the underlying SharedBox<>
pub fn downgrade(&self) -> WeakBox<T> {
@@ -87,7 +87,7 @@ impl<'a, T: ?Sized> WeakBoxRef<'a, T> {
}
}
-impl<'a, T: ?Sized> Deref for WeakBoxRef<'a, T> {
+impl<T: ?Sized> Deref for WeakBoxRef<'_, T> {
type Target = T;
fn deref(&self) -> &Self::Target {
@@ -95,7 +95,7 @@ impl<'a, T: ?Sized> Deref for WeakBoxRef<'a, T> {
}
}
-impl<'a, T: ?Sized> Clone for WeakBoxRef<'a, T> {
+impl<T: ?Sized> Clone for WeakBoxRef<'_, T> {
fn clone(&self) -> Self {
Self(self.0, self.1.clone())
}
diff --git a/tools/rootcanal/rust/src/lmp/procedure/mod.rs b/tools/rootcanal/rust/src/lmp/procedure/mod.rs
index 5f93e62da9..d73c5d39e9 100644
--- a/tools/rootcanal/rust/src/lmp/procedure/mod.rs
+++ b/tools/rootcanal/rust/src/lmp/procedure/mod.rs
@@ -66,7 +66,7 @@ pub trait Context {
/// Future for Context::receive_hci_command and Context::receive_lmp_packet
pub struct ReceiveFuture<'a, C: ?Sized, P>(fn(&'a C) -> Poll<P>, &'a C);
-impl<'a, C, O> Future for ReceiveFuture<'a, C, O>
+impl<C, O> Future for ReceiveFuture<'_, C, O>
where
C: Context,
{
@@ -80,7 +80,7 @@ where
/// Future for Context::receive_hci_command and Context::receive_lmp_packet
pub struct SendAcceptedLmpPacketFuture<'a, C: ?Sized>(&'a C, lmp::Opcode);
-impl<'a, C> Future for SendAcceptedLmpPacketFuture<'a, C>
+impl<C> Future for SendAcceptedLmpPacketFuture<'_, C>
where
C: Context,
{