Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some issues with the rust-lang/rust upstream. #68

Merged
merged 1 commit into from
Jul 11, 2024
Merged

Fix some issues with the rust-lang/rust upstream. #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions mdbook-spec/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## mdbook-spec 0.1.2

- Fixed some issues with rust-lang/rust build integration.

## mdbook-spec 0.1.1

- Moved code to a library to support upstream integration.
Expand Down
4 changes: 2 additions & 2 deletions mdbook-spec/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "mdbook-spec"
version = "0.1.1"
version = "0.1.2"
edition = "2021"
license = "MIT OR Apache-2.0"
description = "An mdBook preprocessor to help with the Rust specification."
Expand All @@ -13,7 +13,7 @@ anyhow = "1.0.79"
mdbook = { version = "0.4.36", default-features = false }
once_cell = "1.19.0"
pathdiff = "0.2.1"
regex = "1.10.3"
regex = "1.9.4"
semver = "1.0.21"
serde_json = "1.0.113"
tempfile = "3.10.1"
6 changes: 3 additions & 3 deletions mdbook-spec/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ impl Spec {
let source_path = chapter.source_path.clone().unwrap_or_default();
let path = chapter.path.clone().unwrap_or_default();
RULE_RE
.replace_all(&chapter.content, |caps: &Captures| {
.replace_all(&chapter.content, |caps: &Captures<'_>| {
let rule_id = &caps[1];
if let Some((old, _)) =
found_rules.insert(rule_id.to_string(), (source_path.clone(), path.clone()))
Expand Down Expand Up @@ -127,7 +127,7 @@ impl Spec {
/// file.
fn admonitions(&self, chapter: &Chapter) -> String {
ADMONITION_RE
.replace_all(&chapter.content, |caps: &Captures| {
.replace_all(&chapter.content, |caps: &Captures<'_>| {
let lower = caps["admon"].to_lowercase();
format!(
"<div class=\"{lower}\">\n\n{}\n\n</div>\n",
Expand All @@ -140,7 +140,7 @@ impl Spec {

impl Preprocessor for Spec {
fn name(&self) -> &str {
"nop-preprocessor"
"spec"
}

fn run(&self, _ctx: &PreprocessorContext, mut book: Book) -> Result<Book, Error> {
Expand Down
5 changes: 3 additions & 2 deletions mdbook-spec/src/std_links.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ pub fn std_links(chapter: &Chapter) -> String {

// Replace any disambiguated links with just the disambiguation.
let mut output = STD_LINK_RE
.replace_all(&chapter.content, |caps: &Captures| {
.replace_all(&chapter.content, |caps: &Captures<'_>| {
if let Some(dest) = caps.get(2) {
// Replace destination parenthesis with a link definition (square brackets).
format!("{}[{}]", &caps[1], dest.as_str())
Expand Down Expand Up @@ -174,7 +174,8 @@ fn run_rustdoc(tmp: &TempDir, links: &[(&str, Option<&str>)], chapter: &Chapter)
)
.unwrap();
fs::write(&src_path, &src).unwrap();
let output = Command::new("rustdoc")
let rustdoc = std::env::var("RUSTDOC").unwrap_or_else(|_| "rustdoc".into());
let output = Command::new(rustdoc)
.arg("--edition=2021")
.arg(&src_path)
.current_dir(tmp.path())
Expand Down
Loading