jesus/mdbook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2398 from ehuss/edition2024

Browse source 
Add support for Rust Edition 2024
This commit is contained in:
Eric Huss 2024-06-12 22:59:25 +00:00 • committed by GitHub
commit 3bdcc0a5a6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/book/mod.rs
View file

@ -345,6 +345,9 @@ impl MDBook {
RustEdition::E2021 => { RustEdition::E2021 => {
cmd.args(["--edition", "2021"]); cmd.args(["--edition", "2021"]);
} }
RustEdition::E2024 => {
cmd.args(["--edition", "2024", "-Zunstable-options"]);
}
} }
} }

3
src/config.rs
View file

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

1
src/renderer/html_handlebars/hbs_renderer.rs
View file

@ -902,6 +902,7 @@ fn add_playground_pre(
Some(RustEdition::E2015) => " edition2015", Some(RustEdition::E2015) => " edition2015",
Some(RustEdition::E2018) => " edition2018", Some(RustEdition::E2018) => " edition2018",
Some(RustEdition::E2021) => " edition2021", Some(RustEdition::E2021) => " edition2021",
Some(RustEdition::E2024) => " edition2024",
None => "", None => "",
} }
}; };