Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79179ac7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix warnings from rustc 1.65.0"

parents b2a8f076 3c01eca6

tools/pdl/src/test_utils.rs

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ pub fn assert_contains(haystack: &str, needle: &str) { 
#[track_caller]

pub fn assert_snapshot_eq<P: AsRef<Path>>(snapshot_path: P, actual_content: &str) {

    let snapshot = snapshot_path.as_ref();

    let snapshot_content = fs::read(&snapshot).unwrap_or_else(|err| {

    let snapshot_content = fs::read(snapshot).unwrap_or_else(|err| {

        panic!("Could not read snapshot from {}: {}", snapshot.display(), err)

    });

    let snapshot_content = String::from_utf8(snapshot_content).expect("Snapshot was not UTF-8");

tools/rootcanal/lmp/src/manager.rs

+2 −2
Original line number Diff line number Diff line
@@ -195,13 +195,13 @@ impl procedure::Context for LinkContext { 


    fn send_hci_event<E: Into<hci::EventPacket>>(&self, event: E) {

        if let Some(manager) = self.manager.upgrade() {

            manager.ops.send_hci_event(&*event.into().to_vec())

            manager.ops.send_hci_event(&event.into().to_vec())

        }

    }



    fn send_lmp_packet<P: Into<lmp::PacketPacket>>(&self, packet: P) {

        if let Some(manager) = self.manager.upgrade() {

            manager.ops.send_lmp_packet(self.peer_address(), &*packet.into().to_vec())

            manager.ops.send_lmp_packet(self.peer_address(), &packet.into().to_vec())

        }

    }