Skip to content

Commit 1a92ee5

Browse files
bors[bot]Veykril
bors[bot]
and
Veykril
authored
11792: minor: Bump dependencies r=Veykril a=Veykril Co-authored-by: Lukas Wirth <[email protected]>
2 parents f1dbc2a + 8e91bb7 commit 1a92ee5

File tree

31 files changed

+190
-182
lines changed

31 files changed

+190
-182
lines changed

‎Cargo.lock‎

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

‎crates/cfg/Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ tt = { path = "../tt", version = "0.0.0" }
1717
[dev-dependencies]
1818
mbe = { path = "../mbe" }
1919
syntax = { path = "../syntax" }
20-
expect-test = "1.2.0-pre.1"
21-
oorandom = "11"
20+
expect-test = "1.2.2"
21+
oorandom = "11.1.3"
2222
# We depend on both individually instead of using `features = ["derive"]` to microoptimize the
2323
# build graph: if the feature was enabled, syn would be built early on in the graph if `smolstr`
2424
# supports `arbitrary`. This way, we avoid feature unification.
25-
arbitrary = "1"
26-
derive_arbitrary = "1"
25+
arbitrary = "1.1.0"
26+
derive_arbitrary = "1.1.0"

‎crates/flycheck/Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ rust-version = "1.57"
1010
doctest = false
1111

1212
[dependencies]
13-
crossbeam-channel = "0.5.0"
14-
tracing = "0.1"
15-
cargo_metadata = "0.14"
16-
serde = { version = "1.0.106", features = ["derive"] }
17-
serde_json = "1.0.48"
18-
jod-thread = "0.1.1"
13+
crossbeam-channel = "0.5.4"
14+
tracing = "0.1.32"
15+
cargo_metadata = "0.14.2"
16+
serde = { version = "1.0.136", features = ["derive"] }
17+
serde_json = "1.0.79"
18+
jod-thread = "0.1.2"
1919

2020
toolchain = { path = "../toolchain", version = "0.0.0" }
2121
stdx = { path = "../stdx", version = "0.0.0" }

‎crates/hir/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ doctest = false
1111

1212
[dependencies]
1313
rustc-hash = "1.1.0"
14-
either = "1.5.3"
15-
arrayvec = "0.7"
16-
itertools = "0.10.0"
17-
smallvec = "1.4.0"
18-
once_cell = "1"
14+
either = "1.6.1"
15+
arrayvec = "0.7.2"
16+
itertools = "0.10.3"
17+
smallvec = "1.8.0"
18+
once_cell = "1.10.0"
1919

2020
stdx = { path = "../stdx", version = "0.0.0" }
2121
syntax = { path = "../syntax", version = "0.0.0" }

‎crates/hir_def/Cargo.toml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ doctest = false
1111

1212
[dependencies]
1313
cov-mark = "2.0.0-pre.1"
14-
dashmap = { version = "5.0", features = ["raw-api"] }
15-
lock_api = "0.4"
16-
parking_lot = "0.12"
17-
tracing = "0.1"
18-
once_cell = "1.3.1"
14+
dashmap = { version = "5.2.0", features = ["raw-api"] }
15+
lock_api = "0.4.6"
16+
parking_lot = "0.12.0"
17+
tracing = "0.1.32"
18+
once_cell = "1.10.0"
1919
rustc-hash = "1.1.0"
20-
either = "1.5.3"
20+
either = "1.6.1"
2121
anymap = "0.12.1"
22-
drop_bomb = "0.1.4"
23-
fst = { version = "0.4", default-features = false }
24-
itertools = "0.10.0"
25-
indexmap = "1.7.0"
26-
smallvec = "1.4.0"
22+
drop_bomb = "0.1.5"
23+
fst = { version = "0.4.7", default-features = false }
24+
itertools = "0.10.3"
25+
indexmap = "1.8.0"
26+
smallvec = "1.8.0"
2727
arrayvec = "0.7.2"
2828
la-arena = { version = "0.3.0", path = "../../lib/arena" }
2929

@@ -39,4 +39,4 @@ limit = { path = "../limit", version = "0.0.0" }
3939

4040
[dev-dependencies]
4141
test_utils = { path = "../test_utils" }
42-
expect-test = "1.2.0-pre.1"
42+
expect-test = "1.2.2"

‎crates/hir_expand/Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ doctest = false
1111

1212
[dependencies]
1313
cov-mark = "2.0.0-pre.1"
14-
tracing = "0.1"
15-
either = "1.5.3"
16-
rustc-hash = "1.0.0"
14+
tracing = "0.1.32"
15+
either = "1.6.1"
16+
rustc-hash = "1.1.0"
1717
la-arena = { version = "0.3.0", path = "../../lib/arena" }
18-
itertools = "0.10.0"
19-
hashbrown = { version = "0.12", features = [
18+
itertools = "0.10.3"
19+
hashbrown = { version = "0.12.0", features = [
2020
"inline-more",
2121
], default-features = false }
2222

@@ -29,4 +29,4 @@ mbe = { path = "../mbe", version = "0.0.0" }
2929
limit = { path = "../limit", version = "0.0.0" }
3030

3131
[dev-dependencies]
32-
expect-test = "1.2.0-pre.1"
32+
expect-test = "1.2.2"

‎crates/hir_ty/Cargo.toml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ doctest = false
1111

1212
[dependencies]
1313
cov-mark = "2.0.0-pre.1"
14-
itertools = "0.10.0"
15-
arrayvec = "0.7"
16-
smallvec = "1.2.0"
14+
itertools = "0.10.3"
15+
arrayvec = "0.7.2"
16+
smallvec = "1.8.0"
1717
ena = "0.14.0"
18-
tracing = "0.1"
18+
tracing = "0.1.32"
1919
rustc-hash = "1.1.0"
20-
scoped-tls = "1"
21-
chalk-solve = { version = "0.79", default-features = false }
22-
chalk-ir = "0.79"
23-
chalk-recursive = { version = "0.79", default-features = false }
20+
scoped-tls = "1.0.0"
21+
chalk-solve = { version = "0.80.0", default-features = false }
22+
chalk-ir = "0.80.0"
23+
chalk-recursive = { version = "0.80.0", default-features = false }
2424
la-arena = { version = "0.3.0", path = "../../lib/arena" }
25-
once_cell = { version = "1.5.0" }
25+
once_cell = "1.10.0"
2626
typed-arena = "2.0.1"
2727

2828
stdx = { path = "../stdx", version = "0.0.0" }
@@ -35,10 +35,10 @@ limit = { path = "../limit", version = "0.0.0" }
3535

3636
[dev-dependencies]
3737
test_utils = { path = "../test_utils" }
38-
expect-test = "1.2.0-pre.1"
39-
tracing = "0.1"
40-
tracing-subscriber = { version = "0.3", default-features = false, features = [
38+
expect-test = "1.2.2"
39+
tracing = "0.1.32"
40+
tracing-subscriber = { version = "0.3.9", default-features = false, features = [
4141
"env-filter",
4242
"registry",
4343
] }
44-
tracing-tree = "0.2"
44+
tracing-tree = "0.2.0"

‎crates/hir_ty/src/chalk_db.rs‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,10 @@ impl<'a> chalk_solve::RustIrDatabase<Interner> for ChalkContext<'a> {
337337
hir_def::AdtId::UnionId(id) => self.db.union_data(id).name.to_string(),
338338
}
339339
}
340+
fn adt_size_align(&self, _id: chalk_ir::AdtId<Interner>) -> Arc<rust_ir::AdtSizeAlign> {
341+
// FIXME
342+
Arc::new(rust_ir::AdtSizeAlign::from_one_zst(false))
343+
}
340344
fn assoc_type_name(&self, assoc_ty_id: chalk_ir::AssocTypeId<Interner>) -> String {
341345
let id = self.db.associated_ty_data(assoc_ty_id).name;
342346
self.db.type_alias_data(id).name.to_string()
@@ -480,34 +484,38 @@ pub(crate) fn trait_datum_query(
480484

481485
fn well_known_trait_from_lang_attr(name: &str) -> Option<WellKnownTrait> {
482486
Some(match name {
483-
"sized" => WellKnownTrait::Sized,
484-
"copy" => WellKnownTrait::Copy,
485487
"clone" => WellKnownTrait::Clone,
488+
"coerce_unsized" => WellKnownTrait::CoerceUnsized,
489+
"copy" => WellKnownTrait::Copy,
490+
"discriminant_kind" => WellKnownTrait::DiscriminantKind,
491+
"dispatch_from_dyn" => WellKnownTrait::DispatchFromDyn,
486492
"drop" => WellKnownTrait::Drop,
487-
"fn_once" => WellKnownTrait::FnOnce,
488-
"fn_mut" => WellKnownTrait::FnMut,
489493
"fn" => WellKnownTrait::Fn,
494+
"fn_mut" => WellKnownTrait::FnMut,
495+
"fn_once" => WellKnownTrait::FnOnce,
496+
"generator" => WellKnownTrait::Generator,
497+
"sized" => WellKnownTrait::Sized,
498+
"unpin" => WellKnownTrait::Unpin,
490499
"unsize" => WellKnownTrait::Unsize,
491-
"coerce_unsized" => WellKnownTrait::CoerceUnsized,
492-
"discriminant_kind" => WellKnownTrait::DiscriminantKind,
493500
_ => return None,
494501
})
495502
}
496503

497504
fn lang_attr_from_well_known_trait(attr: WellKnownTrait) -> &'static str {
498505
match attr {
499-
WellKnownTrait::Sized => "sized",
500-
WellKnownTrait::Copy => "copy",
501506
WellKnownTrait::Clone => "clone",
502-
WellKnownTrait::Drop => "drop",
503-
WellKnownTrait::FnOnce => "fn_once",
504-
WellKnownTrait::FnMut => "fn_mut",
505-
WellKnownTrait::Fn => "fn",
506-
WellKnownTrait::Unsize => "unsize",
507-
WellKnownTrait::Unpin => "unpin",
508507
WellKnownTrait::CoerceUnsized => "coerce_unsized",
508+
WellKnownTrait::Copy => "copy",
509509
WellKnownTrait::DiscriminantKind => "discriminant_kind",
510+
WellKnownTrait::DispatchFromDyn => "dispatch_from_dyn",
511+
WellKnownTrait::Drop => "drop",
512+
WellKnownTrait::Fn => "fn",
513+
WellKnownTrait::FnMut => "fn_mut",
514+
WellKnownTrait::FnOnce => "fn_once",
510515
WellKnownTrait::Generator => "generator",
516+
WellKnownTrait::Sized => "sized",
517+
WellKnownTrait::Unpin => "unpin",
518+
WellKnownTrait::Unsize => "unsize",
511519
}
512520
}
513521

‎crates/ide/Cargo.toml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ doctest = false
1111

1212
[dependencies]
1313
cov-mark = "2.0.0-pre.1"
14-
crossbeam-channel = "0.5.0"
15-
either = "1.5.3"
16-
itertools = "0.10.0"
17-
tracing = "0.1"
14+
crossbeam-channel = "0.5.4"
15+
either = "1.6.1"
16+
itertools = "0.10.3"
17+
tracing = "0.1.32"
1818
rustc-hash = "1.1.0"
19-
oorandom = "11.1.2"
20-
pulldown-cmark-to-cmark = "10.0.0"
21-
pulldown-cmark = { version = "0.9", default-features = false }
22-
url = "2.1.1"
19+
oorandom = "11.1.3"
20+
pulldown-cmark-to-cmark = "10.0.1"
21+
pulldown-cmark = { version = "0.9.1", default-features = false }
22+
url = "2.2.2"
2323
dot = "0.1.4"
2424

2525
stdx = { path = "../stdx", version = "0.0.0" }
@@ -39,4 +39,4 @@ hir = { path = "../hir", version = "0.0.0" }
3939

4040
[dev-dependencies]
4141
test_utils = { path = "../test_utils" }
42-
expect-test = "1.2.0-pre.1"
42+
expect-test = "1.2.2"

‎crates/ide_assists/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ doctest = false
1212
[dependencies]
1313
cov-mark = "2.0.0-pre.1"
1414
rustc-hash = "1.1.0"
15-
itertools = "0.10.0"
15+
itertools = "0.10.3"
1616
either = "1.6.1"
1717

1818
stdx = { path = "../stdx", version = "0.0.0" }
@@ -25,4 +25,4 @@ hir = { path = "../hir", version = "0.0.0" }
2525
[dev-dependencies]
2626
test_utils = { path = "../test_utils" }
2727
sourcegen = { path = "../sourcegen" }
28-
expect-test = "1.2.0-pre.1"
28+
expect-test = "1.2.2"

0 commit comments

Comments
 (0)