diff options
| author | bors <bors@rust-lang.org> | 2023-03-27 19:44:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-27 19:44:36 +0000 |
| commit | 2036fdd24f77d607dcfaa24c48fbe85d3f785823 (patch) | |
| tree | 5d6ab7f730f13fe9468eb77838a139f4de6bce0a /tests | |
| parent | dd19135b044cd21a9c3ae7ae87620bf41a208066 (diff) | |
| parent | c0dec2bbe35a69fab67d8549280caae5d43527a7 (diff) | |
| download | rust-2036fdd24f77d607dcfaa24c48fbe85d3f785823.tar.gz rust-2036fdd24f77d607dcfaa24c48fbe85d3f785823.zip | |
Auto merge of #109668 - GuillaumeGomez:rollup-j01if4b, r=GuillaumeGomez
Rollup of 6 pull requests Successful merges: - #109330 (rustdoc: Fix ICE for intra-doc link on intermediate re-export) - #109354 (Remove the `NodeId` of `ast::ExprKind::Async`) - #109445 (Allow passing the --nocapture flag to compiletest) - #109512 (bump `askama_derive` to 0.12.1) - #109637 (Add missing needs-asm-support annotation to ui/simple_global_asm.rs) - #109666 (Correct ASCII case comment) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/rustdoc-ui/issue-109282-import-inline-merge.rs | 14 | ||||
| -rw-r--r-- | tests/ui/simple_global_asm.rs | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/tests/rustdoc-ui/issue-109282-import-inline-merge.rs b/tests/rustdoc-ui/issue-109282-import-inline-merge.rs new file mode 100644 index 00000000000..0ec8523222f --- /dev/null +++ b/tests/rustdoc-ui/issue-109282-import-inline-merge.rs @@ -0,0 +1,14 @@ +// Regression test for <https://github.com/rust-lang/rust/issues/109282>. +// Import for `ValueEnum` is inlined and doc comments on the import and `ValueEnum` itself are +// merged. After the merge they still have correct parent scopes to resolve both `[ValueEnum]`. + +// check-pass + +mod m { + pub enum ValueEnum {} +} +mod m2 { + /// [`ValueEnum`] + pub use crate::m::ValueEnum; +} +pub use m2::ValueEnum; diff --git a/tests/ui/simple_global_asm.rs b/tests/ui/simple_global_asm.rs index 3c69379ff14..c3b2f2e0bc4 100644 --- a/tests/ui/simple_global_asm.rs +++ b/tests/ui/simple_global_asm.rs @@ -1,4 +1,5 @@ // run-pass +// needs-asm-support #![feature(naked_functions)] #![allow(dead_code)] |