From 2ea746340d61a196ae4940247ca8b1589d5046b2 Mon Sep 17 00:00:00 2001
From: "G. Endignoux" <ggendx@gmail.com>
Date: Fri, 26 Aug 2022 23:07:06 +0200
Subject: [PATCH] Configure formatting style to `imports_granularity =
 "Module"`.

---
 .github/workflows/format.yml | 4 ++--
 rustfmt.toml                 | 1 +
 src/decode/lzma.rs           | 3 +--
 src/decode/lzma2.rs          | 6 ++----
 src/decode/util.rs           | 3 +--
 src/encode/util.rs           | 3 +--
 src/encode/xz.rs             | 3 +--
 src/error.rs                 | 3 +--
 8 files changed, 10 insertions(+), 16 deletions(-)
 create mode 100644 rustfmt.toml

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index b7ee8058..e88bc654 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -1,11 +1,11 @@
 on: [push, pull_request]
-name: Formatting on stable toolchain
+name: Formatting on nightly toolchain
 jobs:
   format:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: dtolnay/rust-toolchain@nightly
         with:
           components: rustfmt
 
diff --git a/rustfmt.toml b/rustfmt.toml
new file mode 100644
index 00000000..c1578aaf
--- /dev/null
+++ b/rustfmt.toml
@@ -0,0 +1 @@
+imports_granularity = "Module"
diff --git a/src/decode/lzma.rs b/src/decode/lzma.rs
index b705e6d3..036d3f23 100644
--- a/src/decode/lzma.rs
+++ b/src/decode/lzma.rs
@@ -1,8 +1,7 @@
 use crate::decode::lzbuffer::{LzBuffer, LzCircularBuffer};
 use crate::decode::rangecoder;
 use crate::decode::rangecoder::RangeDecoder;
-use crate::decompress::Options;
-use crate::decompress::UnpackedSize;
+use crate::decompress::{Options, UnpackedSize};
 use crate::error;
 use byteorder::{LittleEndian, ReadBytesExt};
 use std::io;
diff --git a/src/decode/lzma2.rs b/src/decode/lzma2.rs
index 8a018fec..4fc9a85c 100644
--- a/src/decode/lzma2.rs
+++ b/src/decode/lzma2.rs
@@ -1,8 +1,6 @@
-use crate::decode::lzbuffer;
 use crate::decode::lzbuffer::LzBuffer;
-use crate::decode::lzma::DecoderState;
-use crate::decode::lzma::LzmaProperties;
-use crate::decode::rangecoder;
+use crate::decode::lzma::{DecoderState, LzmaProperties};
+use crate::decode::{lzbuffer, rangecoder};
 use crate::error;
 use byteorder::{BigEndian, ReadBytesExt};
 use std::io;
diff --git a/src/decode/util.rs b/src/decode/util.rs
index 8581daf1..f00394cd 100644
--- a/src/decode/util.rs
+++ b/src/decode/util.rs
@@ -1,5 +1,4 @@
-use std::hash;
-use std::io;
+use std::{hash, io};
 
 pub fn read_tag<R: io::BufRead>(input: &mut R, tag: &[u8]) -> io::Result<bool> {
     let mut buf = vec![0; tag.len()];
diff --git a/src/encode/util.rs b/src/encode/util.rs
index e231f605..3c22e255 100644
--- a/src/encode/util.rs
+++ b/src/encode/util.rs
@@ -1,5 +1,4 @@
-use std::hash;
-use std::io;
+use std::{hash, io};
 
 // A Write computing a digest on the bytes written.
 pub struct HasherWrite<'a, W, H>
diff --git a/src/encode/xz.rs b/src/encode/xz.rs
index 15eca80f..1c6a9f61 100644
--- a/src/encode/xz.rs
+++ b/src/encode/xz.rs
@@ -1,6 +1,5 @@
 use crate::decode;
-use crate::encode::lzma2;
-use crate::encode::util;
+use crate::encode::{lzma2, util};
 use crate::xz::{footer, header, CheckMethod, StreamFlags};
 use byteorder::{LittleEndian, WriteBytesExt};
 use crc::{crc32, Hasher32};
diff --git a/src/error.rs b/src/error.rs
index be5bfcda..2ee0fbe5 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -1,8 +1,7 @@
 //! Error handling.
 
 use std::fmt::Display;
-use std::io;
-use std::result;
+use std::{io, result};
 
 /// Library errors.
 #[derive(Debug)]