From d7188f717861a4de524ac7a09d7639ab2cf52689 Mon Sep 17 00:00:00 2001 From: Wilfred Hughes Date: Sat, 25 May 2024 14:55:39 +0100 Subject: [PATCH 1/5] Remove unused struct --- src/lines.rs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/lines.rs b/src/lines.rs index 380c4d83c5..f6b1fb8a72 100644 --- a/src/lines.rs +++ b/src/lines.rs @@ -8,14 +8,6 @@ pub(crate) fn format_line_num(line_num: LineNumber) -> String { format!("{} ", line_num.display()) } -/// A position in a single line of a string. -#[derive(Debug, PartialEq, Clone, Copy)] -struct LinePosition { - /// Both zero-indexed. - pub(crate) line: LineNumber, - column: usize, -} - /// Return the length of `s` in bytes. /// /// This is a trivial wrapper to make it clear when we want bytes not From 7827a059cbf7af782a479fcf6618e4550e8180c4 Mon Sep 17 00:00:00 2001 From: Wilfred Hughes Date: Sat, 25 May 2024 14:58:14 +0100 Subject: [PATCH 2/5] Update F# expected output --- sample_files/compare.expected | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sample_files/compare.expected b/sample_files/compare.expected index 11c18bc447..42e6e6b948 100644 --- a/sample_files/compare.expected +++ b/sample_files/compare.expected @@ -68,7 +68,7 @@ sample_files/erlang_1.erl sample_files/erlang_2.erl dccdb8f65d2f099ab1a8cb66011376a2 - sample_files/f_sharp_1.fs sample_files/f_sharp_2.fs -6ba65e62a804124f56bdfb19afc8cd40 - +1a9173c15a42c1ebb9522109df172faf - sample_files/hack_1.php sample_files/hack_2.php c2bb0aa7d7b07d6ced79f6a5363e878b - From c503a7564ea902f201bbb83dcaad107ef49bcd9f Mon Sep 17 00:00:00 2001 From: Wilfred Hughes Date: Sat, 25 May 2024 15:02:39 +0100 Subject: [PATCH 3/5] Update regex dependency --- Cargo.lock | 33 ++++++++------------------------- Cargo.toml | 4 +--- 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1a9effbae7..07c081919b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -79,7 +79,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", - "regex-automata 0.4.6", + "regex-automata", "serde", ] @@ -329,8 +329,8 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.6", - "regex-syntax 0.8.2", + "regex-automata", + "regex-syntax", ] [[package]] @@ -747,25 +747,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.6" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.9", - "regex-syntax 0.7.5", -] - -[[package]] -name = "regex-automata" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.7.5", + "regex-automata", + "regex-syntax", ] [[package]] @@ -776,15 +765,9 @@ checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax", ] -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - [[package]] name = "regex-syntax" version = "0.8.2" diff --git a/Cargo.toml b/Cargo.toml index 994b814b48..861e36b9b2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,9 +37,7 @@ pkg-url = "{ repo }/releases/download/{ version }/difft-{ target }.{ archive-for pkg-fmt = "zip" [dependencies] -# regex 1.10 requires rust 1.65. -regex = ">= 1.9, < 1.10" - +regex = "1.10.4" clap = { version = "3.2.25", features = ["cargo", "env", "wrap_help"] } itertools = "0.11.0" typed-arena = "2.0.2" From b88b4056203cdd3075cd341595411195671a163b Mon Sep 17 00:00:00 2001 From: Wilfred Hughes Date: Sat, 25 May 2024 07:13:37 -0700 Subject: [PATCH 4/5] Notes on next tree-sitter version --- Cargo.toml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 861e36b9b2..3842966527 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,8 +44,11 @@ typed-arena = "2.0.2" rustc-hash = "1.1.0" strsim = "0.10.0" lazy_static = "1.4.0" -# tree-sitter 0.20.10 requires rust 1.65, although it could be lower. -# https://github.com/tree-sitter/tree-sitter/issues/2669 +# tree-sitter 0.22.5 uses std::os::fd::AsRawFd, which was added in Rust 1.66. +# https://github.com/tree-sitter/tree-sitter/commit/a7a47d561d4e64eaf226f93c4d68076afa67fdda +# +# tree-sitter 0.22.0 has some API changes which we need to update +# difftastic for. tree-sitter = "0.20.10" libc = "0.2.108" log = "0.4.14" From 1fba1c7e4a2bcc3d801551e391bd1455b0c754a8 Mon Sep 17 00:00:00 2001 From: wangweijie Date: Wed, 29 May 2024 19:54:54 +0800 Subject: [PATCH 5/5] deps: bump libc from 0.2.153 to 0.2.155 Signed-off-by: wangweijie --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 07c081919b..acb1101461 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -486,9 +486,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libm"