Skip to content

Commit 6ae3c97

Browse files
committed
revert formatting Cargo.toml on the repo
1 parent 3dc6d27 commit 6ae3c97

File tree

5 files changed

+44
-43
lines changed

5 files changed

+44
-43
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
[package]
2+
23
name = "rustfmt-nightly"
34
version = "1.5.1"
5+
description = "Tool to find and fix Rust formatting issues"
6+
repository = "https://github.com/rust-lang/rustfmt"
7+
readme = "README.md"
8+
license = "Apache-2.0/MIT"
49
build = "build.rs"
510
categories = ["development-tools"]
611
edition = "2021"
7-
license = "Apache-2.0/MIT"
8-
readme = "README.md"
9-
repository = "https://github.com/rust-lang/rustfmt"
10-
description = "Tool to find and fix Rust formatting issues"
11-
12-
# Rustc dependencies are loaded from the sysroot, Cargo doesn't know about them.
13-
[package.metadata.rust-analyzer]
14-
# This package uses #[feature(rustc_private)]
15-
rustc_private = true
1612

1713
[[bin]]
1814
name = "rustfmt"
@@ -31,10 +27,10 @@ name = "git-rustfmt"
3127
path = "src/git-rustfmt/main.rs"
3228

3329
[features]
34-
cargo-fmt = []
3530
default = ["cargo-fmt", "rustfmt-format-diff"]
36-
generic-simd = ["bytecount/generic-simd"]
31+
cargo-fmt = []
3732
rustfmt-format-diff = []
33+
generic-simd = ["bytecount/generic-simd"]
3834

3935
[dependencies]
4036
annotate-snippets = { version = "0.9", features = ["color"] }
@@ -52,17 +48,25 @@ itertools = "0.10"
5248
lazy_static = "1.4"
5349
log = "0.4"
5450
regex = "1.5"
55-
# A noop dependency that changes in the Rust repository, it's a bit of a hack.
56-
# See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`
57-
# for more information.
58-
rustc-workspace-hack = "1.0.0"
59-
rustfmt-config_proc_macro = { version = "0.3", path = "config_proc_macro" }
6051
serde = { version = "1.0", features = ["derive"] }
6152
serde_json = "1.0"
6253
term = "0.7"
6354
thiserror = "1.0"
6455
toml = "0.5"
65-
toml_edit = "0.13"
56+
toml_edit = "0.15"
6657
unicode-segmentation = "1.9"
6758
unicode-width = "0.1"
6859
unicode_categories = "0.1"
60+
61+
rustfmt-config_proc_macro = { version = "0.3", path = "config_proc_macro" }
62+
63+
# A noop dependency that changes in the Rust repository, it's a bit of a hack.
64+
# See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`
65+
# for more information.
66+
rustc-workspace-hack = "1.0.0"
67+
68+
# Rustc dependencies are loaded from the sysroot, Cargo doesn't know about them.
69+
70+
[package.metadata.rust-analyzer]
71+
# This package uses #[feature(rustc_private)]
72+
rustc_private = true

config_proc_macro/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
22
name = "rustfmt-config_proc_macro"
33
version = "0.3.0"
4-
categories = ["development-tools::procedural-macro-helpers"]
54
edition = "2018"
5+
description = "A collection of procedural macros for rustfmt"
66
license = "Apache-2.0/MIT"
7+
categories = ["development-tools::procedural-macro-helpers"]
78
repository = "https://github.com/rust-lang/rustfmt"
8-
description = "A collection of procedural macros for rustfmt"
99

1010
[lib]
1111
proc-macro = true
@@ -19,5 +19,5 @@ syn = { version = "1.0", features = ["full", "visit"] }
1919
serde = { version = "1.0", features = ["derive"] }
2020

2121
[features]
22-
debug-with-rustfmt = []
2322
default = []
23+
debug-with-rustfmt = []

rustfmt.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
error_on_line_overflow = true
22
error_on_unformatted = true
33
version = "Two"
4-
format_cargo_toml = true

tests/mod-resolver/test-submodule-issue-5119/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ version = "0.1.0"
44
edition = "2018"
55

66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
7+
78
[dependencies]

0 commit comments

Comments
 (0)