diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-10-28 07:06:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-28 07:06:42 +0200 |
| commit | 2f02cf8768bff3e32a2bfaa42294cb5dd6abd58b (patch) | |
| tree | 1ce2d9c9851aa62de95b963e0866a33e017d24c7 /src/test/rustdoc | |
| parent | 270e0c53574b938af0492b4321984d9a09ef5b47 (diff) | |
| parent | a4279a1d1f9fd8bde6dfc46ac9d53d72fd32a41d (diff) | |
Rollup merge of #103523 - GuillaumeGomez:inline-doc-comment-impl-block, r=notriddle
Fix unwanted merge of inline doc comments for impl blocks Fixes https://github.com/rust-lang/rust/issues/102909. We need this merge mechanism for inlined items but it's completely unwanted for impl blocks (at least the doc comments are, not the other attributes) since we want to keep what `cfg()` is put on the `pub use` or other attributes. r? ``@notriddle``
Diffstat (limited to 'src/test/rustdoc')
| -rw-r--r-- | src/test/rustdoc/auxiliary/reexport-doc-aux.rs | 5 | ||||
| -rw-r--r-- | src/test/rustdoc/reexport-doc.rs | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/test/rustdoc/auxiliary/reexport-doc-aux.rs b/src/test/rustdoc/auxiliary/reexport-doc-aux.rs new file mode 100644 index 00000000000..3400717eba1 --- /dev/null +++ b/src/test/rustdoc/auxiliary/reexport-doc-aux.rs @@ -0,0 +1,5 @@ +pub struct Foo; + +impl Foo { + pub fn foo() {} +} diff --git a/src/test/rustdoc/reexport-doc.rs b/src/test/rustdoc/reexport-doc.rs new file mode 100644 index 00000000000..df2c889b4d5 --- /dev/null +++ b/src/test/rustdoc/reexport-doc.rs @@ -0,0 +1,8 @@ +// aux-build:reexport-doc-aux.rs + +extern crate reexport_doc_aux as dep; + +// @has 'reexport_doc/struct.Foo.html' +// @count - '//p' 'These are the docs for Foo.' 1 +/// These are the docs for Foo. +pub use dep::Foo; |
