diff options
| author | bors <bors@rust-lang.org> | 2025-07-03 19:59:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-07-03 19:59:09 +0000 |
| commit | da58c051315268a197ce280f6ba07bbd03c66535 (patch) | |
| tree | d4e8490322e7fae28ddacd47d4fa6861af392fc2 /tests | |
| parent | 48aee7e383503c234cce4206dee9f19f57edb617 (diff) | |
| parent | 9092fbbee1080a2aae02120f823012a48df68f84 (diff) | |
| download | rust-da58c051315268a197ce280f6ba07bbd03c66535.tar.gz rust-da58c051315268a197ce280f6ba07bbd03c66535.zip | |
Auto merge of #143390 - GuillaumeGomez:rollup-2avj41s, r=GuillaumeGomez
Rollup of 5 pull requests
Successful merges:
- rust-lang/rust#141831 (rustdoc: fix attrs of locally reexported foreign items)
- rust-lang/rust#143364 (don't include `.md` in title)
- rust-lang/rust#143369 (Various refactorings to the metadata loader)
- rust-lang/rust#143379 (Post {beta,stable}-accepted notifications to compiler/bootstrap backport zulip channels on `{beta,stable}-accepted` label application)
- rust-lang/rust#143384 (Update browser-ui-test version to `0.21.1`)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/rustdoc/reexport/extern-135092.rs | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/tests/rustdoc/reexport/extern-135092.rs b/tests/rustdoc/reexport/extern-135092.rs new file mode 100644 index 00000000000..fb5c71d56d5 --- /dev/null +++ b/tests/rustdoc/reexport/extern-135092.rs @@ -0,0 +1,26 @@ +// Test to make sure reexports of extern items are combined +// <https://github.com/rust-lang/rust/issues/135092> + +#![crate_name = "foo"] + +mod native { + extern "C" { + /// bar. + pub fn bar(); + } + + /// baz. + pub fn baz() {} +} + +//@ has 'foo/fn.bar.html' +//@ has - '//div[@class="docblock"]' 'bar.' +//@ has - '//div[@class="docblock"]' 'foo' +/// foo +pub use native::bar; + +//@ has 'foo/fn.baz.html' +//@ has - '//div[@class="docblock"]' 'baz.' +//@ has - '//div[@class="docblock"]' 'foo' +/// foo +pub use native::baz; |
