summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEmīls Piņķis <emils@mullvad.net>2021-02-17 09:21:35 +0000
committerEmīls Piņķis <emils@mullvad.net>2021-02-17 09:21:35 +0000
commitafa077f689c7fc38667cab4e51527b8e50a1440a (patch)
treecf533c63776ff62abb36a30d8048bbdabe94b1b2
parent5c6b8777d23cb60e63f38ba99f73e862018abd47 (diff)
parent10e03e930dd05469250cb054302bdd78d12e375a (diff)
downloadmullvadvpn-afa077f689c7fc38667cab4e51527b8e50a1440a.tar.xz
mullvadvpn-afa077f689c7fc38667cab4e51527b8e50a1440a.zip
Merge branch 'rust-update-rustfmt-config'
-rw-r--r--rustfmt.toml2
1 files changed, 1 insertions, 1 deletions
diff --git a/rustfmt.toml b/rustfmt.toml
index d77d6af544..4fc14a42b8 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -4,7 +4,7 @@ use_field_init_shorthand = true
condense_wildcard_suffixes = true
normalize_comments = true
wrap_comments = true
-merge_imports = true
+imports_granularity = "Crate"
# Heavily subjective style choices
comment_width = 100