git.iko.soy/helix
on master help sign in
build(deps): bump bitflags from 1.3.2 to 2.0.2 (#6387)
52ced7edependabot[bot]
Cargo.lock+19−13
compare with master
unifiedsplit
@@ -73,6 +73,12 @@ version = "1.3.2"
73source = "registry+https://github.com/rust-lang/crates.io-index"
73source = "registry+https://github.com/rust-lang/crates.io-index"
74checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
74checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
75
75
76+[[package]]
77+name = "bitflags"
78+version = "2.0.2"
79+source = "registry+https://github.com/rust-lang/crates.io-index"
80+checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1"
81+
76[[package]]
82[[package]]
77name = "bstr"
83name = "bstr"
78version = "1.3.0"
84version = "1.3.0"
@@ -210,7 +216,7 @@ version = "0.26.1"
210source = "registry+https://github.com/rust-lang/crates.io-index"
216source = "registry+https://github.com/rust-lang/crates.io-index"
211checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13"
217checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13"
212dependencies = [
218dependencies = [
213− "bitflags",
219+ "bitflags 1.3.2",
214 "crossterm_winapi",
220 "crossterm_winapi",
215 "futures-core",
221 "futures-core",
216 "libc",
222 "libc",
@@ -623,7 +629,7 @@ version = "0.10.1"
623source = "registry+https://github.com/rust-lang/crates.io-index"
629source = "registry+https://github.com/rust-lang/crates.io-index"
624checksum = "693d4a4ba0531e46fe558459557a5b29fb86c3e4b2666c1c0861d93c7c678331"
630checksum = "693d4a4ba0531e46fe558459557a5b29fb86c3e4b2666c1c0861d93c7c678331"
625dependencies = [
631dependencies = [
626− "bitflags",
632+ "bitflags 1.3.2",
627 "bstr",
633 "bstr",
628 "gix-path",
634 "gix-path",
629 "libc",
635 "libc",
@@ -708,7 +714,7 @@ version = "0.5.5"
708source = "registry+https://github.com/rust-lang/crates.io-index"
714source = "registry+https://github.com/rust-lang/crates.io-index"
709checksum = "93e43efd776bc543f46f0fd0ca3d920c37af71a764a16f2aebd89765e9ff2993"
715checksum = "93e43efd776bc543f46f0fd0ca3d920c37af71a764a16f2aebd89765e9ff2993"
710dependencies = [
716dependencies = [
711− "bitflags",
717+ "bitflags 1.3.2",
712 "bstr",
718 "bstr",
713]
719]
714
720
@@ -739,7 +745,7 @@ version = "0.15.0"
739source = "registry+https://github.com/rust-lang/crates.io-index"
745source = "registry+https://github.com/rust-lang/crates.io-index"
740checksum = "546ee7855d5d8731288f05a63c07ab41b59cb406660a825ed3fe89d7223823df"
746checksum = "546ee7855d5d8731288f05a63c07ab41b59cb406660a825ed3fe89d7223823df"
741dependencies = [
747dependencies = [
742− "bitflags",
748+ "bitflags 1.3.2",
743 "bstr",
749 "bstr",
744 "btoi",
750 "btoi",
745 "filetime",
751 "filetime",
@@ -923,7 +929,7 @@ version = "0.6.2"
923source = "registry+https://github.com/rust-lang/crates.io-index"
929source = "registry+https://github.com/rust-lang/crates.io-index"
924checksum = "e8ffa5bf0772f9b01de501c035b6b084cf9b8bb07dec41e3afc6a17336a65f47"
930checksum = "e8ffa5bf0772f9b01de501c035b6b084cf9b8bb07dec41e3afc6a17336a65f47"
925dependencies = [
931dependencies = [
926− "bitflags",
932+ "bitflags 1.3.2",
927 "dirs",
933 "dirs",
928 "gix-path",
934 "gix-path",
929 "libc",
935 "libc",
@@ -1074,7 +1080,7 @@ version = "0.6.0"
1074dependencies = [
1080dependencies = [
1075 "ahash 0.8.3",
1081 "ahash 0.8.3",
1076 "arc-swap",
1082 "arc-swap",
1077− "bitflags",
1083+ "bitflags 2.0.2",
1078 "chrono",
1084 "chrono",
1079 "encoding_rs",
1085 "encoding_rs",
1080 "etcetera",
1086 "etcetera",
@@ -1198,7 +1204,7 @@ dependencies = [
1198name = "helix-tui"
1204name = "helix-tui"
1199version = "0.6.0"
1205version = "0.6.0"
1200dependencies = [
1206dependencies = [
1201− "bitflags",
1207+ "bitflags 2.0.2",
1202 "cassowary",
1208 "cassowary",
1203 "crossterm",
1209 "crossterm",
1204 "helix-core",
1210 "helix-core",
@@ -1230,7 +1236,7 @@ version = "0.6.0"
1230dependencies = [
1236dependencies = [
1231 "anyhow",
1237 "anyhow",
1232 "arc-swap",
1238 "arc-swap",
1233− "bitflags",
1239+ "bitflags 2.0.2",
1234 "chardetng",
1240 "chardetng",
1235 "clipboard-win",
1241 "clipboard-win",
1236 "crossterm",
1242 "crossterm",
@@ -1462,7 +1468,7 @@ version = "0.94.0"
1462source = "registry+https://github.com/rust-lang/crates.io-index"
1468source = "registry+https://github.com/rust-lang/crates.io-index"
1463checksum = "0b63735a13a1f9cd4f4835223d828ed9c2e35c8c5e61837774399f558b6a1237"
1469checksum = "0b63735a13a1f9cd4f4835223d828ed9c2e35c8c5e61837774399f558b6a1237"
1464dependencies = [
1470dependencies = [
1465− "bitflags",
1471+ "bitflags 1.3.2",
1466 "serde",
1472 "serde",
1467 "serde_json",
1473 "serde_json",
1468 "serde_repr",
1474 "serde_repr",
@@ -1517,7 +1523,7 @@ version = "0.26.1"
1517source = "registry+https://github.com/rust-lang/crates.io-index"
1523source = "registry+https://github.com/rust-lang/crates.io-index"
1518checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694"
1524checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694"
1519dependencies = [
1525dependencies = [
1520− "bitflags",
1526+ "bitflags 1.3.2",
1521 "cfg-if",
1527 "cfg-if",
1522 "libc",
1528 "libc",
1523 "static_assertions",
1529 "static_assertions",
@@ -1648,7 +1654,7 @@ version = "0.9.2"
1648source = "registry+https://github.com/rust-lang/crates.io-index"
1654source = "registry+https://github.com/rust-lang/crates.io-index"
1649checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63"
1655checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63"
1650dependencies = [
1656dependencies = [
1651− "bitflags",
1657+ "bitflags 1.3.2",
1652 "memchr",
1658 "memchr",
1653 "unicase",
1659 "unicase",
1654]
1660]
@@ -1695,7 +1701,7 @@ version = "0.2.16"
1695source = "registry+https://github.com/rust-lang/crates.io-index"
1701source = "registry+https://github.com/rust-lang/crates.io-index"
1696checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
1702checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
1697dependencies = [
1703dependencies = [
1698− "bitflags",
1704+ "bitflags 1.3.2",
1699]
1705]
1700
1706
1701[[package]]
1707[[package]]
@@ -1748,7 +1754,7 @@ version = "0.36.7"
1748source = "registry+https://github.com/rust-lang/crates.io-index"
1754source = "registry+https://github.com/rust-lang/crates.io-index"
1749checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
1755checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
1750dependencies = [
1756dependencies = [
1751− "bitflags",
1757+ "bitflags 1.3.2",
1752 "errno",
1758 "errno",
1753 "io-lifetimes",
1759 "io-lifetimes",
1754 "libc",
1760 "libc",
helix-core/Cargo.toml+1−1
@@ -29,7 +29,7 @@ tree-sitter = "0.20"
29once_cell = "1.17"
29once_cell = "1.17"
30arc-swap = "1"
30arc-swap = "1"
31regex = "1"
31regex = "1"
32−bitflags = "1.3"
32+bitflags = "2.0"
33ahash = "0.8.3"
33ahash = "0.8.3"
34hashbrown = { version = "0.13.2", features = ["raw"] }
34hashbrown = { version = "0.13.2", features = ["raw"] }
35
35
helix-core/src/syntax.rs+1
@@ -1157,6 +1157,7 @@ impl Syntax {
1157bitflags! {
1157bitflags! {
1158 /// Flags that track the status of a layer
1158 /// Flags that track the status of a layer
1159 /// in the `Sytaxn::update` function
1159 /// in the `Sytaxn::update` function
1160+ #[derive(Debug)]
1160 struct LayerUpdateFlags : u32{
1161 struct LayerUpdateFlags : u32{
1161 const MODIFIED = 0b001;
1162 const MODIFIED = 0b001;
1162 const MOVED = 0b010;
1163 const MOVED = 0b010;
helix-tui/Cargo.toml+1−1
@@ -16,7 +16,7 @@ include = ["src/**/*", "README.md"]
16default = ["crossterm"]
16default = ["crossterm"]
17
17
18[dependencies]
18[dependencies]
19−bitflags = "1.3"
19+bitflags = "2.0"
20cassowary = "0.3"
20cassowary = "0.3"
21unicode-segmentation = "1.10"
21unicode-segmentation = "1.10"
22crossterm = { version = "0.26", optional = true }
22crossterm = { version = "0.26", optional = true }
helix-tui/src/widgets/mod.rs+2−2
@@ -27,7 +27,7 @@ use helix_view::graphics::Rect;
27
27
28bitflags! {
28bitflags! {
29 /// Bitflags that can be composed to set the visible borders essentially on the block widget.
29 /// Bitflags that can be composed to set the visible borders essentially on the block widget.
30− #[derive(Default)]
30+ #[derive(Debug, PartialEq, Eq, Clone, Copy, Default)]
31 pub struct Borders: u8 {
31 pub struct Borders: u8 {
32 /// Show the top border
32 /// Show the top border
33 const TOP = 0b0000_0001;
33 const TOP = 0b0000_0001;
@@ -38,7 +38,7 @@ bitflags! {
38 /// Show the left border
38 /// Show the left border
39 const LEFT = 0b0000_1000;
39 const LEFT = 0b0000_1000;
40 /// Show all borders
40 /// Show all borders
41− const ALL = Self::TOP.bits | Self::RIGHT.bits | Self::BOTTOM.bits | Self::LEFT.bits;
41+ const ALL = Self::TOP.bits() | Self::RIGHT.bits() | Self::BOTTOM.bits() | Self::LEFT.bits();
42 }
42 }
43}
43}
44
44
helix-view/Cargo.toml+1−1
@@ -14,7 +14,7 @@ default = []
14term = ["crossterm"]
14term = ["crossterm"]
15
15
16[dependencies]
16[dependencies]
17−bitflags = "1.3"
17+bitflags = "2.0"
18anyhow = "1"
18anyhow = "1"
19helix-core = { version = "0.6", path = "../helix-core" }
19helix-core = { version = "0.6", path = "../helix-core" }
20helix-loader = { version = "0.6", path = "../helix-loader" }
20helix-loader = { version = "0.6", path = "../helix-loader" }
helix-view/src/graphics.rs+1
@@ -352,6 +352,7 @@ bitflags! {
352 ///
352 ///
353 /// let m = Modifier::BOLD | Modifier::ITALIC;
353 /// let m = Modifier::BOLD | Modifier::ITALIC;
354 /// ```
354 /// ```
355+ #[derive(PartialEq, Eq, Debug, Clone, Copy)]
355 pub struct Modifier: u16 {
356 pub struct Modifier: u16 {
356 const BOLD = 0b0000_0000_0001;
357 const BOLD = 0b0000_0000_0001;
357 const DIM = 0b0000_0000_0010;
358 const DIM = 0b0000_0000_0010;
helix-view/src/keyboard.rs+1
@@ -2,6 +2,7 @@ use bitflags::bitflags;
2
2
3bitflags! {
3bitflags! {
4 /// Represents key modifiers (shift, control, alt).
4 /// Represents key modifiers (shift, control, alt).
5+ #[derive(Debug, PartialOrd, Ord, PartialEq, Eq, Clone, Copy, Hash)]
5 pub struct KeyModifiers: u8 {
6 pub struct KeyModifiers: u8 {
6 const SHIFT = 0b0000_0001;
7 const SHIFT = 0b0000_0001;
7 const CONTROL = 0b0000_0010;
8 const CONTROL = 0b0000_0010;