Organize imports with rustfmt

.rustfmt.toml

@@ -22,3 +22,6 @@ match_block_trailing_comma = true
 # We prefer it already so just do it here
 use_try_shorthand = true
 use_field_init_shorthand = true
+
+imports_granularity = "Module"
+group_imports = "StdExternalCrate"

examples/src/zero_copy/main.rs

@@ -1,10 +1,11 @@
+use std::io::Cursor;
+
 use bytes::Bytes;
 use pb_jelly::{
     Lazy,
     Message,
 };
 use proto_zero_copy::basic::BytesMessage;
-use std::io::Cursor;
 
 fn main() -> std::io::Result<()> {
     // Create 1kb of Data

pb-jelly-gen/src/codegen.rs

@@ -15,10 +15,8 @@ use indexmap::{
     IndexSet,
 };
 use lazy_static::lazy_static;
-use pb_jelly::{
-    extensions::Extensible,
-    Message,
-};
+use pb_jelly::extensions::Extensible;
+use pb_jelly::Message;
 use regex::Regex;
 
 use crate::protos::google::protobuf::compiler::plugin;

pb-jelly-gen/src/lib.rs

@@ -31,28 +31,27 @@
 //! }
 //! ```
 
-use crate::protos::google::protobuf::{
-    compiler::plugin::CodeGeneratorRequest,
-    descriptor::FileDescriptorSet,
+use std::convert::AsRef;
+use std::error::Error;
+use std::fs;
+use std::iter::IntoIterator;
+use std::path::{
+    self,
+    Path,
+    PathBuf,
 };
+use std::process::Command;
+
 use pb_jelly::Message;
-use std::{
-    convert::AsRef,
-    error::Error,
-    fs,
-    iter::IntoIterator,
-    path::{
-        self,
-        Path,
-        PathBuf,
-    },
-    process::Command,
-};
 use walkdir::WalkDir;
 
+use crate::protos::google::protobuf::compiler::plugin::CodeGeneratorRequest;
+use crate::protos::google::protobuf::descriptor::FileDescriptorSet;
+
 pub mod codegen;
 /// Don't depend on this module, it's only public so that `protoc-gen-jellyrust` can use it
 #[doc(hidden)]
+#[rustfmt::skip]
 pub mod protos;
 
 /// A "no frills" way to generate Rust bindings for your proto files. `src_paths` is a list of

pb-jelly/src/tests/mod.rs

@@ -12,9 +12,6 @@ use bytes::{
     BufMut,
 };
 
-use crate::varint;
-use crate::wire_format;
-
 use super::{
     ensure_split,
     ensure_wire_format,
@@ -26,6 +23,10 @@ use super::{
     PbBufferReader,
     PbBufferWriter,
 };
+use crate::{
+    varint,
+    wire_format,
+};
 
 /// A wrapper around a `Vec` which owns its contents.
 #[derive(Clone, PartialEq, Debug, Default)]

pb-jelly/src/varint.rs

@@ -1,10 +1,11 @@
-use bytes::Buf;
 use std::cmp::min;
 use std::io::{
     self,
     Write,
 };
 
+use bytes::Buf;
+
 #[inline]
 pub const fn serialized_length(mut val: u64) -> usize {
     let mut ans = 1;
@@ -93,9 +94,10 @@ pub fn ensure_read<B: Buf>(buf: &mut B) -> io::Result<u64> {
 
 #[test]
 fn test_basic() {
-    use crate::Message;
     use std::io::Cursor;
 
+    use crate::Message;
+
     let from_vec = |vec| read(&mut Cursor::new(vec)).unwrap().unwrap();
 
     let from_vec_split = |mut first_vec: Vec<u8>| {

pb-test/pb_test_gen/src/main.rs

@@ -1,12 +1,11 @@
-use pb_jelly_gen::GenProtos;
 use std::{
     env,
     fs,
 };
 
+use pb_jelly_gen::GenProtos;
 #[cfg(feature = "bench_prost")]
 use prost_build;
-
 #[cfg(feature = "bench_rust_protobuf")]
 use protoc_rust::Customize;
 

pb-test/src/bench.rs

@@ -1,5 +1,8 @@
 #[cfg(test)]
 mod benches {
+    use std::hint::black_box;
+    use std::io::Cursor;
+
     use bytes::Bytes;
     use compact_str::CompactString;
     use pb_jelly::{
@@ -17,10 +20,6 @@ mod benches {
         VecData,
     };
     use serde::Deserialize;
-    use std::{
-        hint::black_box,
-        io::Cursor,
-    };
     use test::Bencher;
 
     #[bench]
@@ -279,17 +278,18 @@ mod prost {
 
 #[cfg(all(test, feature = "bench_rust_protobuf"))]
 mod rust_protobuf {
-    use crate::gen::rust_protobuf::bench::{
-        BytesData,
-        StringMessage,
-    };
     use bytes::Bytes;
     use protobuf::{
         CodedInputStream,
         Message,
     };
     use test::Bencher;
 
+    use crate::gen::rust_protobuf::bench::{
+        BytesData,
+        StringMessage,
+    };
+
     #[bench]
     fn bench_deserialize_rust_protobuf_bytes(b: &mut Bencher) {
         // Generate 4MB of data

pb-test/src/pbtest.rs

@@ -1,7 +1,11 @@
-use std::fs::metadata;
-use std::fs::File;
-use std::io::Cursor;
-use std::io::Read;
+use std::fs::{
+    metadata,
+    File,
+};
+use std::io::{
+    Cursor,
+    Read,
+};
 
 use bytes::Bytes;
 use pb_jelly::extensions::Extensible;

pb-test/src/verify_generated_files.rs

@@ -1,5 +1,7 @@
-use std::env;
-use std::fs;
+use std::{
+    env,
+    fs,
+};
 
 use pretty_assertions::assert_eq;
 use walkdir::WalkDir;