chore: update to Rust edition 2024

DanielleHuisman · DanielleHuisman · commit 0af610beb358 · 2025-04-05T11:34:34.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ resolver = "2"
 
 [workspace.package]
 authors = ["Rust For Web <info@rustforweb.org>"]
-edition = "2021"
+edition = "2024"
 license = "MIT"
 repository = "https://github.com/RustForWeb/mdbook-plugins"
 version = "0.2.1"
@@ -14,7 +14,7 @@ anyhow = "1.0.86"
 clap = { version = "4.5.8", features = ["derive"] }
 env_logger = "0.11.3"
 log = "0.4.22"
-mdbook = "0.4.40"
+mdbook = "0.4.43"
 pulldown-cmark = "0.13.0"
 semver = "1.0.23"
 serde = { version = "1.0.204", features = ["derive"] }
diff --git a/book/book.toml b/book/book.toml
@@ -18,3 +18,6 @@ additional-js = ["theme/tabs.js", "theme/trunk.js"]
 [output.trunk]
 command = "cargo run -p mdbook-trunk"
 serve = true
+
+[rust]
+edition = "2024"
diff --git a/packages/mdbook-plugin-utils/src/markdown/block.rs b/packages/mdbook-plugin-utils/src/markdown/block.rs
@@ -1,6 +1,6 @@
 use std::ops::Range;
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use log::debug;
 use pulldown_cmark::{Event, Parser};
 
diff --git a/packages/mdbook-plugin-utils/src/markdown/code_block.rs b/packages/mdbook-plugin-utils/src/markdown/code_block.rs
@@ -1,7 +1,7 @@
 use anyhow::Result;
 use pulldown_cmark::{CodeBlockKind, Event, Tag, TagEnd};
 
-use crate::markdown::block::{parse_blocks, Block};
+use crate::markdown::block::{Block, parse_blocks};
 
 fn is_code_block_start<IsTagsFn>(is_tags: IsTagsFn) -> Box<dyn Fn(&Event) -> bool>
 where
diff --git a/packages/mdbook-tabs/src/bin/mdbook-tabs.rs b/packages/mdbook-tabs/src/bin/mdbook-tabs.rs
@@ -3,12 +3,12 @@ use std::{
     io::{self, Read},
 };
 
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use clap::{Args, Parser, Subcommand};
 use log::warn;
 use mdbook::{
-    preprocess::{CmdPreprocessor, Preprocessor},
     MDBook,
+    preprocess::{CmdPreprocessor, Preprocessor},
 };
 use mdbook_tabs::TabsPreprocessor;
 use semver::{Version, VersionReq};
diff --git a/packages/mdbook-tabs/src/parser/tabs.rs b/packages/mdbook-tabs/src/parser/tabs.rs
@@ -1,6 +1,6 @@
 use std::ops::Range;
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use log::debug;
 use mdbook::book::Chapter;
 use mdbook_plugin_utils::markdown::parse_blocks;
diff --git a/packages/mdbook-tabs/src/preprocessor.rs b/packages/mdbook-tabs/src/preprocessor.rs
@@ -1,10 +1,10 @@
 use std::str;
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use mdbook::{
+    BookItem,
     book::Book,
     preprocess::{Preprocessor, PreprocessorContext},
-    BookItem,
 };
 
 use crate::{parser::tabs::parse_tabs, tabs::tabs};
diff --git a/packages/mdbook-tabs/src/tabs.rs b/packages/mdbook-tabs/src/tabs.rs
@@ -16,7 +16,7 @@ pub fn tabs(config: &TabsConfig) -> String {
                 "<button class=\"mdbook-tab{}\" data-tabname=\"{}\">{}</button>",
                 match index == 0 {
                     true => " active",
-                    false => ""
+                    false => "",
                 },
                 tab.name,
                 tab.name
@@ -31,7 +31,7 @@ pub fn tabs(config: &TabsConfig) -> String {
                 "<div class=\"mdbook-tab-content{}\" data-tabname=\"{}\">\n\n{}\n\n</div>",
                 match index == 0 {
                     true => "",
-                    false => " hidden"
+                    false => " hidden",
                 },
                 tab.name,
                 tab_content
diff --git a/packages/mdbook-trunk/Cargo.toml b/packages/mdbook-trunk/Cargo.toml
@@ -11,7 +11,7 @@ version.workspace = true
 
 [dependencies]
 anyhow.workspace = true
-cargo = { version = "0.86.0", features = ["all-static"] }
+cargo = { version = "0.87.0", features = ["all-static"] }
 clap.workspace = true
 env_logger.workspace = true
 fs_extra = "1.3.0"
diff --git a/packages/mdbook-trunk/src/bin/mdbook-trunk.rs b/packages/mdbook-trunk/src/bin/mdbook-trunk.rs
@@ -3,14 +3,14 @@ use std::{
     io::{self, Read},
 };
 
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use clap::{Args, Parser, Subcommand};
-use fs_extra::dir::{copy, get_dir_content2, CopyOptions, DirOptions};
+use fs_extra::dir::{CopyOptions, DirOptions, copy, get_dir_content2};
 use log::warn;
 use mdbook::{
+    MDBook, Renderer,
     preprocess::{CmdPreprocessor, Preprocessor},
     renderer::RenderContext,
-    MDBook, Renderer,
 };
 use mdbook_trunk::{TrunkPreprocessor, TrunkRenderer};
 use peekread::{BufPeekReader, PeekRead};
diff --git a/packages/mdbook-trunk/src/config.rs b/packages/mdbook-trunk/src/config.rs
@@ -1,6 +1,6 @@
 use std::{collections::HashMap, path::PathBuf};
 
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use cargo::{core::Workspace, ops::Packages};
 use serde::{Deserialize, Serialize};
 
diff --git a/packages/mdbook-trunk/src/parser/iframe.rs b/packages/mdbook-trunk/src/parser/iframe.rs
@@ -2,7 +2,7 @@ use std::ops::Range;
 
 use anyhow::Result;
 use html_parser::{Dom, Node};
-use htmlentity::entity::{decode, ICodedDataTrait};
+use htmlentity::entity::{ICodedDataTrait, decode};
 use log::debug;
 use mdbook::book::Chapter;
 use mdbook_plugin_utils::markdown::parse_blocks;
diff --git a/packages/mdbook-trunk/src/preprocessor.rs b/packages/mdbook-trunk/src/preprocessor.rs
@@ -1,11 +1,11 @@
 use std::{env, str};
 
 use anyhow::Result;
-use cargo::{core::Workspace, util::important_paths::find_root_manifest_for_wd, GlobalContext};
+use cargo::{GlobalContext, core::Workspace, util::important_paths::find_root_manifest_for_wd};
 use mdbook::{
+    BookItem,
     book::Book,
     preprocess::{Preprocessor, PreprocessorContext},
-    BookItem,
 };
 
 use crate::{parser::definition::parse_definitions, trunk::trunk};
diff --git a/packages/mdbook-trunk/src/renderer.rs b/packages/mdbook-trunk/src/renderer.rs
@@ -1,8 +1,8 @@
 use std::{collections::HashSet, env};
 
 use anyhow::Result;
-use cargo::{core::Workspace, util::important_paths::find_root_manifest_for_wd, GlobalContext};
-use mdbook::{renderer::RenderContext, BookItem, Renderer};
+use cargo::{GlobalContext, core::Workspace, util::important_paths::find_root_manifest_for_wd};
+use mdbook::{BookItem, Renderer, renderer::RenderContext};
 
 use crate::{config::BuildConfig, parser::iframe::parse_iframes, trunk::build};
 
diff --git a/packages/mdbook-trunk/src/trunk.rs b/packages/mdbook-trunk/src/trunk.rs
@@ -1,8 +1,8 @@
 use std::{fs, path::Path, process::Command, str};
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use cargo::core::Workspace;
-use htmlentity::entity::{encode, CharacterSet, EncodeType, ICodedDataTrait};
+use htmlentity::entity::{CharacterSet, EncodeType, ICodedDataTrait, encode};
 use log::{error, info};
 
 use crate::config::{BuildConfig, Config};
