On Sun, Oct 12, 2025 at 1:18 PM James McCoy <[email protected]> wrote: > On Sun, Oct 12, 2025 at 09:34:39AM -0400, Jeremy Bícha wrote: > >This transition needs debian/control and > >debian/patches/0014-Relax-fs4-dependency-to-0.9-0.12.patch updated. I > >did a test build and tree-sitter 0.22.6 successfully builds with the > >new rust-fs4 version. > > > >How do you want to coordinate this since tree-sitter is in both > >unstable and experimental? > > I'm currently trying to complete the heck 0.4 -> 0.5 transition, so I > can get tree-sitter uploaded to unstable. > > If tree-sitter can build against 0.13 without changes, I'll relax that > in the experimental version so when it uploads to unstable it will be > ready for fs4 0.13.
Yes, tree-sitter 0.22.6 builds against the new rust-fs4 with a minimal change, attached. Thank you, Jeremy Bícha
diff --git a/debian/control b/debian/control index 9808de9..e297ced 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Build-Depends: librust-difference-2+default-dev (>= 2.0.0), librust-dirs-5+default-dev (>= 5.0.1), librust-filetime-0.2+default-dev (>= 0.2.23), - librust-fs4-0.11+default-dev (>= 0.11.0), + librust-fs4-0.13+default-dev, librust-glob-0.3+default-dev (>= 0.3.1), librust-heck-0.4+default-dev, librust-html-escape-0.2+default-dev (>= 0.2.12), @@ -242,7 +242,7 @@ Depends: librust-anyhow-1+default-dev (>= 1.0.82), librust-cc-1+default-dev (>= 1.0.83), librust-dirs-5+default-dev (>= 5.0.1), - librust-fs4-0.11+default-dev (>= 0.11.0), + librust-fs4-0.13+default-dev, librust-indoc-2+default-dev (>= 2.0.5), librust-libloading-0.8+default-dev (>= 0.8.3), librust-once-cell-1+default-dev (>= 1.19.0), diff --git a/debian/patches/0014-Relax-fs4-dependency-to-0.9-0.12.patch b/debian/patches/0014-Relax-fs4-dependency-to-0.9-0.12.patch index b9b00ac..996417c 100644 --- a/debian/patches/0014-Relax-fs4-dependency-to-0.9-0.12.patch +++ b/debian/patches/0014-Relax-fs4-dependency-to-0.9-0.12.patch @@ -1,6 +1,6 @@ From: James McCoy <[email protected]> Date: Tue, 12 Nov 2024 22:16:45 -0500 -Subject: Relax fs4 dependency to >= 0.9, < 0.12 +Subject: Relax fs4 dependency to 0.13 fs4::FileExt moved to fs4::fs_std::FileExt in 0.9, so take upstream's patch for that. @@ -21,7 +21,7 @@ index 91dc061..8b57aa5 100644 dirs = "5.0.1" filetime = "0.2.23" -fs4 = "0.8.2" -+fs4 = ">= 0.9, < 0.12" ++fs4 = ">= 0.13" git2 = "0.18.3" glob = "0.3.1" heck = "0.4.0"
