diff options
| author | bors <bors@rust-lang.org> | 2021-07-02 11:42:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-07-02 11:42:38 +0000 |
| commit | ce331ee6ee010438d1a58c7da8ced4f26d69a20e (patch) | |
| tree | dbe87a9389300b43acff319a3b312623a0f8e921 /src/test | |
| parent | f9fa13f705bb8b1c57c6b6fe95055ec4995a40f0 (diff) | |
| parent | cd3a48fdb650f6ce7c6c8a31d2136073fc3338f5 (diff) | |
| download | rust-ce331ee6ee010438d1a58c7da8ced4f26d69a20e.tar.gz rust-ce331ee6ee010438d1a58c7da8ced4f26d69a20e.zip | |
Auto merge of #86806 - GuillaumeGomez:rollup-pr5r37w, r=GuillaumeGomez
Rollup of 5 pull requests Successful merges: - #85749 (Revert "Don't load all extern crates unconditionally") - #86714 (Add linked list cursor end methods) - #86737 (Document rustfmt on nightly-rustc) - #86776 (Skip layout query when computing integer type size during mangling) - #86797 (Stabilize `Bound::cloned()`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/rustdoc-ui/auxiliary/panic-item.rs | 17 | ||||
| -rw-r--r-- | src/test/rustdoc-ui/unused-extern-crate.rs | 3 | ||||
| -rw-r--r-- | src/test/rustdoc/auxiliary/issue-66159-1.rs | 2 | ||||
| -rw-r--r-- | src/test/rustdoc/issue-66159.rs | 10 |
4 files changed, 12 insertions, 20 deletions
diff --git a/src/test/rustdoc-ui/auxiliary/panic-item.rs b/src/test/rustdoc-ui/auxiliary/panic-item.rs deleted file mode 100644 index 17b26850d4d..00000000000 --- a/src/test/rustdoc-ui/auxiliary/panic-item.rs +++ /dev/null @@ -1,17 +0,0 @@ -// no-prefer-dynamic -#![crate_type = "lib"] -#![no_std] -#![feature(lang_items)] - -use core::panic::PanicInfo; -use core::sync::atomic::{self, Ordering}; - -#[panic_handler] -fn panic(_info: &PanicInfo) -> ! { - loop { - atomic::compiler_fence(Ordering::SeqCst); - } -} - -#[lang = "eh_personality"] -fn foo() {} diff --git a/src/test/rustdoc-ui/unused-extern-crate.rs b/src/test/rustdoc-ui/unused-extern-crate.rs deleted file mode 100644 index f703a183790..00000000000 --- a/src/test/rustdoc-ui/unused-extern-crate.rs +++ /dev/null @@ -1,3 +0,0 @@ -// check-pass -// aux-crate:panic_item=panic-item.rs -// @has unused_extern_crate/index.html diff --git a/src/test/rustdoc/auxiliary/issue-66159-1.rs b/src/test/rustdoc/auxiliary/issue-66159-1.rs new file mode 100644 index 00000000000..2f3d069bd51 --- /dev/null +++ b/src/test/rustdoc/auxiliary/issue-66159-1.rs @@ -0,0 +1,2 @@ +/// This will be referred to by the test docstring +pub struct Something; diff --git a/src/test/rustdoc/issue-66159.rs b/src/test/rustdoc/issue-66159.rs new file mode 100644 index 00000000000..003d079a470 --- /dev/null +++ b/src/test/rustdoc/issue-66159.rs @@ -0,0 +1,10 @@ +// aux-crate:priv:issue_66159_1=issue-66159-1.rs +// compile-flags:-Z unstable-options + +// The issue was an ICE which meant that we never actually generated the docs +// so if we have generated the docs, we're okay. +// Since we don't generate the docs for the auxiliary files, we can't actually +// verify that the struct is linked correctly. + +// @has issue_66159/index.html +//! [issue_66159_1::Something] |
