Skip to content

Commit 00db885

Browse files
committed
Ensure order in the galaxy... I mean the imports
This patch sorts the imports: 1. std imports 2. external crate imports 3. own module imports In three blocks, each alphabetically (with is also enforced by rustfmt). As well as it prefixes the imports of own modules with crate:: This is just a quality-of-life patch :-) Signed-off-by: Matthias Beyer <[email protected]>
1 parent 938fd42 commit 00db885

27 files changed

+91
-60
lines changed

src/config.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
use serde::de::Deserialize;
2-
use serde::ser::Serialize;
31
use std::collections::HashMap;
42
use std::fmt::Debug;
53

6-
use error::*;
7-
use ser::ConfigSerializer;
8-
use source::Source;
4+
use serde::de::Deserialize;
5+
use serde::ser::Serialize;
96

10-
use path;
11-
use value::{Table, Value};
7+
use crate::error::*;
8+
use crate::path;
9+
use crate::ser::ConfigSerializer;
10+
use crate::source::Source;
11+
use crate::value::{Table, Value};
1212

1313
/// A prioritized configuration repository. It maintains a set of
1414
/// configuration sources, fetches values to populate those, and provides

src/de.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
use config::Config;
2-
use error::*;
3-
use serde::de;
41
use std::collections::{HashMap, VecDeque};
52
use std::iter::Enumerate;
6-
use value::{Table, Value, ValueKind};
3+
4+
use serde::de;
5+
6+
use crate::config::Config;
7+
use crate::error::*;
8+
use crate::value::{Table, Value, ValueKind};
79

810
impl<'de> de::Deserializer<'de> for Value {
911
type Error = ConfigError;

src/env.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
use error::*;
2-
use source::Source;
31
use std::collections::HashMap;
42
use std::env;
5-
use value::{Value, ValueKind};
3+
4+
use crate::error::*;
5+
use crate::source::Source;
6+
use crate::value::{Value, ValueKind};
67

78
#[derive(Clone, Debug)]
89
pub struct Environment {

src/error.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
use nom;
2-
use serde::de;
3-
use serde::ser;
41
use std::error::Error;
52
use std::fmt;
63
use std::result;
74

5+
use nom;
6+
use serde::de;
7+
use serde::ser;
8+
89
#[derive(Debug)]
910
pub enum Unexpected {
1011
Bool(bool),

src/file/format/hjson.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
use serde_hjson;
21
use std::collections::HashMap;
32
use std::error::Error;
4-
use value::{Value, ValueKind};
3+
4+
use serde_hjson;
5+
6+
use crate::value::{Value, ValueKind};
57

68
pub fn parse(
79
uri: Option<&String>,

src/file/format/ini.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
use ini::Ini;
21
use std::collections::HashMap;
32
use std::error::Error;
4-
use value::{Value, ValueKind};
3+
4+
use ini::Ini;
5+
6+
use crate::value::{Value, ValueKind};
57

68
pub fn parse(
79
uri: Option<&String>,

src/file/format/json.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
use serde_json;
21
use std::collections::HashMap;
32
use std::error::Error;
4-
use value::{Value, ValueKind};
3+
4+
use serde_json;
5+
6+
use crate::value::{Value, ValueKind};
57

68
pub fn parse(
79
uri: Option<&String>,

src/file/format/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
use std::collections::HashMap;
66
use std::error::Error;
7-
use value::Value;
7+
8+
use crate::value::Value;
89

910
#[cfg(feature = "toml")]
1011
mod toml;

src/file/format/toml.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
use std::collections::HashMap;
22
use std::error::Error;
3+
34
use toml;
4-
use value::{Value, ValueKind};
5+
6+
use crate::value::{Value, ValueKind};
57

68
pub fn parse(
79
uri: Option<&String>,

src/file/format/yaml.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ use std::collections::HashMap;
22
use std::error::Error;
33
use std::fmt;
44
use std::mem;
5-
use value::{Value, ValueKind};
5+
66
use yaml_rust as yaml;
77

8+
use crate::value::{Value, ValueKind};
9+
810
pub fn parse(
911
uri: Option<&String>,
1012
text: &str,

0 commit comments

Comments
 (0)