Skip to content

Commit 05b5be9

Browse files
committed
Bump bitflags from 1.3.2 to 2.3.3
1 parent 5d96306 commit 05b5be9

File tree

10 files changed

+179
-244
lines changed

10 files changed

+179
-244
lines changed

Cargo.lock

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

src/core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ name = "core"
1616

1717
[dependencies]
1818
anyhow = "1.0.72"
19-
bitflags = "1.3.2"
19+
bitflags = "2.3.3"
2020
captur = "0.1.0"
2121
crossbeam-channel = "0.5.8"
2222
if_chain = "1.0.2"

src/core/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,12 @@
123123
)
124124
)]
125125
// LINT-REPLACE-END
126+
// TODO deny clippy::same_name_method again once bitflags/bitflags#374 is merged
126127
#![allow(
127128
clippy::as_conversions,
128129
clippy::cast_possible_truncation,
129130
clippy::redundant_closure_for_method_calls,
131+
clippy::same_name_method,
130132
clippy::wildcard_enum_match_arm,
131133
missing_docs,
132134
rustdoc::missing_crate_level_docs,

src/core/src/modules/list/utils.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ pub(super) fn get_line_action_maximum_width(todo_file: &TodoFile) -> usize {
224224
}
225225

226226
bitflags! {
227+
#[derive(Default, PartialEq, Eq, Debug, Clone, Copy)]
227228
pub(crate) struct TodoLineSegmentsOptions: u8 {
228229
const CURSOR_LINE = 0b0000_0001;
229230
const SELECTED = 0b0000_0010;

src/input/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ name = "input"
1616

1717
[dependencies]
1818
anyhow = "1.0"
19-
bitflags = "1.3.2"
19+
bitflags = "2.3.3"
2020
captur = "0.1.0"
2121
crossbeam-channel = "0.5.8"
2222
crossterm = "0.26.1"

src/input/src/input_options.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use bitflags::bitflags;
22

33
bitflags! {
44
/// Represents options for parsing input events.
5+
#[derive(Default, PartialEq, Eq, Debug, Clone, Copy)]
56
pub struct InputOptions: u8 {
67
/// Enable movement input handling
78
const MOVEMENT = 0b0000_0001;

src/input/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@
123123
)
124124
)]
125125
// LINT-REPLACE-END
126+
// TODO deny clippy::same_name_method again once bitflags/bitflags#374 is merged
127+
#![allow(clippy::same_name_method)]
126128

127129
//! Git Interactive Rebase Tool - Input Module
128130
//!

src/view/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ testutils = ["dep:bitflags", "dep:iter_tools"]
1919

2020
[dependencies]
2121
anyhow = "1.0.72"
22-
bitflags = { version = "1.3.2", optional = true }
22+
bitflags = { version = "2.3.3", optional = true }
2323
captur = "0.1.0"
2424
crossbeam-channel = "0.5.8"
2525
parking_lot = "0.12.1"

src/view/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@
123123
)
124124
)]
125125
// LINT-REPLACE-END
126-
#![allow(clippy::as_conversions, clippy::integer_division)]
127-
126+
// TODO deny clippy::same_name_method again once bitflags/bitflags#374 is merged
127+
#![allow(clippy::same_name_method, clippy::as_conversions, clippy::integer_division)]
128128
//! Git Interactive Rebase Tool - View Module
129129
//!
130130
//! # Description

src/view/src/testutil/render_view_line.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::{LineSegment, ViewData, ViewLine};
55

66
bitflags! {
77
/// Options for the `assert_rendered_output!` macro
8-
#[derive(Default)]
8+
#[derive(Default, PartialEq, Eq, Debug, Clone, Copy)]
99
pub struct AssertRenderOptions: u8 {
1010
/// Ignore trailing whitespace
1111
const INCLUDE_TRAILING_WHITESPACE = 0b0000_0001;

0 commit comments

Comments
 (0)