Skip to content
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

Dont use the onig crate #957

Merged
merged 1 commit into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 26 additions & 23 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ serde = { version = "1.0", features = ["derive"] }
smallvec = "1.11" # version 2 is still alpha
splitty = "1.0.2"
strict = "0.1.4"
syntect = { package = "syntect-no-panic", version = "4.6.1" } # see issue #485
syntect = { package = "syntect-no-panic", version = "4.6.1", default-features = false, features = ["default-fancy"] } # see issues #485 and #956
tempfile = "3.2"
termimad = "0.31"
terminal-clipboard = { version = "0.4.1", optional = true }
Expand Down
13 changes: 8 additions & 5 deletions bacon.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,37 @@
# More info at https://github.com/Canop/bacon

default_job = "check"
env.CARGO_TERM_COLOR = "always"

[jobs]

[jobs.check-all]
command = ["cargo", "check", "--all-targets", "--color", "always"]
command = ["cargo", "check", "--all-targets"]
need_stdout = false
watch = ["tests", "benches", "examples"]

[jobs.check]
command = [
"cargo", "check",
"--color", "always",
"--features", "clipboard kitty-csi-check trash",
]
need_stdout = false
watch = ["benches"]

[jobs.miri]
command = ["cargo", "+nightly", "miri", "run"]
need_stdout = true

[jobs.win]
command = ["cross", "build", "--target", "x86_64-pc-windows-gnu", "--release", "--features", "clipboard"]

[jobs.light]
command = ["cargo", "check", "--color", "always"]
command = ["cargo", "check"]
need_stdout = false

[jobs.clippy]
command = [
"cargo", "clippy",
"--color", "always",
"--",
"-A", "clippy::bool_to_int_with_if",
"-A", "clippy::collapsible_else_if",
Expand All @@ -51,7 +54,7 @@ command = [
need_stdout = false

[jobs.test]
command = ["cargo", "test", "--color", "always"]
command = ["cargo", "test"]
need_stdout = true

[keybindings]
Expand Down
4 changes: 2 additions & 2 deletions src/display/matched_string.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pub struct MatchedString<'a> {
pub align: Alignment,
}

impl<'a, 'w> MatchedString<'a> {
impl<'a> MatchedString<'a> {

pub fn new(
name_match: Option<NameMatch>,
Expand Down Expand Up @@ -94,7 +94,7 @@ impl<'a, 'w> MatchedString<'a> {
}
removed_char_count
}
pub fn queue_on<W>(&self, cw: &mut CropWriter<'w, W>) -> Result<(), termimad::Error>
pub fn queue_on<W>(&self, cw: &mut CropWriter<'_, W>) -> Result<(), termimad::Error>
where
W: std::io::Write,
{
Expand Down
2 changes: 1 addition & 1 deletion src/kitty/image_renderer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ impl<'i> From<&'i DynamicImage> for ImageData<'i> {
}
}
}
impl<'i> ImageData<'i> {
impl ImageData<'_> {
fn kitty_format(&self) -> &'static str {
match self {
Self::RgbaRef(_) => "32",
Expand Down
1 change: 0 additions & 1 deletion src/task_sync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ impl Dam {
/// after the event listener started again. In any case
/// using try_compute should be preferred for immediate
/// return to the ui thread.

pub fn observer(&self) -> DamObserver {
DamObserver::from(self)
}
Expand Down