Skip to content

Commit d0dbbac

Browse files
authored
chore(dev): remove nightly fmt options (#23806)
1 parent c29c710 commit d0dbbac

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

.rustfmt.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ newline_style = "unix"
33
reorder_imports = true
44

55
# Nightly only features
6-
unstable_features = true
6+
# unstable_features = true
77

88
# See https://github.com/rust-lang/rustfmt/issues/4991
9-
imports_granularity = "Crate"
9+
# imports_granularity = "Crate"
1010

1111
# See https://github.com/rust-lang/rustfmt/issues/5083
1212
# group_imports = "StdExternalCrate"

vdev/src/commands/check/fmt.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ pub struct Cli {}
1010
impl Cli {
1111
pub fn exec(self) -> Result<()> {
1212
app::exec::<&str>("scripts/check-style.sh", [], true)?;
13-
app::exec("cargo", ["fmt", "--", "-q", "--check"], true)
13+
app::exec("cargo", ["fmt", "--", "--check"], true)
1414
}
1515
}

vdev/src/commands/fmt.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ pub struct Cli {}
1010
impl Cli {
1111
pub fn exec(self) -> Result<()> {
1212
app::exec("scripts/check-style.sh", ["--fix"], true)?;
13-
// We are using nightly features in `.rustfmt.toml
14-
app::exec("cargo", ["+nightly", "fmt", "--all"], true)
13+
app::exec("cargo", ["fmt", "--all"], true)
1514
}
1615
}

0 commit comments

Comments
 (0)