Skip to content

Commit 1f92641

Browse files
committed
Auto merge of #14593 - lnicola:bump-deps, r=lnicola
minor: Bump a couple of deps Only a couple because I didn't yet try to untangle the `windows-sys` / `syn 2.0`.
2 parents 5111207 + 160ab88 commit 1f92641

File tree

6 files changed

+36
-29
lines changed

6 files changed

+36
-29
lines changed

Cargo.lock

+31-25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/hir-def/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ doctest = false
1414
[dependencies]
1515
anymap = "1.0.0-beta.2"
1616
arrayvec = "0.7.2"
17-
bitflags = "1.3.2"
17+
bitflags = "2.1.0"
1818
cov-mark = "2.0.0-pre.1"
1919
# We need to freeze the version of the crate, as the raw-api feature is considered unstable
2020
dashmap = { version = "=5.4.0", features = ["raw-api"] }

crates/hir-def/src/data/adt.rs

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ pub struct StructData {
4444
}
4545

4646
bitflags! {
47+
#[derive(Debug, Clone, PartialEq, Eq)]
4748
pub struct StructFlags: u8 {
4849
const NO_FLAGS = 0;
4950
/// Indicates whether the struct is `PhantomData`.

crates/hir-def/src/item_tree.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ pub enum Param {
609609
}
610610

611611
bitflags::bitflags! {
612-
#[derive(Default)]
612+
#[derive(Debug, Clone, Copy, Eq, PartialEq, Default)]
613613
pub(crate) struct FnFlags: u8 {
614614
const HAS_SELF_PARAM = 1 << 0;
615615
const HAS_BODY = 1 << 1;

crates/hir-ty/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ doctest = false
1515
cov-mark = "2.0.0-pre.1"
1616
itertools = "0.10.5"
1717
arrayvec = "0.7.2"
18-
bitflags = "1.3.2"
18+
bitflags = "2.1.0"
1919
smallvec.workspace = true
2020
ena = "0.14.0"
2121
either = "1.7.0"

crates/hir-ty/src/infer/unify.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ pub(crate) fn unify(
131131
}
132132

133133
bitflags::bitflags! {
134-
#[derive(Default)]
134+
#[derive(Default, Clone, Copy)]
135135
pub(crate) struct TypeVariableFlags: u8 {
136136
const DIVERGING = 1 << 0;
137137
const INTEGER = 1 << 1;

0 commit comments

Comments
 (0)