Skip to content

Commit 396bc4e

Browse files
benmaddisonrbradford
authored andcommitted
fat,loader: revert import grouping and add empty rustfmt.toml
Signed-off-by: Ben Maddison <benm@workonline.africa>
1 parent 8b3b4ef commit 396bc4e

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

rustfmt.toml

Whitespace-only changes.

src/fat.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
use core::convert::TryFrom;
16-
1715
use crate::{
1816
block::{Error as BlockError, SectorRead},
1917
mem::MemoryRegion,
2018
};
19+
use core::convert::TryFrom;
2120

2221
#[repr(packed)]
2322
struct Header {
@@ -878,11 +877,10 @@ impl<'a> Filesystem<'a> {
878877

879878
#[cfg(test)]
880879
mod tests {
881-
use std::convert::TryInto;
882-
use std::path::PathBuf;
883-
884880
use super::Read;
885881
use crate::part::tests::*;
882+
use std::convert::TryInto;
883+
use std::path::PathBuf;
886884

887885
fn fat_test_image_paths() -> Vec<PathBuf> {
888886
let images = ["fat12.img", "fat16.img", "fat32.img"];

src/loader.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,9 @@ pub fn load_default_entry(fs: &fat::Filesystem, info: &dyn boot::Info) -> Result
246246

247247
#[cfg(test)]
248248
mod tests {
249-
use core::convert::TryInto;
250-
251249
use crate::fat::Read;
252250
use crate::part::tests::*;
251+
use core::convert::TryInto;
253252

254253
#[test]
255254
fn test_default_entry() {

0 commit comments

Comments
 (0)