diff options
| author | topecongiro <seuchida@gmail.com> | 2018-04-30 16:24:01 +0900 |
|---|---|---|
| committer | topecongiro <seuchida@gmail.com> | 2018-04-30 16:24:01 +0900 |
| commit | 43df7dcb0e9aaf33ec041a079f3e9117b7f592cb (patch) | |
| tree | 446b60a671481679764b9bf11a83c8abe99f201f /src | |
| parent | faa5a10d20a20852b834037af3beb223b5bc7a3f (diff) | |
Run cargo fmt with reorder_impl_items set to true
Diffstat (limited to 'src')
| -rw-r--r-- | src/comment.rs | 1 | ||||
| -rw-r--r-- | src/config/options.rs | 1 | ||||
| -rw-r--r-- | src/imports.rs | 3 | ||||
| -rw-r--r-- | src/test/mod.rs | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/src/comment.rs b/src/comment.rs index 378fe40d569..4a0abc2b099 100644 --- a/src/comment.rs +++ b/src/comment.rs @@ -1139,6 +1139,7 @@ impl<'a> CommentReducer<'a> { impl<'a> Iterator for CommentReducer<'a> { type Item = char; + fn next(&mut self) -> Option<Self::Item> { loop { let mut c = self.iter.next()?; diff --git a/src/config/options.rs b/src/config/options.rs index 9721815eeee..7bd3a51a9b4 100644 --- a/src/config/options.rs +++ b/src/config/options.rs @@ -239,6 +239,7 @@ impl WidthHeuristics { single_line_if_else_max_width: 0, } } + // scale the default WidthHeuristics according to max_width pub fn scaled(max_width: usize) -> WidthHeuristics { let mut max_width_ratio: f32 = max_width as f32 / 100.0; // 100 is the default width -> default ratio is 1 diff --git a/src/imports.rs b/src/imports.rs index 8963f62748b..669cf795bc7 100644 --- a/src/imports.rs +++ b/src/imports.rs @@ -799,9 +799,11 @@ mod test { fn bump(&mut self) { self.input.next().unwrap(); } + fn eat(&mut self, c: char) { assert!(self.input.next().unwrap() == c); } + fn push_segment( result: &mut Vec<UseSegment>, buf: &mut String, @@ -825,6 +827,7 @@ mod test { } } } + fn parse_in_list(&mut self) -> UseTree { let mut result = vec![]; let mut buf = String::new(); diff --git a/src/test/mod.rs b/src/test/mod.rs index cd746a6486b..4a02bf73e1a 100644 --- a/src/test/mod.rs +++ b/src/test/mod.rs @@ -568,6 +568,7 @@ struct CharsIgnoreNewlineRepr<'a>(Peekable<Chars<'a>>); impl<'a> Iterator for CharsIgnoreNewlineRepr<'a> { type Item = char; + fn next(&mut self) -> Option<char> { self.0.next().map(|c| { if c == '\r' { |
