From eca17586a62304995fc9d774f6d25ae3bbf0c6c6 Mon Sep 17 00:00:00 2001 From: Jenan Wise Date: Mon, 22 Jun 2020 19:13:43 -0700 Subject: [PATCH 1/2] Remove rustfmt.toml. The CI rustfmt checker uses `stable` rust, not `nightly`, but the config options in `rustfmt.toml` only work on nightly -- on stable, there are ignored with warnings. This means that devs running stable get a lot of warnings and devs running nightly will accidentally format in a way that the CI checker forbids. (specifically, using `where_single_line`). E.g.: ``` $ cargo +stable fmt -- --check Warning: can't set `indent_style = Block`, unstable features are only available in nightly channel. Warning: can't set `where_single_line = true`, unstable features are only available in nightly channel. ...etc $ cargo +nightly fmt -- --check -where - N: RealField, -{ +where N: RealField { ...etc ``` Just removing the toml fixes this problem. --- rustfmt.toml | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 rustfmt.toml diff --git a/rustfmt.toml b/rustfmt.toml deleted file mode 100644 index 8dc8e61a..00000000 --- a/rustfmt.toml +++ /dev/null @@ -1,3 +0,0 @@ -unstable_features = true -indent_style = "Block" -where_single_line = true \ No newline at end of file From 7a42513c1ae18317a5c3f971c5bbf6ef9d597eda Mon Sep 17 00:00:00 2001 From: Jenan Wise Date: Tue, 23 Jun 2020 09:48:23 -0700 Subject: [PATCH 2/2] Add empty rustfmt.toml. Previous commit removed it entirely, but we should have an empty config file instead to indicate that we use the base config. --- rustfmt.toml | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 rustfmt.toml diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 00000000..e69de29b