diff options
| author | bors <bors@rust-lang.org> | 2018-02-18 17:50:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-02-18 17:50:21 +0000 |
| commit | 27a046e9338fb0455c33b13e8fe28da78212dedc (patch) | |
| tree | 004849f31563f7dd4c1eb9f54d12ad392887c077 /src/test/rustdoc | |
| parent | 1ad094d81c97b3d2dd8e980ccd1475a80647540d (diff) | |
| parent | cc20de3993bc47be613d20fdd4ec3c35cc410fcd (diff) | |
| download | rust-27a046e9338fb0455c33b13e8fe28da78212dedc.tar.gz rust-27a046e9338fb0455c33b13e8fe28da78212dedc.zip | |
Auto merge of #48322 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 6 pull requests - Successful merges: #48194, #48273, #48274, #48275, #48282, #48312 - Failed merges:
Diffstat (limited to 'src/test/rustdoc')
| -rw-r--r-- | src/test/rustdoc/impl-parts-crosscrate.rs | 2 | ||||
| -rw-r--r-- | src/test/rustdoc/link-title-escape.rs | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/test/rustdoc/impl-parts-crosscrate.rs b/src/test/rustdoc/impl-parts-crosscrate.rs index 5fa2e03e0a8..1d055ccbead 100644 --- a/src/test/rustdoc/impl-parts-crosscrate.rs +++ b/src/test/rustdoc/impl-parts-crosscrate.rs @@ -17,7 +17,7 @@ extern crate rustdoc_impl_parts_crosscrate; pub struct Bar<T> { t: T } -// The output file is html embeded in javascript, so the html tags +// The output file is html embedded in javascript, so the html tags // aren't stripped by the processing script and we can't check for the // full impl string. Instead, just make sure something from each part // is mentioned. diff --git a/src/test/rustdoc/link-title-escape.rs b/src/test/rustdoc/link-title-escape.rs index eb53c3c2cb5..e10ff1a9917 100644 --- a/src/test/rustdoc/link-title-escape.rs +++ b/src/test/rustdoc/link-title-escape.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// compile-flags: -Z unstable-options --disable-commonmark - #![crate_name = "foo"] //! hello [foo] |