Skip to content

Perform semver-incompatible dependency updates; squash CI warnings #947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
81 changes: 38 additions & 43 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 10 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ include = [
"/test"
]
edition = "2021"
rust-version = "1.77.0"

[[bin]]
name = "interactive-rebase-tool"
Expand All @@ -28,28 +29,28 @@ path = "src/main.rs"
[dependencies]
anyhow = "1.0.86"
bitflags = "2.5.0"
captur = "0.1.0"
captur = "1.0.0"
chrono = "0.4.38"
crossbeam-channel = "0.5.13"
crossterm = "0.27.0"
git2 = { version = "0.18.3", default-features = false, features = [] }
crossterm = "0.28.0"
git2 = { version = "0.19.0", default-features = false, features = [] }
if_chain = "1.0.2"
lazy_static = "1.4.0"
num-format = "0.4.4"
parking_lot = "0.12.3"
pico-args = "0.5.0"
thiserror = "1.0.61"
unicode-segmentation = "1.10.1"
unicode-width = "0.1.12"
unicode-width = "0.2.0"
uuid = { version = "1.8.0", features = ["v4", "fast-rng"] }
version-track = "0.1.0"
version-track = "1.0.0"
xi-unicode = "0.3.0"

[target.'cfg(target_os = "macos")'.dependencies]
crossterm = { version = "0.27.0", features = ["use-dev-tty"] }
crossterm = { version = "0.28.0", features = ["use-dev-tty"] }

[dev-dependencies]
claims = "0.7.1"
claims = "0.8.0"
itertools = "0.13.0"
pretty_assertions = "1.4.0"
regex = "1.8.4"
Expand Down Expand Up @@ -117,6 +118,7 @@ unexpected_cfgs = { level = "warn", check-cfg = ["cfg(tarpaulin_include)"] }
# absolute_paths_not_starting_with_crate - group rust_2018_compatibility
# box-pointers - used in project, and is safe to do so
deprecated_in_future = "warn"
edition_2024_expr_fragment_specifier = "allow"
# elided_lifetimes_in_paths - group: rust_2018_idioms
# explicit_outlives_requirements - group: rust_2018_idioms
ffi_unwind_calls = "warn"
Expand Down Expand Up @@ -173,6 +175,7 @@ absolute_paths = "allow"
as_conversions = "allow"
arithmetic_side_effects = "allow"
bool_to_int_with_if = "allow"
cfg_not_test = "allow"
default_numeric_fallback = "allow"
else_if_without_else = "allow"
expect_used = "allow"
Expand Down
2 changes: 1 addition & 1 deletion build.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::{env, process};

use chrono::{TimeZone, Utc};
use rustc_version::{version_meta, Channel};
use rustc_version::{Channel, version_meta};

fn main() {
println!("cargo::rustc-check-cfg=cfg(allow_unknown_lints)");
Expand Down
8 changes: 4 additions & 4 deletions src/application.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ use anyhow::Result;
use parking_lot::Mutex;

use crate::{
Args,
Exit,
config::Config,
display::Display,
git::Repository,
Expand All @@ -15,8 +17,6 @@ use crate::{
search,
todo_file::{TodoFile, TodoFileOptions},
view::View,
Args,
Exit,
};

pub(crate) struct Application<ModuleProvider>
Expand Down Expand Up @@ -198,12 +198,12 @@ mod tests {
module::Modules,
runtime::{Installer, RuntimeError},
test_helpers::{
DefaultTestModule,
TestModuleProvider,
create_config,
create_event_reader,
mocks,
with_git_directory,
DefaultTestModule,
TestModuleProvider,
},
};

Expand Down
24 changes: 12 additions & 12 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,29 +41,29 @@ const DEFAULT_TAB_SYMBOL: &str = "\u{2192}"; // →
#[non_exhaustive]
pub(crate) struct Config {
/// If to select the next line in the list after performing an action.
pub(crate) auto_select_next: bool,
pub auto_select_next: bool,
/// How to handle whitespace when calculating diffs.
pub(crate) diff_ignore_whitespace: DiffIgnoreWhitespaceSetting,
pub diff_ignore_whitespace: DiffIgnoreWhitespaceSetting,
/// If to ignore blank lines when calculating diffs.
pub(crate) diff_ignore_blank_lines: bool,
pub diff_ignore_blank_lines: bool,
/// How to show whitespace in diffs.
pub(crate) diff_show_whitespace: DiffShowWhitespaceSetting,
pub diff_show_whitespace: DiffShowWhitespaceSetting,
/// The symbol used to replace space characters.
pub(crate) diff_space_symbol: String,
pub diff_space_symbol: String,
/// The symbol used to replace tab characters.
pub(crate) diff_tab_symbol: String,
pub diff_tab_symbol: String,
/// The display width of the tab character.
pub(crate) diff_tab_width: u32,
pub diff_tab_width: u32,
/// If set, automatically add an exec line with the command after every modified line
pub(crate) post_modified_line_exec_command: Option<String>,
pub post_modified_line_exec_command: Option<String>,
/// The maximum number of undo steps.
pub(crate) undo_limit: u32,
pub undo_limit: u32,
/// Configuration options loaded directly from Git.
pub(crate) git: GitConfig,
pub git: GitConfig,
/// Key binding configuration.
pub(crate) key_bindings: KeyBindings,
pub key_bindings: KeyBindings,
/// Theme configuration.
pub(crate) theme: Theme,
pub theme: Theme,
}

impl Config {
Expand Down
Loading
Loading