diff options
| author | 2023-01-21 03:03:12 +0000 | |
|---|---|---|
| committer | 2023-01-21 03:03:12 +0000 | |
| commit | 492cf57ab68bdcedb6f3985433183cb5ed15e697 (patch) | |
| tree | 822e943db5b527ecb0cc819a1a6fb60c2b9e40b4 | |
| parent | 64e5571e62a0b7ad4c346cf785af94638e7f6776 (diff) | |
| parent | 805c23c84062a5140836ac7b86d9ff5657afb09f (diff) | |
Merge "Import macro directly rather than using #[macro_use]." am: d30f808195 am: 9b495caabc am: 805c23c840
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2392889
Change-Id: Id06f5a1b2e31b6be21a2ef85db547a12a42adbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
3 files changed, 4 insertions, 9 deletions
diff --git a/libs/binder/rust/src/lib.rs b/libs/binder/rust/src/lib.rs index a0e61d95f9..0c8b48f1f5 100644 --- a/libs/binder/rust/src/lib.rs +++ b/libs/binder/rust/src/lib.rs @@ -94,14 +94,12 @@ //! ``` #[macro_use] -mod proxy; - -#[macro_use] mod binder; mod binder_async; mod error; mod native; mod parcel; +mod proxy; mod state; use binder_ndk_sys as sys; diff --git a/libs/binder/rust/tests/parcel_fuzzer/parcel_fuzzer.rs b/libs/binder/rust/tests/parcel_fuzzer/parcel_fuzzer.rs index c5c7719df2..29bf92cb97 100644 --- a/libs/binder/rust/tests/parcel_fuzzer/parcel_fuzzer.rs +++ b/libs/binder/rust/tests/parcel_fuzzer/parcel_fuzzer.rs @@ -17,9 +17,6 @@ #![allow(missing_docs)] #![no_main] -#[macro_use] -extern crate libfuzzer_sys; - mod read_utils; use crate::read_utils::READ_FUNCS; @@ -31,7 +28,7 @@ use binder::{ StatusCode, }; use binder_random_parcel_rs::create_random_parcel; -use libfuzzer_sys::arbitrary::Arbitrary; +use libfuzzer_sys::{arbitrary::Arbitrary, fuzz_target}; #[derive(Arbitrary, Debug)] enum ReadOperation { diff --git a/libs/binder/rust/tests/parcel_fuzzer/random_parcel/fuzz_service_test/service_fuzzer.rs b/libs/binder/rust/tests/parcel_fuzzer/random_parcel/fuzz_service_test/service_fuzzer.rs index a427f28e29..c53038210c 100644 --- a/libs/binder/rust/tests/parcel_fuzzer/random_parcel/fuzz_service_test/service_fuzzer.rs +++ b/libs/binder/rust/tests/parcel_fuzzer/random_parcel/fuzz_service_test/service_fuzzer.rs @@ -16,8 +16,8 @@ #![allow(missing_docs)] #![no_main] -#[macro_use] -extern crate libfuzzer_sys; + +use libfuzzer_sys::fuzz_target; use binder::{self, BinderFeatures, Interface}; use binder_random_parcel_rs::fuzz_service; |