Upgrade rustfmt to 0.3.2 and corresponding settings

2 files changed, 3 insertions, 7 deletions

diff --git a/format.sh b/format.sh
index ee72288862..b136c006cc 100755
--- a/format.sh
+++ b/format.sh
@@ -5,7 +5,7 @@
 
 set -u
 
-VERSION="0.2.17"
+VERSION="0.3.2"
 CMD="rustfmt"
 INSTALL_CMD="cargo install --vers $VERSION --force rustfmt-nightly"
 
@@ -15,10 +15,6 @@ case "$(uname -s)" in
     *)          echo "Unsupported platform"; exit 1
 esac
 
-# Allow rustfmt to use "nighly" features. `comment_width` is one of those for example.
-# 0.2.17 started enforcing setting this variable to allow using the nighly features.
-export CFG_RELEASE_CHANNEL=nightly
-
 function correct_rustfmt() {
     if ! which $CMD; then
         echo "$CMD is not installed" >&2
diff --git a/rustfmt.toml b/rustfmt.toml
index 25060d89d5..75d71f4a8d 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -3,10 +3,10 @@ reorder_imports = true
 reorder_imported_names = true
 reorder_imports_in_group = true
 use_try_shorthand = true
-condense_wildcard_suffices = true
+condense_wildcard_suffixes = true
 normalize_comments = true
 wrap_comments = true
 
 # Heavily subjective style choices
 comment_width = 100
-take_source_hints = true
+blank_lines_upper_bound = 2