Fix imports

Author: Fedor Ryabinin

library/alloc/src/boxed/convert.rs

@@ -1,19 +1,19 @@
 #![feature(ub_checks)]
+use core::any::Any;
+use core::error::Error;
 #[cfg(kani)]
 #[unstable(feature = "kani", issue = "none")]
 use core::kani;
+use core::mem;
+use core::pin::Pin;
 #[allow(unused_imports)]
 #[unstable(feature = "ub_checks", issue = "none")]
 use core::ub_checks::*;
-use safety::{ensures, requires};
-
-use core::any::Any;
-use core::error::Error;
-use core::mem;
-use core::pin::Pin;
 #[cfg(not(no_global_oom_handling))]
 use core::{fmt, ptr};
 
+use safety::{ensures, requires};
+
 use crate::alloc::Allocator;
 #[cfg(not(no_global_oom_handling))]
 use crate::borrow::Cow;

library/alloc/src/collections/vec_deque/drain.rs

@@ -1,18 +1,18 @@
 #![feature(ub_checks)]
+use core::iter::FusedIterator;
 #[cfg(kani)]
 #[unstable(feature = "kani", issue = "none")]
 use core::kani;
-#[allow(unused_imports)]
-#[unstable(feature = "ub_checks", issue = "none")]
-use core::ub_checks::*;
-use safety::{ensures, requires};
-
-use core::iter::FusedIterator;
 use core::marker::PhantomData;
 use core::mem::{self, SizedTypeProperties};
 use core::ptr::NonNull;
+#[allow(unused_imports)]
+#[unstable(feature = "ub_checks", issue = "none")]
+use core::ub_checks::*;
 use core::{fmt, ptr};
 
+use safety::{ensures, requires};
+
 use super::VecDeque;
 use crate::alloc::{Allocator, Global};
 

library/alloc/src/str.rs

@@ -8,16 +8,11 @@
 // It's cleaner to just turn off the unused_imports warning than to fix them.
 #![allow(unused_imports)]
 
+use core::borrow::{Borrow, BorrowMut};
+use core::iter::FusedIterator;
 #[cfg(kani)]
 #[unstable(feature = "kani", issue = "none")]
 use core::kani;
-#[allow(unused_imports)]
-#[unstable(feature = "ub_checks", issue = "none")]
-use core::ub_checks::*;
-use safety::{ensures, requires};
-
-use core::borrow::{Borrow, BorrowMut};
-use core::iter::FusedIterator;
 use core::mem::MaybeUninit;
 #[stable(feature = "encode_utf16", since = "1.8.0")]
 pub use core::str::EncodeUtf16;
@@ -55,9 +50,14 @@ pub use core::str::{RSplitTerminator, SplitTerminator};
 pub use core::str::{Utf8Chunk, Utf8Chunks};
 #[unstable(feature = "str_from_raw_parts", issue = "119206")]
 pub use core::str::{from_raw_parts, from_raw_parts_mut};
+#[allow(unused_imports)]
+#[unstable(feature = "ub_checks", issue = "none")]
+use core::ub_checks::*;
 use core::unicode::conversions;
 use core::{mem, ptr};
 
+use safety::{ensures, requires};
+
 use crate::borrow::ToOwned;
 use crate::boxed::Box;
 use crate::slice::{Concat, Join, SliceIndex};

library/alloc/src/task.rs

@@ -11,15 +11,15 @@
 #[cfg(kani)]
 #[unstable(feature = "kani", issue = "none")]
 use core::kani;
-#[allow(unused_imports)]
-#[unstable(feature = "ub_checks", issue = "none")]
-use core::ub_checks::*;
-use safety::{ensures, requires};
-
 use core::mem::ManuallyDrop;
 #[cfg(target_has_atomic = "ptr")]
 use core::task::Waker;
 use core::task::{LocalWaker, RawWaker, RawWakerVTable};
+#[allow(unused_imports)]
+#[unstable(feature = "ub_checks", issue = "none")]
+use core::ub_checks::*;
+
+use safety::{ensures, requires};
 
 use crate::rc::Rc;
 #[cfg(target_has_atomic = "ptr")]

library/alloc/src/vec/spec_from_elem.rs

@@ -1,15 +1,14 @@
 #![feature(ub_checks)]
-use core::ub_checks::Invariant;
-
 #[cfg(kani)]
 #[unstable(feature = "kani", issue = "none")]
 use core::kani;
+use core::ptr;
+use core::ub_checks::Invariant;
 #[allow(unused_imports)]
 #[unstable(feature = "ub_checks", issue = "none")]
 use core::ub_checks::*;
-use safety::{ensures, requires};
 
-use core::ptr;
+use safety::{ensures, requires};
 
 use super::{IsZero, Vec};
 use crate::alloc::Allocator;

library/alloctests/benches/vec_deque.rs

@@ -1,17 +1,15 @@
 #![feature(ub_checks)]
-use core::ub_checks::Invariant;
-
 #[cfg(kani)]
 #[unstable(feature = "kani", issue = "none")]
 use core::kani;
+use core::ub_checks::Invariant;
 #[allow(unused_imports)]
 #[unstable(feature = "ub_checks", issue = "none")]
 use core::ub_checks::*;
-use safety::{ensures, requires};
-
 use std::collections::{VecDeque, vec_deque};
 use std::mem;
 
+use safety::{ensures, requires};
 use test::{Bencher, black_box};
 
 #[bench]

library/alloctests/tests/sort/ffi_types.rs

@@ -1,5 +1,4 @@
 use core::ub_checks::Invariant;
-
 use std::cmp::Ordering;
 
 // Very large stack value.

library/alloctests/tests/vec.rs

@@ -1,8 +1,7 @@
-use core::ub_checks::Invariant;
-
 use core::alloc::{Allocator, Layout};
 use core::num::NonZero;
 use core::ptr::NonNull;
+use core::ub_checks::Invariant;
 use core::{assert_eq, assert_ne};
 use std::alloc::System;
 use std::assert_matches::assert_matches;

library/alloctests/tests/vec_deque.rs

@@ -1,15 +1,12 @@
 #![feature(ub_checks)]
-use core::ub_checks::Invariant;
-
 #[cfg(kani)]
 #[unstable(feature = "kani", issue = "none")]
 use core::kani;
+use core::num::NonZero;
+use core::ub_checks::Invariant;
 #[allow(unused_imports)]
 #[unstable(feature = "ub_checks", issue = "none")]
 use core::ub_checks::*;
-use safety::{ensures, requires};
-
-use core::num::NonZero;
 use std::assert_matches::assert_matches;
 use std::collections::TryReserveErrorKind::*;
 use std::collections::VecDeque;
@@ -20,6 +17,7 @@ use std::panic::{AssertUnwindSafe, catch_unwind};
 
 use Taggy::*;
 use Taggypar::*;
+use safety::{ensures, requires};
 
 use crate::hash;
 use crate::testing::macros::struct_with_counted_drop;

library/core/src/any.rs

@@ -86,12 +86,12 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
+use safety::{ensures, requires};
+
 #[cfg(kani)]
 use crate::kani;
 #[allow(unused_imports)]
 use crate::ub_checks::*;
-use safety::{ensures, requires};
-
 use crate::{fmt, hash, intrinsics};
 
 ///////////////////////////////////////////////////////////////////////////////