diff --git a/.editorconfig b/.editorconfig
index dc692d132c225..d038d42ff93e6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,6 +11,10 @@ tab_width = 4
 insert_final_newline = true
 max_line_length = 120
 
+[*.rs]
+# Keep in sync with rustfmt
+max_line_length = 100
+
 [{*.markdown,*.md}]
 max_line_length = 80
 
diff --git a/.rustfmt.toml b/.rustfmt.toml
index bfa4c94ed8622..c4e4d348c3510 100644
--- a/.rustfmt.toml
+++ b/.rustfmt.toml
@@ -1,3 +1,6 @@
+# Keep in sync with .editorconfig
+max_width = 100
+
 tab_spaces = 4
 hard_tabs = false