Skip to content

Commit 4fe91ed

Browse files
committed
Make formatting of imports consistent
Unfortunately the `imports_granularity` option of rustfmt I used to automate this change is unstable: rust-lang/rustfmt#4991
1 parent 7712c5a commit 4fe91ed

File tree

5 files changed

+13
-14
lines changed

5 files changed

+13
-14
lines changed

crates/model/src/pipe.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ use history_keeper::HistoryKeeper;
77
pub use kind::{Kind, KindSet};
88

99
use crate::direction::Direction;
10-
use crate::position::InScreenBounds;
11-
use crate::position::Position;
10+
use crate::position::{InScreenBounds, Position};
1211
use rng::Rng;
1312

1413
pub struct Pipe {

crates/model/src/pipe/color.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use rng::Rng;
2-
use std::{ops::Range, str::FromStr};
2+
use std::ops::Range;
3+
use std::str::FromStr;
34
use tincture::ColorSpace;
45

56
pub(super) fn gen_random_color(

crates/pipes-rs/src/config.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ use anyhow::Context;
22
use etcetera::app_strategy::{AppStrategy, AppStrategyArgs, Xdg};
33
use model::pipe::{ColorMode, Kind, KindSet, Palette};
44
use serde::{Deserialize, Serialize};
5-
use std::{fs, path::PathBuf, time::Duration};
5+
use std::fs;
6+
use std::path::PathBuf;
7+
use std::time::Duration;
68
use structopt::clap::AppSettings;
79
use structopt::StructOpt;
810

crates/pipes-rs/src/lib.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
mod config;
22
pub use config::Config;
33

4-
use model::{
5-
pipe::{KindSet, Pipe},
6-
position::InScreenBounds,
7-
};
4+
use model::pipe::{KindSet, Pipe};
5+
use model::position::InScreenBounds;
86
use rng::Rng;
97
use std::thread;
108
use terminal::{Backend, Event, Terminal};

crates/terminal/src/lib.rs

+5-6
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ mod void_backend;
55
pub use stdout_backend::StdoutBackend;
66
pub use void_backend::VoidBackend;
77

8-
use crossterm::{
9-
cursor,
10-
event::{Event as CrosstermEvent, KeyCode, KeyEvent, KeyModifiers},
11-
queue, style, terminal,
12-
};
8+
use crossterm::event::{Event as CrosstermEvent, KeyCode, KeyEvent, KeyModifiers};
9+
use crossterm::{cursor, queue, style, terminal};
1310
use screen::Screen;
14-
use std::{io::Write, num::NonZeroUsize, thread};
11+
use std::io::Write;
12+
use std::num::NonZeroUsize;
13+
use std::thread;
1514
use unicode_width::UnicodeWidthChar;
1615

1716
pub struct Terminal<B: Backend> {

0 commit comments

Comments
 (0)