Skip to content

Commit 58c701f

Browse files
committedMar 21, 2017
Auto merge of #40693 - frewsxcv:rollup, r=frewsxcv
Rollup of 10 pull requests - Successful merges: #40229, #40312, #40332, #40502, #40556, #40576, #40667, #40671, #40681, #40685 - Failed merges:
·
1.88.01.18.0
2 parents 53eb08b + b6240e5 commit 58c701f

File tree

125 files changed

+874
-17908
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+874
-17908
lines changed
 

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,6 @@
2727
[submodule "reference"]
2828
path = src/doc/reference
2929
url = https://github.com/rust-lang-nursery/reference.git
30+
[submodule "book"]
31+
path = src/doc/book
32+
url = https://github.com/rust-lang/book

‎src/bootstrap/check.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,16 @@ pub fn docs(build: &Build, compiler: &Compiler) {
285285
continue
286286
}
287287

288+
// The nostarch directory in the book is for no starch, and so isn't guaranteed to build.
289+
// we don't care if it doesn't build, so skip it.
290+
use std::ffi::OsStr;
291+
let path: &OsStr = p.as_ref();
292+
if let Some(path) = path.to_str() {
293+
if path.contains("nostarch") {
294+
continue;
295+
}
296+
}
297+
288298
println!("doc tests for: {}", p.display());
289299
markdown_test(build, compiler, &p);
290300
}

0 commit comments

Comments
 (0)
Please sign in to comment.