Skip to content

Commit

Permalink
chore: tidy up dependencies (#2480)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ematipico
ematipico authored Apr 16, 2024
1 parent 710b3e6 commit 7156af0
Show file tree
Hide file tree
Showing 16 changed files with 76 additions and 77 deletions.
45 changes: 17 additions & 28 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

51 changes: 27 additions & 24 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,30 +152,33 @@ biome_ungrammar = { path = "./crates/biome_ungrammar" }
tests_macros = { path = "./crates/tests_macros" }

# Crates needed in the workspace
bitflags = "2.5.0"
bpaf = { version = "0.9.9", features = ["derive"] }
countme = "3.0.1"
crossbeam = "0.8.4"
dashmap = "5.4.0"
ignore = "0.4.21"
indexmap = "1.9.3"
insta = "1.38.0"
lazy_static = "1.4.0"
oxc_resolver = "1.4.0"
quickcheck = "1.0.3"
quickcheck_macros = "1.0.0"
quote = { version = "1.0.36" }
rayon = "1.8.1"
regex = "1.10.4"
rustc-hash = "1.1.0"
schemars = { version = "0.8.12" }
serde = { version = "1.0.163", features = ["derive"] }
serde_json = "1.0.115"
smallvec = { version = "1.10.0", features = ["union", "const_new"] }
tokio = { version = "1.36.0" }
tracing = { version = "0.1.37", default-features = false, features = ["std"] }
unicode-bom = "2.0.3"

bitflags = "2.5.0"
bpaf = { version = "0.9.9", features = ["derive"] }
countme = "3.0.1"
crossbeam = "0.8.4"
dashmap = "5.4.0"
ignore = "0.4.21"
indexmap = "1.9.3"
insta = "1.38.0"
lazy_static = "1.4.0"
oxc_resolver = "1.4.0"
proc-macro2 = "1.0.80"
quickcheck = "1.0.3"
quickcheck_macros = "1.0.0"
quote = "1.0.36"
rayon = "1.8.1"
regex = "1.10.4"
rustc-hash = "1.1.0"
schemars = { version = "0.8.12" }
serde = { version = "1.0.163", features = ["derive"] }
serde_json = "1.0.115"
similar = "2.5.0"
smallvec = { version = "1.10.0", features = ["union", "const_new"] }
syn = "1.0.109"
tokio = { version = "1.36.0" }
tracing = { version = "0.1.37", default-features = false, features = ["std"] }
tracing-subscriber = "0.3.18"
unicode-bom = "2.0.3"

[profile.dev.package.biome_wasm]
debug = true
Expand Down
2 changes: 1 addition & 1 deletion crates/biome_cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ smallvec = { workspace = true }
tokio = { workspace = true, features = ["io-std", "io-util", "net", "time", "rt", "sync", "rt-multi-thread", "macros"] }
tracing = { workspace = true }
tracing-appender = "0.2"
tracing-subscriber = { version = "0.3.16", features = ["env-filter", "json"] }
tracing-subscriber = { workspace = true, features = ["env-filter", "json"] }
tracing-tree = "0.3.0"

[target.'cfg(unix)'.dependencies]
Expand Down
4 changes: 2 additions & 2 deletions crates/biome_deserialize_macros/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ proc-macro = true
[dependencies]
biome_string_case = { workspace = true }
proc-macro-error = { version = "1.0.4", default-features = false }
proc-macro2 = "1.0.63"
proc-macro2 = { workspace = true }
quote = "1.0.14"
syn = { version = "1.0.85", features = ["extra-traits"] }
syn = { workspace = true, features = ["extra-traits"] }

[lints]
workspace = true
6 changes: 3 additions & 3 deletions crates/biome_diagnostics_macros/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ proc-macro = true

[dependencies]
proc-macro-error = { version = "1.0.4", default-features = false }
proc-macro2 = "1.0.63"
quote = "1.0.14"
syn = "1.0.85"
proc-macro2 = { workspace = true }
quote = { workspace = true }
syn = { workspace = true }

[lints]
workspace = true
2 changes: 1 addition & 1 deletion crates/biome_formatter_test/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ biome_service = { workspace = true }
insta = { workspace = true, features = ["glob"] }
serde = { version = "1", features = ["derive"] }
serde_json = { workspace = true }
similar = "2.1.0"
similar = { workspace = true }
similar-asserts = "1.2.0"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/biome_markup/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ proc-macro = true

[dependencies]
proc-macro-error = { version = "1.0.4", default-features = false }
proc-macro2 = "1.0.63"
proc-macro2 = { workspace = true }
quote = "1.0.14"

[lints]
Expand Down
2 changes: 1 addition & 1 deletion crates/biome_rowan/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ version = "0.5.7"
biome_text_edit = { workspace = true }
biome_text_size = { workspace = true }
countme = { workspace = true }
hashbrown = { version = "0.12.3", features = ["inline-more"], default-features = false }
hashbrown = { version = "0.14.3", features = ["inline-more"], default-features = false }
memoffset = "0.8.0"
rustc-hash = { workspace = true }
serde = { workspace = true, optional = true }
Expand Down
19 changes: 13 additions & 6 deletions crates/biome_rowan/src/green/node_cache.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,15 +344,22 @@ impl NodeCache {
/// Removes nodes, tokens and trivia entries from the cache when their
/// generation doesn't match the current generation of the whole cache
pub(crate) fn sweep_cache(&mut self) {
self.nodes
.drain_filter(|node, _| node.node.generation() != self.generation);
let nodes = self
.nodes
.extract_if(|node, _| node.node.generation() != self.generation);
nodes.for_each(drop);

self.tokens
.drain_filter(|token, _| token.0.generation() != self.generation);
let tokens = self
.tokens
.extract_if(|token, _| token.0.generation() != self.generation);

self.trivia
tokens.for_each(drop);

let trivia = self
.trivia
.cache
.drain_filter(|trivia, _| trivia.0.generation() != self.generation);
.extract_if(|trivia, _| trivia.0.generation() != self.generation);
trivia.for_each(drop);
}
}

Expand Down
2 changes: 1 addition & 1 deletion crates/biome_test_utils/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ biome_service = { workspace = true }
countme = { workspace = true, features = ["enable"] }
json_comments = "0.2.1"
serde_json = { workspace = true }
similar = { version = "2.2.1" }
similar = { workspace = true }

[lints]
workspace = true
2 changes: 1 addition & 1 deletion crates/biome_text_edit/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ version = "0.5.7"
biome_text_size = { workspace = true, features = ["serde"] }
schemars = { workspace = true, optional = true }
serde = { workspace = true, features = ["derive"] }
similar = { version = "2.1.0", features = ["unicode"] }
similar = { workspace = true, features = ["unicode"] }

[features]
schemars = ["dep:schemars", "biome_text_size/schemars"]
Expand Down
4 changes: 2 additions & 2 deletions crates/tests_macros/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ proc-macro = true
case = "1.0.0"
globwalk = "0.8.1"
proc-macro-error = "1.0.4"
proc-macro2 = "1.0.63"
proc-macro2 = { workspace = true }
quote = "1.0.14"
syn = "2.0.37"
syn = "2.0.59"
2 changes: 1 addition & 1 deletion fuzz/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ biome_js_syntax = { path = "../crates/biome_js_syntax" }
biome_json_formatter = { path = "../crates/biome_json_formatter" }
biome_json_parser = { path = "../crates/biome_json_parser" }
biome_service = { path = "../crates/biome_service" }
similar = { version = "2.2.1" }
similar = { workspace = true }

# Prevent this from interfering with workspaces
[workspace]
Expand Down
2 changes: 1 addition & 1 deletion xtask/codegen/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ case = "1.0.0"
filetime = "0.2.15"
fs_extra = "1.3.0"
git2 = { version = "0.18.2", default-features = false }
proc-macro2 = { version = "1.0.63", features = ["span-locations"] }
proc-macro2 = { workspace = true, features = ["span-locations"] }
pulldown-cmark = { version = "0.9", default-features = false, optional = true }
quote = "1.0.14"
serde = { workspace = true, optional = true }
Expand Down
2 changes: 1 addition & 1 deletion xtask/contributors/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ version = "0.0.0"
[dependencies]
html-escape = "0.2.11"
pico-args = "0.5.0"
serde = { version = "1.0.133", features = ["derive"] }
serde = { workspace = true, features = ["derive"] }
ureq = { version = "2.4.0", features = ["json"] }
xtask = { path = '../', version = "0.0" }

Expand Down
6 changes: 3 additions & 3 deletions xtask/coverage/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ indicatif = { version = "0.17.0", features = ["improved_unicode"] }
once_cell = "1.9.0"
pico-args = { version = "0.5.0", features = ["eq-separator"] }
regex = "1.5.5"
serde = { version = "1.0.133", features = ["derive"] }
serde_json = "1.0.74"
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
serde_yaml = "0.9.31"
tracing = { workspace = true }
tracing-subscriber = { version = "0.3.11", features = ["env-filter", "std"] }
tracing-subscriber = { workspace = true, features = ["env-filter", "std"] }
walkdir = "2.3.2"
xtask = { path = '../', version = "0.0" }
yastl = "0.1.2"
Expand Down

0 comments on commit 7156af0

Please sign in to comment.