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

Commit 431671f1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clippy lint fixes for rustc 1.88.0" into main

parents e4db7bfe ef835447

libs/native_activity_thread/src/lib.rs

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ pub fn run_native_activity_thread(start_seq: i64) -> ! { 
            .with_tag_on_device("native_activity_thread")

            .with_max_level(LevelFilter::Trace),

    );

    info!("Hello from the native activity thread! start_seq={}", start_seq);

    info!("Hello from the native activity thread! start_seq={start_seq}");



    // TODO(b/402614577): Implement the ActivityThread logic.

libs/native_activity_thread/src/task.rs

+2 −2
Original line number Diff line number Diff line
@@ -207,12 +207,12 @@ impl<T: Send, C: HandlerCallback<T>> Handler<T, C> { 
            unsafe { libc::eventfd_read(inner.event_fd.as_raw_fd(), val.as_mut_ptr()) }

        );

        if let Err(e) = res {

            panic!("Failed to read from the event fd: {}", e);

            panic!("Failed to read from the event fd: {e}");

        }



        let res = inner.handle_tasks();

        if let Err(e) = res {

            panic!("Failed to handle a task: {}", e);

            panic!("Failed to handle a task: {e}");

        }

        ALOOPER_CALLBACK_FUNC_RETURN_VALUE_CONTINUE

    }