@@ -119,11 +119,12 @@ pub struct GitConfig<'event> {
119
119
}
120
120
121
121
pub mod from_paths {
122
- use crate :: parser;
123
- use crate :: values:: path:: interpolate;
124
- use quick_error:: quick_error;
125
122
use std:: borrow:: Cow ;
126
123
124
+ use quick_error:: quick_error;
125
+
126
+ use crate :: { parser, values:: path:: interpolate} ;
127
+
127
128
quick_error ! {
128
129
#[ derive( Debug ) ]
129
130
/// The error returned by [`GitConfig::from_paths()`][super::GitConfig::from_paths()] and [`GitConfig::from_env_paths()`][super::GitConfig::from_env_paths()].
@@ -174,9 +175,10 @@ pub mod from_paths {
174
175
}
175
176
176
177
pub mod from_env {
178
+ use quick_error:: quick_error;
179
+
177
180
use super :: from_paths;
178
181
use crate :: values:: path:: interpolate;
179
- use quick_error:: quick_error;
180
182
181
183
quick_error ! {
182
184
#[ derive( Debug ) ]
@@ -1796,11 +1798,10 @@ a"#,
1796
1798
mod from_paths_tests {
1797
1799
use std:: { fs, io} ;
1798
1800
1799
- use crate :: file:: from_paths;
1800
1801
use tempfile:: tempdir;
1801
1802
1802
1803
use super :: { from_paths:: Error , Cow , GitConfig } ;
1803
- use crate :: parser:: ParserOrIoError ;
1804
+ use crate :: { file :: from_paths , parser:: ParserOrIoError } ;
1804
1805
1805
1806
/// Escapes backslash when writing a path as string so that it is a valid windows path
1806
1807
fn escape_backslashes ( path : & std:: path:: Path ) -> String {
@@ -2261,12 +2262,11 @@ mod from_paths_tests {
2261
2262
mod from_env_tests {
2262
2263
use std:: { env, fs} ;
2263
2264
2264
- use crate :: file:: from_paths;
2265
- use crate :: file:: from_paths:: Options ;
2266
2265
use serial_test:: serial;
2267
2266
use tempfile:: tempdir;
2268
2267
2269
2268
use super :: { from_env, Cow , GitConfig } ;
2269
+ use crate :: file:: { from_paths, from_paths:: Options } ;
2270
2270
2271
2271
struct Env < ' a > {
2272
2272
altered_vars : Vec < & ' a str > ,
0 commit comments