Merge branch 'master' into feature/links_preprocessor

blandger · Jul 21, 2024 · 3859cb2 · 3859cb2
2 parents 92b6355 + ec996d3
commit 3859cb2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/guide/src/format/configuration/renderers.md b/guide/src/format/configuration/renderers.md
@@ -123,7 +123,7 @@ The following configuration options are available:
   [`prefers-color-scheme`](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme)
   CSS media query. Defaults to `navy`.
 - **smart-punctuation:** Converts quotes to curly quotes, `...` to `…`, `--` to en-dash, and `---` to em-dash.
-  See [Smart Punctuation].
+  See [Smart Punctuation](../markdown.md#smart-punctuation).
   Defaults to `false`.
 - **curly-quotes:** Deprecated alias for `smart-punctuation`.
 - **mathjax-support:** Adds support for [MathJax](../mathjax.md). Defaults to

diff --git a/src/book/mod.rs b/src/book/mod.rs
@@ -345,6 +345,9 @@ impl MDBook {
                         RustEdition::E2021 => {
                             cmd.args(["--edition", "2021"]);
                         }
+                        RustEdition::E2024 => {
+                            cmd.args(["--edition", "2024", "-Zunstable-options"]);
+                        }
                     }
                 }
 

diff --git a/src/config.rs b/src/config.rs
@@ -507,6 +507,9 @@ pub struct RustConfig {
 #[derive(Debug, Copy, Clone, PartialEq, Serialize, Deserialize)]
 /// Rust edition to use for the code.
 pub enum RustEdition {
+    /// The 2024 edition of Rust
+    #[serde(rename = "2024")]
+    E2024,
     /// The 2021 edition of Rust
     #[serde(rename = "2021")]
     E2021,

diff --git a/src/renderer/html_handlebars/hbs_renderer.rs b/src/renderer/html_handlebars/hbs_renderer.rs
@@ -902,6 +902,7 @@ fn add_playground_pre(
                         Some(RustEdition::E2015) => " edition2015",
                         Some(RustEdition::E2018) => " edition2018",
                         Some(RustEdition::E2021) => " edition2021",
+                        Some(RustEdition::E2024) => " edition2024",
                         None => "",
                     }
                 };