Merge #11792

11792: minor: Bump dependencies r=Veykril a=Veykril



Co-authored-by: Lukas Wirth <[email protected]>

Author: bors[bot]

Cargo.lock

@@ -17,10 +17,10 @@ tt = { path = "../tt", version = "0.0.0" }
 [dev-dependencies]
 mbe = { path = "../mbe" }
 syntax = { path = "../syntax" }
-expect-test = "1.2.0-pre.1"
-oorandom = "11"
+expect-test = "1.2.2"
+oorandom = "11.1.3"
 # We depend on both individually instead of using `features = ["derive"]` to microoptimize the
 # build graph: if the feature was enabled, syn would be built early on in the graph if `smolstr`
 # supports `arbitrary`. This way, we avoid feature unification.
-arbitrary = "1"
-derive_arbitrary = "1"
+arbitrary = "1.1.0"
+derive_arbitrary = "1.1.0"

crates/cfg/Cargo.toml

@@ -10,12 +10,12 @@ rust-version = "1.57"
 doctest = false
 
 [dependencies]
-crossbeam-channel = "0.5.0"
-tracing = "0.1"
-cargo_metadata = "0.14"
-serde = { version = "1.0.106", features = ["derive"] }
-serde_json = "1.0.48"
-jod-thread = "0.1.1"
+crossbeam-channel = "0.5.4"
+tracing = "0.1.32"
+cargo_metadata = "0.14.2"
+serde = { version = "1.0.136", features = ["derive"] }
+serde_json = "1.0.79"
+jod-thread = "0.1.2"
 
 toolchain = { path = "../toolchain", version = "0.0.0" }
 stdx = { path = "../stdx", version = "0.0.0" }

crates/flycheck/Cargo.toml

@@ -11,11 +11,11 @@ doctest = false
 
 [dependencies]
 rustc-hash = "1.1.0"
-either = "1.5.3"
-arrayvec = "0.7"
-itertools = "0.10.0"
-smallvec = "1.4.0"
-once_cell = "1"
+either = "1.6.1"
+arrayvec = "0.7.2"
+itertools = "0.10.3"
+smallvec = "1.8.0"
+once_cell = "1.10.0"
 
 stdx = { path = "../stdx", version = "0.0.0" }
 syntax = { path = "../syntax", version = "0.0.0" }

crates/hir/Cargo.toml

@@ -11,19 +11,19 @@ doctest = false
 
 [dependencies]
 cov-mark = "2.0.0-pre.1"
-dashmap = { version = "5.0", features = ["raw-api"] }
-lock_api = "0.4"
-parking_lot = "0.12"
-tracing = "0.1"
-once_cell = "1.3.1"
+dashmap = { version = "5.2.0", features = ["raw-api"] }
+lock_api = "0.4.6"
+parking_lot = "0.12.0"
+tracing = "0.1.32"
+once_cell = "1.10.0"
 rustc-hash = "1.1.0"
-either = "1.5.3"
+either = "1.6.1"
 anymap = "0.12.1"
-drop_bomb = "0.1.4"
-fst = { version = "0.4", default-features = false }
-itertools = "0.10.0"
-indexmap = "1.7.0"
-smallvec = "1.4.0"
+drop_bomb = "0.1.5"
+fst = { version = "0.4.7", default-features = false }
+itertools = "0.10.3"
+indexmap = "1.8.0"
+smallvec = "1.8.0"
 arrayvec = "0.7.2"
 la-arena = { version = "0.3.0", path = "../../lib/arena" }
 
@@ -39,4 +39,4 @@ limit = { path = "../limit", version = "0.0.0" }
 
 [dev-dependencies]
 test_utils = { path = "../test_utils" }
-expect-test = "1.2.0-pre.1"
+expect-test = "1.2.2"

crates/hir_def/Cargo.toml

@@ -11,12 +11,12 @@ doctest = false
 
 [dependencies]
 cov-mark = "2.0.0-pre.1"
-tracing = "0.1"
-either = "1.5.3"
-rustc-hash = "1.0.0"
+tracing = "0.1.32"
+either = "1.6.1"
+rustc-hash = "1.1.0"
 la-arena = { version = "0.3.0", path = "../../lib/arena" }
-itertools = "0.10.0"
-hashbrown = { version = "0.12", features = [
+itertools = "0.10.3"
+hashbrown = { version = "0.12.0", features = [
     "inline-more",
 ], default-features = false }
 
@@ -29,4 +29,4 @@ mbe = { path = "../mbe", version = "0.0.0" }
 limit = { path = "../limit", version = "0.0.0" }
 
 [dev-dependencies]
-expect-test = "1.2.0-pre.1"
+expect-test = "1.2.2"

crates/hir_expand/Cargo.toml

@@ -11,18 +11,18 @@ doctest = false
 
 [dependencies]
 cov-mark = "2.0.0-pre.1"
-itertools = "0.10.0"
-arrayvec = "0.7"
-smallvec = "1.2.0"
+itertools = "0.10.3"
+arrayvec = "0.7.2"
+smallvec = "1.8.0"
 ena = "0.14.0"
-tracing = "0.1"
+tracing = "0.1.32"
 rustc-hash = "1.1.0"
-scoped-tls = "1"
-chalk-solve = { version = "0.79", default-features = false }
-chalk-ir = "0.79"
-chalk-recursive = { version = "0.79", default-features = false }
+scoped-tls = "1.0.0"
+chalk-solve = { version = "0.80.0", default-features = false }
+chalk-ir = "0.80.0"
+chalk-recursive = { version = "0.80.0", default-features = false }
 la-arena = { version = "0.3.0", path = "../../lib/arena" }
-once_cell = { version = "1.5.0" }
+once_cell = "1.10.0"
 typed-arena = "2.0.1"
 
 stdx = { path = "../stdx", version = "0.0.0" }
@@ -35,10 +35,10 @@ limit = { path = "../limit", version = "0.0.0" }
 
 [dev-dependencies]
 test_utils = { path = "../test_utils" }
-expect-test = "1.2.0-pre.1"
-tracing = "0.1"
-tracing-subscriber = { version = "0.3", default-features = false, features = [
+expect-test = "1.2.2"
+tracing = "0.1.32"
+tracing-subscriber = { version = "0.3.9", default-features = false, features = [
     "env-filter",
     "registry",
 ] }
-tracing-tree = "0.2"
+tracing-tree = "0.2.0"

crates/hir_ty/Cargo.toml

@@ -337,6 +337,10 @@ impl<'a> chalk_solve::RustIrDatabase<Interner> for ChalkContext<'a> {
             hir_def::AdtId::UnionId(id) => self.db.union_data(id).name.to_string(),
         }
     }
+    fn adt_size_align(&self, _id: chalk_ir::AdtId<Interner>) -> Arc<rust_ir::AdtSizeAlign> {
+        // FIXME
+        Arc::new(rust_ir::AdtSizeAlign::from_one_zst(false))
+    }
     fn assoc_type_name(&self, assoc_ty_id: chalk_ir::AssocTypeId<Interner>) -> String {
         let id = self.db.associated_ty_data(assoc_ty_id).name;
         self.db.type_alias_data(id).name.to_string()
@@ -480,34 +484,38 @@ pub(crate) fn trait_datum_query(
 
 fn well_known_trait_from_lang_attr(name: &str) -> Option<WellKnownTrait> {
     Some(match name {
-        "sized" => WellKnownTrait::Sized,
-        "copy" => WellKnownTrait::Copy,
         "clone" => WellKnownTrait::Clone,
+        "coerce_unsized" => WellKnownTrait::CoerceUnsized,
+        "copy" => WellKnownTrait::Copy,
+        "discriminant_kind" => WellKnownTrait::DiscriminantKind,
+        "dispatch_from_dyn" => WellKnownTrait::DispatchFromDyn,
         "drop" => WellKnownTrait::Drop,
-        "fn_once" => WellKnownTrait::FnOnce,
-        "fn_mut" => WellKnownTrait::FnMut,
         "fn" => WellKnownTrait::Fn,
+        "fn_mut" => WellKnownTrait::FnMut,
+        "fn_once" => WellKnownTrait::FnOnce,
+        "generator" => WellKnownTrait::Generator,
+        "sized" => WellKnownTrait::Sized,
+        "unpin" => WellKnownTrait::Unpin,
         "unsize" => WellKnownTrait::Unsize,
-        "coerce_unsized" => WellKnownTrait::CoerceUnsized,
-        "discriminant_kind" => WellKnownTrait::DiscriminantKind,
         _ => return None,
     })
 }
 
 fn lang_attr_from_well_known_trait(attr: WellKnownTrait) -> &'static str {
     match attr {
-        WellKnownTrait::Sized => "sized",
-        WellKnownTrait::Copy => "copy",
         WellKnownTrait::Clone => "clone",
-        WellKnownTrait::Drop => "drop",
-        WellKnownTrait::FnOnce => "fn_once",
-        WellKnownTrait::FnMut => "fn_mut",
-        WellKnownTrait::Fn => "fn",
-        WellKnownTrait::Unsize => "unsize",
-        WellKnownTrait::Unpin => "unpin",
         WellKnownTrait::CoerceUnsized => "coerce_unsized",
+        WellKnownTrait::Copy => "copy",
         WellKnownTrait::DiscriminantKind => "discriminant_kind",
+        WellKnownTrait::DispatchFromDyn => "dispatch_from_dyn",
+        WellKnownTrait::Drop => "drop",
+        WellKnownTrait::Fn => "fn",
+        WellKnownTrait::FnMut => "fn_mut",
+        WellKnownTrait::FnOnce => "fn_once",
         WellKnownTrait::Generator => "generator",
+        WellKnownTrait::Sized => "sized",
+        WellKnownTrait::Unpin => "unpin",
+        WellKnownTrait::Unsize => "unsize",
     }
 }
 

crates/hir_ty/src/chalk_db.rs

@@ -11,15 +11,15 @@ doctest = false
 
 [dependencies]
 cov-mark = "2.0.0-pre.1"
-crossbeam-channel = "0.5.0"
-either = "1.5.3"
-itertools = "0.10.0"
-tracing = "0.1"
+crossbeam-channel = "0.5.4"
+either = "1.6.1"
+itertools = "0.10.3"
+tracing = "0.1.32"
 rustc-hash = "1.1.0"
-oorandom = "11.1.2"
-pulldown-cmark-to-cmark = "10.0.0"
-pulldown-cmark = { version = "0.9", default-features = false }
-url = "2.1.1"
+oorandom = "11.1.3"
+pulldown-cmark-to-cmark = "10.0.1"
+pulldown-cmark = { version = "0.9.1", default-features = false }
+url = "2.2.2"
 dot = "0.1.4"
 
 stdx = { path = "../stdx", version = "0.0.0" }
@@ -39,4 +39,4 @@ hir = { path = "../hir", version = "0.0.0" }
 
 [dev-dependencies]
 test_utils = { path = "../test_utils" }
-expect-test = "1.2.0-pre.1"
+expect-test = "1.2.2"

crates/ide/Cargo.toml

@@ -12,7 +12,7 @@ doctest = false
 [dependencies]
 cov-mark = "2.0.0-pre.1"
 rustc-hash = "1.1.0"
-itertools = "0.10.0"
+itertools = "0.10.3"
 either = "1.6.1"
 
 stdx = { path = "../stdx", version = "0.0.0" }
@@ -25,4 +25,4 @@ hir = { path = "../hir", version = "0.0.0" }
 [dev-dependencies]
 test_utils = { path = "../test_utils" }
 sourcegen = { path = "../sourcegen" }
-expect-test = "1.2.0-pre.1"
+expect-test = "1.2.2"

crates/ide_assists/Cargo.toml

@@ -11,11 +11,11 @@ doctest = false
 
 [dependencies]
 cov-mark = "2.0.0-pre.1"
-itertools = "0.10.0"
+itertools = "0.10.3"
 rustc-hash = "1.1.0"
 either = "1.6.1"
-once_cell = "1.7"
-smallvec = "1.4"
+once_cell = "1.10.0"
+smallvec = "1.8.0"
 
 stdx = { path = "../stdx", version = "0.0.0" }
 syntax = { path = "../syntax", version = "0.0.0" }
@@ -29,6 +29,6 @@ profile = { path = "../profile", version = "0.0.0" }
 hir = { path = "../hir", version = "0.0.0" }
 
 [dev-dependencies]
-expect-test = "1.2.0-pre.1"
+expect-test = "1.2.2"
 
 test_utils = { path = "../test_utils" }