mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #16758 - Veykril:cargo-lock, r=Veykril

Browse source 
Update Cargo.lock
This commit is contained in:
bors 2024-03-05 11:17:42 +00:00
commit 2898c4217d
13 changed files with 333 additions and 341 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

618
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

20
Cargo.toml
View file

@ -84,10 +84,10 @@ tt = { path = "./crates/tt", version = "0.0.0" }
vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
vfs = { path = "./crates/vfs", version = "0.0.0" }
ra-ap-rustc_lexer = { version = "0.35.0", default-features = false }
ra-ap-rustc_parse_format = { version = "0.35.0", default-features = false }
ra-ap-rustc_index = { version = "0.35.0", default-features = false }
ra-ap-rustc_abi = { version = "0.35.0", default-features = false }
ra-ap-rustc_lexer = { version = "0.40.0", default-features = false }
ra-ap-rustc_parse_format = { version = "0.40.0", default-features = false }
ra-ap-rustc_index = { version = "0.40.0", default-features = false }
ra-ap-rustc_abi = { version = "0.40.0", default-features = false }
ra-ap-rustc_pattern_analysis = { version = "0.40.0", default-features = false }
# local crates that aren't published to crates.io. These should not have versions.
@ -108,6 +108,7 @@ cargo_metadata = "0.18.1"
command-group = "2.0.1"
crossbeam-channel = "0.5.8"
dissimilar = "1.0.7"
dot = "0.1.4"
either = "1.9.0"
expect-test = "1.4.0"
hashbrown = { version = "0.14", features = [
@ -117,6 +118,16 @@ indexmap = "2.1.0"
itertools = "0.12.0"
libc = "0.2.150"
nohash-hasher = "0.2.0"
oorandom = "11.1.3"
object = { version = "0.33.0", default-features = false, features = [
"std",
"read_core",
"elf",
"macho",
"pe",
] }
pulldown-cmark-to-cmark = "10.0.4"
pulldown-cmark = { version = "0.9.0", default-features = false }
rayon = "1.8.0"
rustc-hash = "1.1.0"
semver = "1.0.14"
@ -137,6 +148,7 @@ tracing-subscriber = { version = "0.3.18", default-features = false, features =
"tracing-log",
] }
triomphe = { version = "0.1.10", default-features = false, features = ["std"] }
url = "2.3.1"
xshell = "0.2.5"

2
crates/ide-db/src/prime_caches.rs
View file

@ -129,7 +129,7 @@ pub fn parallel_prime_caches(
crates_currently_indexing.insert(crate_id, crate_name);
}
ParallelPrimeCacheWorkerProgress::EndCrate { crate_id } => {
crates_currently_indexing.remove(&crate_id);
crates_currently_indexing.swap_remove(&crate_id);
crates_to_prime.mark_done(crate_id);
crates_done += 1;
}

10
crates/ide/Cargo.toml
View file

@ -17,11 +17,11 @@ arrayvec.workspace = true
either.workspace = true
itertools.workspace = true
tracing.workspace = true
oorandom = "11.1.3"
pulldown-cmark-to-cmark = "10.0.4"
pulldown-cmark = { version = "0.9.1", default-features = false }
url = "2.3.1"
dot = "0.1.4"
oorandom.workspace = true
pulldown-cmark-to-cmark.workspace = true
pulldown-cmark.workspace = true
url.workspace = true
dot.workspace = true
smallvec.workspace = true
triomphe.workspace = true
nohash-hasher.workspace = true

8
crates/proc-macro-api/Cargo.toml
View file

@ -12,13 +12,7 @@ rust-version.workspace = true
doctest = false
[dependencies]
object = { version = "0.32.0", default-features = false, features = [
"std",
"read_core",
"elf",
"macho",
"pe",
] }
object.workspace = true
serde.workspace = true
serde_json = { workspace = true, features = ["unbounded_depth"] }
tracing.workspace = true

8
crates/proc-macro-srv/Cargo.toml
View file

@ -12,13 +12,7 @@ rust-version.workspace = true
doctest = false
[dependencies]
object = { version = "0.32.0", default-features = false, features = [
"std",
"read_core",
"elf",
"macho",
"pe",
] }
object.workspace = true
libloading = "0.8.0"
memmap2 = "0.5.4"

1
crates/salsa/Cargo.toml
View file

@ -28,7 +28,6 @@ salsa-macros = { version = "0.0.0", path = "salsa-macros" }
[dev-dependencies]
linked-hash-map = "0.5.6"
rand = "0.8.5"
test-log = "0.2.14"
expect-test = "1.4.0"
dissimilar = "1.0.7"

2
crates/salsa/src/runtime.rs
View file

@ -595,7 +595,7 @@ impl ActiveQuery {
fn remove_cycle_participants(&mut self, cycle: &Cycle) {
if let Some(my_dependencies) = &mut self.dependencies {
for p in cycle.participant_keys() {
my_dependencies.remove(&p);
my_dependencies.swap_remove(&p);
}
}
}

1
crates/salsa/tests/cycles.rs
View file

@ -2,7 +2,6 @@ use std::panic::UnwindSafe;
use expect_test::expect;
use salsa::{Durability, ParallelDatabase, Snapshot};
use test_log::test;
// Axes:
//

1
crates/salsa/tests/parallel/parallel_cycle_all_recover.rs
View file

@ -4,7 +4,6 @@
use crate::setup::{Knobs, ParDatabaseImpl};
use salsa::ParallelDatabase;
use test_log::test;
// Recover cycle test:
//

1
crates/salsa/tests/parallel/parallel_cycle_mid_recover.rs
View file

@ -4,7 +4,6 @@
use crate::setup::{Knobs, ParDatabaseImpl};
use salsa::ParallelDatabase;
use test_log::test;
// Recover cycle test:
//

1
crates/salsa/tests/parallel/parallel_cycle_none_recover.rs
View file

@ -5,7 +5,6 @@
use crate::setup::{Knobs, ParDatabaseImpl};
use expect_test::expect;
use salsa::ParallelDatabase;
use test_log::test;
#[test]
fn parallel_cycle_none_recover() {

1
crates/salsa/tests/parallel/parallel_cycle_one_recovers.rs
View file

@ -4,7 +4,6 @@
use crate::setup::{Knobs, ParDatabaseImpl};
use salsa::ParallelDatabase;
use test_log::test;
// Recover cycle test:
//