Skip to content

updates to handle new nightlies #281

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

Merged
merged 2 commits into from
Jan 11, 2019
Merged

updates to handle new nightlies #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
343cf65
add noscript.css to essential-files
QuietMisdreavus Dec 21, 2018
419d9b1
send --static-root-path and --disable-per-crate-search to rustdoc
QuietMisdreavus Jan 11, 2019
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
3 changes: 2 additions & 1 deletion src/docbuilder/chroot_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,8 @@ impl DocBuilder {
"settings.css",
"storage.js",
"theme.js",
"source-script.js"],
"source-script.js",
"noscript.css"],
// files doesn't require rustc version subfix
["FiraSans-Medium.woff",
"FiraSans-Regular.woff",
Expand Down
4 changes: 3 additions & 1 deletion src/utils/build_doc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ pub fn build_doc(name: &str, vers: Option<&str>, target: Option<&str>) -> Result
let mut rustdoc_args: Vec<String> =
vec!["-Z".to_string(), "unstable-options".to_string(),
"--resource-suffix".to_string(),
format!("-{}", parse_rustc_version(get_current_versions()?.0)?)];
format!("-{}", parse_rustc_version(get_current_versions()?.0)?),
"--static-root-path".to_string(), "/".to_string(),
"--disable-per-crate-search".to_string()];

// since https://github.com/rust-lang/rust/pull/51384, we can pass --extern-html-root-url to
// force rustdoc to link to other docs.rs docs for dependencies
Expand Down