diff options
| author | bors <bors@rust-lang.org> | 2021-10-23 15:53:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-10-23 15:53:50 +0000 |
| commit | 91b931926fd49fc97d1e39f2b8206abf1d77ce7d (patch) | |
| tree | 2304d283890f1617344bf59c4994e2f1e096f14e /src/test/run-make/rustdoc-scrape-examples-ordering/examples | |
| parent | aa5740c715001f981515ed46faaddebf67cb9539 (diff) | |
| parent | 1680359dad8f412a145c565ac84ea3711d5f97a0 (diff) | |
Auto merge of #90203 - matthiaskrgr:rollup-v215wew, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #85833 (Scrape code examples from examples/ directory for Rustdoc) - #88041 (Make all proc-macro back-compat lints deny-by-default) - #89829 (Consider types appearing in const expressions to be invariant) - #90168 (Reset qualifs when a storage of a local ends) - #90198 (Add caveat about changing parallelism and function call overhead) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/test/run-make/rustdoc-scrape-examples-ordering/examples')
| -rw-r--r-- | src/test/run-make/rustdoc-scrape-examples-ordering/examples/ex1.rs | 9 | ||||
| -rw-r--r-- | src/test/run-make/rustdoc-scrape-examples-ordering/examples/ex2.rs | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/test/run-make/rustdoc-scrape-examples-ordering/examples/ex1.rs b/src/test/run-make/rustdoc-scrape-examples-ordering/examples/ex1.rs new file mode 100644 index 00000000000..d6d59820876 --- /dev/null +++ b/src/test/run-make/rustdoc-scrape-examples-ordering/examples/ex1.rs @@ -0,0 +1,9 @@ +fn main() { + foobar::ok(); + + // this is a + + // BIG + + // item +} diff --git a/src/test/run-make/rustdoc-scrape-examples-ordering/examples/ex2.rs b/src/test/run-make/rustdoc-scrape-examples-ordering/examples/ex2.rs new file mode 100644 index 00000000000..a1133117f86 --- /dev/null +++ b/src/test/run-make/rustdoc-scrape-examples-ordering/examples/ex2.rs @@ -0,0 +1,4 @@ +fn main() { + foobar::ok(); + // small item +} |
