From 81c832ffe7c844badd49b033ac4df3935df73c56 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Thu, 4 Jul 2024 11:49:55 -0700 Subject: [PATCH 1/3] Rename main.rs to lib.rs. Switching to a library to support upstream rustbook. Next commit will add the main back. --- mdbook-spec/src/{main.rs => lib.rs} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename mdbook-spec/src/{main.rs => lib.rs} (100%) diff --git a/mdbook-spec/src/main.rs b/mdbook-spec/src/lib.rs similarity index 100% rename from mdbook-spec/src/main.rs rename to mdbook-spec/src/lib.rs From b1e5cf3c029fb523de5eb69b84bb5192efc33e01 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Thu, 4 Jul 2024 11:51:01 -0700 Subject: [PATCH 2/3] Create mdbook-spec main.rs. Switching most of the code to a library to support rustbook upstream. --- mdbook-spec/src/lib.rs | 27 ++------------------------- mdbook-spec/src/main.rs | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 25 deletions(-) create mode 100644 mdbook-spec/src/main.rs diff --git a/mdbook-spec/src/lib.rs b/mdbook-spec/src/lib.rs index 255da02..1504626 100644 --- a/mdbook-spec/src/lib.rs +++ b/mdbook-spec/src/lib.rs @@ -8,7 +8,6 @@ use semver::{Version, VersionReq}; use std::collections::BTreeMap; use std::io; use std::path::PathBuf; -use std::process; mod std_links; @@ -21,29 +20,7 @@ static ADMONITION_RE: Lazy = Lazy::new(|| { Regex::new(r"(?m)^ *> \[!(?[^]]+)\]\n(?
(?: *> .*\n)+)").unwrap() }); -fn main() { - let mut args = std::env::args().skip(1); - match args.next().as_deref() { - Some("supports") => { - // Supports all renderers. - return; - } - Some(arg) => { - eprintln!("unknown argument: {arg}"); - std::process::exit(1); - } - None => {} - } - - let preprocessor = Spec::new(); - - if let Err(e) = handle_preprocessing(&preprocessor) { - eprintln!("{}", e); - process::exit(1); - } -} - -fn handle_preprocessing(pre: &dyn Preprocessor) -> Result<(), Error> { +pub fn handle_preprocessing(pre: &dyn Preprocessor) -> Result<(), Error> { let (ctx, book) = CmdPreprocessor::parse_input(io::stdin())?; let book_version = Version::parse(&ctx.mdbook_version)?; @@ -65,7 +42,7 @@ fn handle_preprocessing(pre: &dyn Preprocessor) -> Result<(), Error> { Ok(()) } -struct Spec { +pub struct Spec { /// Whether or not warnings should be errors (set by SPEC_DENY_WARNINGS /// environment variable). deny_warnings: bool, diff --git a/mdbook-spec/src/main.rs b/mdbook-spec/src/main.rs new file mode 100644 index 0000000..56e11d7 --- /dev/null +++ b/mdbook-spec/src/main.rs @@ -0,0 +1,21 @@ +fn main() { + let mut args = std::env::args().skip(1); + match args.next().as_deref() { + Some("supports") => { + // Supports all renderers. + return; + } + Some(arg) => { + eprintln!("unknown argument: {arg}"); + std::process::exit(1); + } + None => {} + } + + let preprocessor = mdbook_spec::Spec::new(); + + if let Err(e) = mdbook_spec::handle_preprocessing(&preprocessor) { + eprintln!("{}", e); + std::process::exit(1); + } +} From 410d49360ce90d47dd6bd9308d944829f56d96e8 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Thu, 4 Jul 2024 11:51:39 -0700 Subject: [PATCH 3/3] Bump version to 0.1.1. --- mdbook-spec/CHANGELOG.md | 4 ++++ mdbook-spec/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mdbook-spec/CHANGELOG.md b/mdbook-spec/CHANGELOG.md index a631229..7a22032 100644 --- a/mdbook-spec/CHANGELOG.md +++ b/mdbook-spec/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## mdbook-spec 0.1.1 + +- Moved code to a library to support upstream integration. + ## mdbook-spec 0.1.0 - Initial release diff --git a/mdbook-spec/Cargo.toml b/mdbook-spec/Cargo.toml index 31b837a..2ed2a51 100644 --- a/mdbook-spec/Cargo.toml +++ b/mdbook-spec/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mdbook-spec" -version = "0.1.0" +version = "0.1.1" edition = "2021" license = "MIT OR Apache-2.0" description = "An mdBook preprocessor to help with the Rust specification."