From 4c56ed728c05e5b15691b002cc95ecbcb376fb0d Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Sat, 21 Oct 2023 11:26:09 +0700 Subject: [PATCH] Remove most usages of "extern crate". --- benches/bench.rs | 4 +--- fuzz/fuzz_targets/smallvec_ops.rs | 10 ++-------- src/lib.rs | 15 +++++---------- src/tests.rs | 5 +---- 4 files changed, 9 insertions(+), 25 deletions(-) diff --git a/benches/bench.rs b/benches/bench.rs index b52ee15..b6a8b85 100644 --- a/benches/bench.rs +++ b/benches/bench.rs @@ -1,12 +1,10 @@ #![feature(test)] #![allow(deprecated)] -#[macro_use] -extern crate smallvec; extern crate test; use self::test::Bencher; -use smallvec::{ExtendFromSlice, SmallVec}; +use smallvec::{ExtendFromSlice, smallvec, SmallVec}; const VEC_SIZE: usize = 16; const SPILLED_SIZE: usize = 100; diff --git a/fuzz/fuzz_targets/smallvec_ops.rs b/fuzz/fuzz_targets/smallvec_ops.rs index b5c932e..4e622f3 100644 --- a/fuzz/fuzz_targets/smallvec_ops.rs +++ b/fuzz/fuzz_targets/smallvec_ops.rs @@ -177,12 +177,9 @@ fn do_test_all(data: &[u8]) { do_test::<[u8; 8]>(data); } -#[cfg(feature = "afl")] -#[macro_use] -extern crate afl; #[cfg(feature = "afl")] fn main() { - fuzz!(|data| { + afl::fuzz!(|data| { // Remove the panic hook so we can actually catch panic // See https://github.com/rust-fuzz/afl.rs/issues/150 std::panic::set_hook(Box::new(|_| {})); @@ -190,13 +187,10 @@ fn main() { }); } -#[cfg(feature = "honggfuzz")] -#[macro_use] -extern crate honggfuzz; #[cfg(feature = "honggfuzz")] fn main() { loop { - fuzz!(|data| { + honggfuzz::fuzz!(|data| { // Remove the panic hook so we can actually catch panic // See https://github.com/rust-fuzz/afl.rs/issues/150 std::panic::set_hook(Box::new(|_| {})); diff --git a/src/lib.rs b/src/lib.rs index c37e0ef..1199adc 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -149,8 +149,7 @@ use core::mem::ManuallyDrop; /// - Create a [`SmallVec`] containing a given list of elements: /// /// ``` -/// # #[macro_use] extern crate smallvec; -/// # use smallvec::SmallVec; +/// # use smallvec::{smallvec, SmallVec}; /// # fn main() { /// let v: SmallVec<[_; 128]> = smallvec![1, 2, 3]; /// assert_eq!(v[0], 1); @@ -162,8 +161,7 @@ use core::mem::ManuallyDrop; /// - Create a [`SmallVec`] from a given element and size: /// /// ``` -/// # #[macro_use] extern crate smallvec; -/// # use smallvec::SmallVec; +/// # use smallvec::{smallvec, SmallVec}; /// # fn main() { /// let v: SmallVec<[_; 0x8000]> = smallvec![1; 3]; /// assert_eq!(v, SmallVec::from_buf([1, 1, 1])); @@ -209,8 +207,7 @@ macro_rules! smallvec { /// - Create a [`SmallVec`] containing a given list of elements: /// /// ``` -/// # #[macro_use] extern crate smallvec; -/// # use smallvec::SmallVec; +/// # use smallvec::{smallvec_inline, SmallVec}; /// # fn main() { /// const V: SmallVec<[i32; 3]> = smallvec_inline![1, 2, 3]; /// assert_eq!(V[0], 1); @@ -222,8 +219,7 @@ macro_rules! smallvec { /// - Create a [`SmallVec`] from a given element and size: /// /// ``` -/// # #[macro_use] extern crate smallvec; -/// # use smallvec::SmallVec; +/// # use smallvec::{smallvec_inline, SmallVec}; /// # fn main() { /// const V: SmallVec<[i32; 3]> = smallvec_inline![1; 3]; /// assert_eq!(V, SmallVec::from_buf([1, 1, 1])); @@ -1666,8 +1662,7 @@ impl SmallVec { /// # Examples /// /// ``` - /// # #[macro_use] extern crate smallvec; - /// # use smallvec::SmallVec; + /// # use smallvec::{smallvec, SmallVec}; /// use std::mem; /// use std::ptr; /// diff --git a/src/tests.rs b/src/tests.rs index 698f453..936ad6f 100644 --- a/src/tests.rs +++ b/src/tests.rs @@ -832,13 +832,10 @@ fn test_write() { assert_eq!(small_vec.as_ref(), data.as_ref()); } -#[cfg(feature = "serde")] -extern crate bincode; - #[cfg(feature = "serde")] #[test] fn test_serde() { - use self::bincode::{config, deserialize}; + use bincode::{config, deserialize}; let mut small_vec: SmallVec<[i32; 2]> = SmallVec::new(); small_vec.push(1); let encoded = config().limit(100).serialize(&small_vec).unwrap();