Skip to content

Commit

Permalink
revert tamasfe#554
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel-Aaron-Bloom committed Feb 20, 2024
1 parent 531b426 commit 62c0089
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 9 deletions.
2 changes: 1 addition & 1 deletion crates/taplo-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ schemars = "0.8"
serde = "1"
serde_json = "1"
taplo = { version = "0.13.1", path = "../taplo", features = ["serde"] }
taplo-common = { version = "0.5.1", path = "../taplo-common", default-features = false }
taplo-common = { version = "0.5.1", path = "../taplo-common" }
taplo-lsp = { version = "0.7.1", path = "../taplo-lsp", default-features = false, optional = true }
time = { version = "0.3", features = ["parsing"] }
toml = "0.7"
Expand Down
4 changes: 0 additions & 4 deletions crates/taplo-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@ tokio = { version = "1.24.2", features = [
], default-features = false }

[features]
# We only set a default such that `cargo publish` doesn't complain. Crates
# depending on taplo-common should disable default features and explicitly set
# the features they need.
default = ["rustls-tls"]
# default-tls enables native-tls but without enabling native-tls specific features.
native-tls = ["reqwest/default-tls"]
rustls-tls = ["reqwest/rustls-tls"]
Expand Down
2 changes: 1 addition & 1 deletion crates/taplo-lsp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "1.0", features = ["preserve_order"] }
tap = "1.0.1"
taplo = { version = "0.13.1", path = "../taplo", features = ["serde"] }
taplo-common = { version = "0.5.1", path = "../taplo-common", default-features = false }
taplo-common = { version = "0.5.1", path = "../taplo-common" }
time = { version = "0.3", features = ["formatting", "parsing"] }
toml = "0.7"
tracing = "0.1.29"
Expand Down
4 changes: 1 addition & 3 deletions crates/taplo-wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ serde = { version = "1.0.137", features = ["derive"] }
serde_json = "1.0.81"
taplo = { path = "../taplo" }
taplo-cli = { path = "../taplo-cli", optional = true }
taplo-common = { path = "../taplo-common", default-features = false, features = [
"rustls-tls",
] }
taplo-common = { path = "../taplo-common", features = ["rustls-tls"] }
taplo-lsp = { path = "../taplo-lsp", optional = true }
time = { version = "0.3.9", features = ["parsing"] }
tokio = { version = "1.19.2", default-features = false }
Expand Down

0 comments on commit 62c0089

Please sign in to comment.