Skip to content

Commit ab7b4a8

Browse files
committed
Revert "Remove rustfmt and cargo-fmt"
This reverts commit 9d2229f. And `cargo updates`
1 parent f377d1f commit ab7b4a8

File tree

9 files changed

+1075
-11
lines changed

9 files changed

+1075
-11
lines changed

Cargo.lock

Lines changed: 119 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
[workspace]
22
members = [
3+
"cargo-fmt",
34
"git-rustfmt",
5+
"rustfmt-bin",
46
"rustfmt-config",
57
"rustfmt-core",
68
"rustfmt-format-diff",
79
]
8-
9-
[patch.crates-io]
10-
rustfmt-config = { path = "rustfmt-config" }
11-
rustfmt-core = { path = "rustfmt-core" }

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,9 @@ script:
146146

147147
`cargo test` to run all tests.
148148

149-
To run Rustfmt, you'll need the binaries repo: https://github.com/rust-lang-nursery/rustfmt-bin
149+
To run rustfmt after this, use `cargo run --bin rustfmt -- filename`. See the
150+
notes above on running rustfmt.
151+
150152

151153
## Configuring Rustfmt
152154

cargo-fmt/Cargo.toml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[package]
2+
name = "cargo-fmt"
3+
version = "0.4.0"
4+
authors = ["Nicholas Cameron <[email protected]>", "The Rustfmt developers"]
5+
description = "Cargo frontend for rustfmt"
6+
repository = "https://github.com/rust-lang-nursery/rustfmt"
7+
readme = "README.md"
8+
license = "Apache-2.0/MIT"
9+
categories = ["development-tools"]
10+
11+
[[bin]]
12+
name = "cargo-fmt"
13+
14+
[dependencies]
15+
cargo_metadata = "0.4"
16+
getopts = "0.2"
17+
serde_json = "1.0"

0 commit comments

Comments
 (0)