Skip to content

Commit 2e704b5

Browse files
committed
meta: Allow running on newer rustdoc version with warning
1 parent c31887b commit 2e704b5

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

src/transform/intralinks/rustdoc.rs

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use rustdoc_types::{Enum, ProcMacro, Union};
1717
use std::collections::HashMap;
1818
use std::path::{Path, PathBuf};
1919

20-
const EXPECTED_RUSTDOC_FORMAT_VERSION: u32 = 56;
20+
const EXPECTED_RUSTDOC_FORMAT_VERSION: u32 = 55;
2121

2222
fn crate_from_file(path: &Path) -> Result<Crate, IntralinkError> {
2323
let json = std::fs::read_to_string(path)
@@ -506,12 +506,17 @@ fn run_rustdoc(
506506

507507
let rustdoc_crate = crate_from_file(&rustdoc_json_path)?;
508508

509-
match rustdoc_crate.format_version {
510-
EXPECTED_RUSTDOC_FORMAT_VERSION => Ok(rustdoc_crate),
511-
format_version => Err(IntralinkError::UnsupportedRustdocFormatVersion {
512-
version: format_version,
513-
expected_version: EXPECTED_RUSTDOC_FORMAT_VERSION,
514-
}),
509+
if rustdoc_crate.format_version > EXPECTED_RUSTDOC_FORMAT_VERSION {
510+
eprintln!("Warning: Unknown newer rustdoc version {}. Trying to run anyway.", rustdoc_crate.format_version);
511+
Ok(rustdoc_crate)
512+
} else {
513+
match rustdoc_crate.format_version {
514+
EXPECTED_RUSTDOC_FORMAT_VERSION => Ok(rustdoc_crate),
515+
format_version => Err(IntralinkError::UnsupportedRustdocFormatVersion {
516+
version: format_version,
517+
expected_version: EXPECTED_RUSTDOC_FORMAT_VERSION,
518+
}),
519+
}
515520
}
516521
}
517522

0 commit comments

Comments
 (0)