From d5a3aafad25813940d0b1f75c18a2d629e3f9e0c Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 2 Mar 2026 15:58:23 -0600 Subject: [PATCH 1/2] chore: Bump MSRV to 1.85 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index a094a7f..3b88068 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ resolver = "2" repository = "https://github.com/rust-cli/termtree" license = "MIT" edition = "2021" -rust-version = "1.74" # MSRV +rust-version = "1.85" # MSRV include = [ "build.rs", "src/**/*", From 3631067a2367fb493779fede1855ece0bf493cbc Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 2 Mar 2026 15:58:54 -0600 Subject: [PATCH 2/2] chore: Migrate to Edition 2024 --- Cargo.toml | 4 ++-- examples/pretty-test.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 3b88068..7f1f755 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,10 +1,10 @@ [workspace] -resolver = "2" +resolver = "3" [workspace.package] repository = "https://github.com/rust-cli/termtree" license = "MIT" -edition = "2021" +edition = "2024" rust-version = "1.85" # MSRV include = [ "build.rs", diff --git a/examples/pretty-test.rs b/examples/pretty-test.rs index 1635b03..54fe034 100644 --- a/examples/pretty-test.rs +++ b/examples/pretty-test.rs @@ -2,7 +2,7 @@ //! To see the complete demo coupling with rust-script, you can refer to //! -use std::collections::{btree_map::Entry, BTreeMap}; +use std::collections::{BTreeMap, btree_map::Entry}; use termtree::{GlyphPalette, Tree}; fn main() {