Organize imports

Some modules already grouped std and non-std imports into the same
block. Just do that consistently.

Author: dtolnay

src/fallback.rs

@@ -1,3 +1,5 @@
+use crate::strnom::{block_comment, skip_whitespace, whitespace, word_break, Cursor, PResult};
+use crate::{Delimiter, Punct, Spacing, TokenTree};
 #[cfg(span_locations)]
 use std::cell::RefCell;
 #[cfg(span_locations)]
@@ -10,9 +12,6 @@ use std::path::Path;
 use std::path::PathBuf;
 use std::str::FromStr;
 use std::vec;
-
-use crate::strnom::{block_comment, skip_whitespace, whitespace, word_break, Cursor, PResult};
-use crate::{Delimiter, Punct, Spacing, TokenTree};
 use unicode_xid::UnicodeXID;
 
 #[derive(Clone)]

src/lib.rs

@@ -1155,12 +1155,12 @@ impl fmt::Display for Literal {
 
 /// Public implementation details for the `TokenStream` type, such as iterators.
 pub mod token_stream {
+    use crate::{imp, TokenTree};
     use std::fmt;
     use std::marker;
     use std::rc::Rc;
 
     pub use crate::TokenStream;
-    use crate::{imp, TokenTree};
 
     /// An iterator over `TokenStream`'s `TokenTree`s.
     ///

src/wrapper.rs

@@ -1,3 +1,5 @@
+use crate::detection::inside_proc_macro;
+use crate::{fallback, Delimiter, Punct, Spacing, TokenTree};
 use std::fmt;
 use std::iter;
 use std::ops::RangeBounds;
@@ -6,9 +8,6 @@ use std::panic;
 use std::path::PathBuf;
 use std::str::FromStr;
 
-use crate::detection::inside_proc_macro;
-use crate::{fallback, Delimiter, Punct, Spacing, TokenTree};
-
 #[derive(Clone)]
 pub(crate) enum TokenStream {
     Compiler(DeferredTokenStream),

tests/test.rs

@@ -1,6 +1,5 @@
-use std::str::{self, FromStr};
-
 use proc_macro2::{Ident, Literal, Spacing, Span, TokenStream, TokenTree};
+use std::str::{self, FromStr};
 
 #[test]
 fn idents() {