diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-04-17 10:42:29 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-04-17 10:42:29 +0200 |
| commit | 6939b5ef97b34d4052c6a55768ae18c382e8633b (patch) | |
| tree | 1f28213e8d60a508fb974b3ab302f92c49947bc1 | |
| parent | c92ea97d9180fe05ab1adb35a4af0bcb19b12ec9 (diff) | |
| parent | 14adf4c28640dd54590c702421e36b58cc695840 (diff) | |
| download | mullvadvpn-6939b5ef97b34d4052c6a55768ae18c382e8633b.tar.xz mullvadvpn-6939b5ef97b34d4052c6a55768ae18c382e8633b.zip | |
Merge branch 'upgrade-rustfmt'
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | rustfmt.toml | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 34de747b1a..94b1702db9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,7 @@ matrix: # Install and run rustfmt on nightly only until rustfmt.toml settings are stabilized. - rustup component add rustfmt-preview - rustfmt --version - - cargo fmt -- --write-mode=diff + - cargo fmt -- --write-mode=diff --unstable-features - language: rust rust: beta diff --git a/rustfmt.toml b/rustfmt.toml index 75d71f4a8d..f9181e438c 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,7 +1,4 @@ # Activation of features, almost objectively better ;) -reorder_imports = true -reorder_imported_names = true -reorder_imports_in_group = true use_try_shorthand = true condense_wildcard_suffixes = true normalize_comments = true |