Nadrieril 4eaf4c2615

Rollup merge of #120501 - GuillaumeGomez:glob-reexport-attr-merge-bugfix, r=notriddle ...

rustdoc: Correctly handle attribute merge if this is a glob reexport

Fixes #120487.

The regression was introduced in https://github.com/rust-lang/rust/pull/113091. Only non-glob reexports should have been impacted.

cc `````@Nemo157`````
r? `````@notriddle`````

2024-01-31 12:10:53 +01:00

..

auxiliary

rustdoc: rename issue-\d+.rs tests to have meaningful names (part 5)

2024-01-03 15:33:12 -07:00

const-generics

…

deref

…

doctest

rustdoc: rename issue-\d+.rs tests to have meaningful names (part 5)

2024-01-03 15:33:12 -07:00

duplicate_impls

…

generic-associated-types

…

inline_cross

Rollup merge of #119561 - notriddle:master, r=fmease

2024-01-14 20:17:23 +01:00

inline_local

…

intra-doc

rustdoc: rename issue-\d+.rs tests to have meaningful names (part 5)

2024-01-03 15:33:12 -07:00

intra-doc-crate

…

notable-trait

…

primitive

…

src-links

…

synthetic_auto

Ignore a rustdoc test

2024-01-05 20:33:16 +01:00

test_option_check

…

type-alias

…

alias-reexport2.rs

…

alias-reexport.rs

…

all.rs

…

anchor-id-duplicate-method-name-25001.rs

…

anchor-id-trait-method-15169.rs

…

anchor-id-trait-tymethod-28478.rs

…

anchors.no_const_anchor2.html

…

anchors.no_const_anchor.html

…

anchors.no_method_anchor.html

…

anchors.no_trait_method_anchor.html

…

anchors.no_tymethod_anchor.html

…

anchors.no_type_anchor2.html

…

anchors.no_type_anchor.html

…

anchors.rs

…

anonymous-lifetime.rs

…

anonymous-reexport.rs

…

array-links.link_box_generic.html

…

array-links.link_box_u32.html

…

array-links.link_slice_generic.html

…

array-links.link_slice_u32.html

…

array-links.rs

…

asm-foreign2.rs

…

asm-foreign.rs

…

assoc-consts-version.rs

…

assoc-consts.rs

…

assoc-item-cast.rs

…

assoc-type-bindings-20646.rs

…

assoc-types.rs

…

associated-consts.rs

…

async-fn-opaque-item.rs

…

async-fn.rs

Add regression test for #119015 and update tests

2024-01-20 13:21:03 +01:00

async-move-doctest.rs

…

async-trait-sig.rs

…

async-trait.rs

…

attribute-rendering.rs

…

attributes.rs

…

auto_aliases.rs

…

auto-impl-for-trait.rs

…

auto-impl-primitive.rs

…

auto-trait-bounds-by-associated-type-50159.rs

rustdoc: rename issue-\d+.rs tests to have meaningful names (part 5)

2024-01-03 15:33:12 -07:00

auto-trait-bounds-inference-variables-54705.rs

rustdoc: rename issue-\d+.rs tests to have meaningful names (part 5)

2024-01-03 15:33:12 -07:00

auto-trait-bounds-where-51236.rs

rustdoc: rename issue-\d+.rs tests to have meaningful names (part 5)

2024-01-03 15:33:12 -07:00

auto-trait-negative-impl-55321.rs

rustdoc: rename issue-\d+.rs tests to have meaningful names (part 5)

2024-01-03 15:33:12 -07:00

auto-trait-not-send.rs

…

auto-traits.rs

…

bad-codeblock-syntax.rs

…

blank-line-in-doc-block-47197.rs

rustdoc: rename issue-\d+.rs tests to have meaningful names (part 5)

2024-01-03 15:33:12 -07:00

blanket-impl-29503.rs

…

blanket-reexport-item.rs

…

bounds-in-multiple-parts.rs

…

cap-lints.rs

…

cfg_doc_reexport.rs

…

cfg-doctest.rs

…

check-source-code-urls-to-def-std.rs

…

check-source-code-urls-to-def.rs

Add regression test for jump to def static method calls

2024-01-04 20:24:16 +01:00

check-styled-link.rs

…

check.rs

…

codeblock-title.rs

…

comment-in-doctest.rs

…

compiler-derive-proc-macro.rs

…

const-display.rs

…

const-doc.rs

…

const-effect-param.rs

…

const-fn-effects.rs

…

const-fn.rs

…

const-intrinsic.rs

…

const-rendering-macros-33302.rs

…

const-underscore.rs

…

const-value-display.rs

…

const.rs

…

constructor-imports.rs

…

crate-version-escape.rs

…

crate-version-extra.rs

…

crate-version.rs

…

cross-crate-hidden-assoc-trait-items.rs

…

cross-crate-hidden-impl-parameter.rs

…

cross-crate-links.rs

…

cross-crate-primitive-doc.rs

…

custom_code_classes.rs

…

decl_macro_priv.rs

…

decl_macro.rs

…

decl-line-wrapping-empty-arg-list.decl.html

…

decl-line-wrapping-empty-arg-list.rs

…

decl-trailing-whitespace.declaration.html

…

decl-trailing-whitespace.rs

…

deduplicate-glob-import-impl-21474.rs

…

deduplicate-trait-impl-22025.rs

…

deep-structures.rs

…

default-impl.rs

…

default-theme.rs

…

default-trait-method-link.rs

…

default-trait-method.rs

…

demo-allocator-54478.rs

rustdoc: rename issue-\d+.rs tests to have meaningful names (part 5)

2024-01-03 15:33:12 -07:00

deprecated-future-staged-api.rs

…

deprecated-future.rs

…

deprecated-impls.rs

…

deprecated.rs

…

deref-methods-19190-foreign-type.rs

…

deref-methods-19190-inline.rs

…

deref-methods-19190.rs

…

deref-mut-35169-2.rs

rustdoc: rename issue-\d+.rs tests to have meaningful names (part 5)

2024-01-03 15:33:12 -07:00

deref-mut-35169.rs

rustdoc: rename issue-\d+.rs tests to have meaningful names (part 5)

2024-01-03 15:33:12 -07:00

description_default.rs

…

description.rs

…

disambiguate-anchors-32890.rs

…

disambiguate-anchors-header-29449.rs

…

display-hidden-items.rs

…

doc_auto_cfg_nested_impl.rs

…

doc-assoc-item.rs

…

doc-attr-comment-mix-42760.rs

rustdoc: rename issue-\d+.rs tests to have meaningful names (part 5)

2024-01-03 15:33:12 -07:00

doc-auto-cfg.rs

…

doc-cfg-hide.rs

…

doc-cfg-implicit-gate.rs

…

doc-cfg-implicit.rs

…

doc-cfg-simplification.rs

…

doc-cfg-target-feature.rs

Remove uses of no-system-llvm

2024-01-23 10:31:07 +01:00

doc-cfg-traits.rs

…

doc-cfg.rs

…

doc-hidden-method-13698.rs

…

doc-hidden-trait-implementors-33069.rs

…

doc-proc-macro.rs

…

doc-test-attr-18199.rs

…

document-hidden-items-15347.rs

…

document-item-with-associated-const-in-where-clause.rs

…

double-hyphen-to-dash.rs

…

double-quote-escape.rs

…

duplicate-cfg.rs

…

duplicate-flags.rs

…

duplicated_impl.rs

…

early-unindent.rs

…

edition-doctest.rs

…

edition-flag.rs

…

elided-lifetime.rs

…

empty-doc-comment.rs

…

empty-impl-block-private-with-doc.rs

…

empty-impl-block-private.rs

…

empty-impl-block.rs

…

empty-impls.rs

…

empty-mod-private.rs

…

empty-mod-public.rs

…

empty-section.rs

…

ensure-src-link.rs

…

enum-headings.rs

…

enum-variant-fields-heading.rs

…

enum-variant-fields-heading.variants.html

…

enum-variant-private-46767.rs

…

enum-variant-reexport-35488.rs

rustdoc: rename issue-\d+.rs tests to have meaningful names (part 5)

2024-01-03 15:33:12 -07:00

enum-variant-value.rs

…

extern-default-method.no_href_on_anchor.html

…

extern-default-method.rs

…

extern-fn-22038.rs

…

extern-html-root-url-precedence.rs

…

extern-html-root-url.rs

…

extern-impl-trait.rs

…

extern-impl.rs

…

extern-links.rs

…

extern-method.rs

…

external-cross.rs

…

external-doc.rs

…

external-macro-src.rs

…

feature-gate-doc_auto_cfg.rs

…

ffi.rs

…

files-creation-hidden.rs

…

files-creation-private.rs

…

fn-bound.rs

…

fn-pointer-arg-name.rs

…

fn-sidebar.rs

…

fn-type.rs

…

footnote-definition-without-blank-line-100638.rs

Add regression test for #100638

2024-01-29 14:14:03 +01:00

footnote-in-summary.rs

…

force-target-feature.rs

…

foreign-implementors-js-43701.rs

…

foreigntype-reexport.rs

…

foreigntype.rs

…

generic_const_exprs.rs

…

generic-const-items.rs

…

generic-impl.rs

…

glob-reexport-attribute-merge-120487.rs

Add regression test for #120487

2024-01-30 18:14:09 +01:00

glob-shadowing-const.rs

…

glob-shadowing.rs

…

hidden-extern-34025.rs

…

hidden-impls.rs

…

hidden-line.rs

…

hidden-methods.rs

…

hidden-private.rs

…

hidden-trait-methods-with-document-hidden-items.rs

…

hidden-trait-methods.rs

…

hidden-trait-struct-impls.rs

…

hide-complex-unevaluated-const-arguments.rs

…

hide-complex-unevaluated-consts.rs

…

hide-unstable-trait.rs

…

higher-ranked-trait-bounds.rs

…

highlight-invalid-rust-12834.rs

…

html-no-source.rs

…

ice-reexport-crate-root-28927.rs

…

ice-type-error-19181.rs

…

impl-alias-substituted.rs

…

impl-assoc-type-21092.rs

…

impl-blanket-53689.rs

rustdoc: rename issue-\d+.rs tests to have meaningful names (part 5)

2024-01-03 15:33:12 -07:00

impl-box.rs

…

impl-disambiguation.rs

…

impl-everywhere.rs

…

impl-in-const-block.rs

…

impl-on-ty-alias-issue-119015.rs

Add regression test for #119015 and update tests

2024-01-20 13:21:03 +01:00

impl-parts-crosscrate.rs

…

impl-parts.rs

…

impl-ref-20175.rs

…

impl-trait-43869.rs

rustdoc: rename issue-\d+.rs tests to have meaningful names (part 5)

2024-01-03 15:33:12 -07:00

impl-trait-alias.rs

…

impl-type-parameter-33592.rs

…

implementor-stable-version.rs

…

impossible-default.rs

…

include_str_cut.rs

…

index-page.rs

…

infinite-redirection-16265-1.rs

…

infinite-redirection-16265-2.rs

…

infinite-redirection.rs

…

inherent-projections.rs

…

inline-assoc-type-20727-bindings.rs

…

inline-assoc-type-20727-bounds-deref.rs

…

inline-assoc-type-20727-bounds-index.rs

…

inline-assoc-type-20727-bounds.rs

…

inline-default-methods.rs

…

inline-private-with-intermediate-doc-hidden.rs

…

inline-rename-34473.rs

…

internal.rs

…

invalid.crate.name.rs

…

issue-56701.rs

…

issue-56822.rs

…

issue-57180.rs

…

issue-60482.rs

…

issue-60522-duplicated-glob-reexport.rs

…

issue-60726.rs

…

issue-61592.rs

…

issue-67851-both.rs

…

issue-67851-hidden.rs

…

issue-67851-neither.rs

…

issue-67851-private.rs

…

issue-72340.rs

…

issue-73061-cross-crate-opaque-assoc-type.rs

…

issue-74083.rs

…

issue-75588.rs

…

issue-76501.rs

…

issue-78673.rs

…

issue-78701.rs

…

issue-79201.rs

…

issue-80233-normalize-auto-trait.rs

…

issue-81141-private-reexport-in-public-api-2.rs

…

issue-81141-private-reexport-in-public-api-generics.rs

…

issue-81141-private-reexport-in-public-api-hidden.rs

…

issue-81141-private-reexport-in-public-api-private.rs

…

issue-81141-private-reexport-in-public-api.rs

…

issue-82465-asref-for-and-of-local.rs

…

issue-83375-multiple-mods-w-same-name-doc-inline-last-item.rs

…

issue-83375-multiple-mods-w-same-name-doc-inline.rs

…

issue-85454.rs

…

issue-86620.rs

…

issue-88600.rs

…

issue-89309-heading-levels.rs

…

issue-89852.rs

…

issue-94183-blanket-impl-reexported-trait.rs

…

issue-95633.rs

…

issue-95873.rs

…

issue-96381.rs

…

issue-98697.rs

…

issue-99221-multiple-macro-rules-w-same-name-submodule.rs

…

issue-99221-multiple-macro-rules-w-same-name.rs

…

issue-99221-multiple-structs-w-same-name.rs

…

issue-99734-multiple-foreigns-w-same-name.rs

…

issue-99734-multiple-mods-w-same-name.rs

…

issue-100204-inline-impl-through-glob-import.rs

…

issue-100241.rs

…

issue-100620.rs

…

issue-101743-bold-tag.rs

…

issue-102154.rs

…

issue-105735-overlapping-reexport-2.rs

…

issue-105735-overlapping-reexport.rs

…

issue-105952.rs

…

issue-106142.rs

…

issue-107350.rs

…

issue-107995.rs

…

issue-108231.rs

…

issue-108281.rs

…

issue-108679-reexport-of-reexport.rs

…

issue-108925.rs

…

issue-108931-anonymous-reexport.rs

…

issue-109258-missing-private-inlining.rs

…

issue-109449-doc-hidden-reexports.rs

…

issue-109695-crate-doc-hidden.rs

…

issue-110422-inner-private.rs

…

issue-110629-private-type-cycle.rs

…

issue-111064-reexport-trait-from-hidden-2.rs

…

issue-111064-reexport-trait-from-hidden.rs

…

issue-111249-file-creation.rs

…

issue-113982-doc_auto_cfg-reexport-foreign.rs

…

issue-115295-macro-const-display.rs

…

issue-118180-empty-tuple-struct.rs

…

item-desc-list-at-start.item-table.html

…

item-desc-list-at-start.rs

…

jump-to-def-doc-links-calls.rs

Add regression test for jump to def static method calls

2024-01-04 20:24:16 +01:00

jump-to-def-doc-links.rs

…

keyword.rs

…

legacy-const-generic.rs

…

lifetime-name.rs

…

line-breaks.rs

…

link-assoc-const.rs

…

link-extern-crate-33178.rs

…

link-extern-crate-item-30109.rs

…

link-extern-crate-title-33178.rs

…

link-title-escape.rs

…

links-in-headings.rs

…

local-reexport-doc.rs

…

logo-class-default.rs

…

logo-class-rust.rs

…

logo-class.rs

…

macro_pub_in_module.rs

…

macro_rules-matchers.rs

…

macro-doc-comment-23812.rs

…

macro-document-private-duplicate.rs

…

macro-document-private.rs

…

macro-generated-macro.macro_linebreak_pre.html

…

macro-generated-macro.macro_morestuff_pre.html

…

macro-generated-macro.rs

…

macro-higher-kinded-function.rs

…

macro-ice-16019.rs

…

macro-in-async-block.rs

…

macro-in-closure.rs

…

macro-indirect-use.rs

…

macro-private-not-documented.rs

…

macros.rs

…

manual_impl.rs

…

markdown-table-escape-pipe-27862.rs

…

masked.rs

…

method-link-foreign-trait-impl-17476.rs

…

method-list.rs

…

mixing-doc-comments-and-attrs.rs

…

mixing-doc-comments-and-attrs.S1_top-doc.html

…

mixing-doc-comments-and-attrs.S2_top-doc.html

…

mixing-doc-comments-and-attrs.S3_top-doc.html

…

mod-stackoverflow.rs

…

module-impls.rs

…

multiple-import-levels.rs

…

must_implement_one_of.rs

…

mut-params.rs

…

namespaces.rs

…

negative-impl-sidebar.rs

…

negative-impl.rs

…

nested-items-issue-111415.rs

…

nested-modules.rs

…

no_std-primitive.rs

…

no-compiler-reexport.rs

…

no-run-still-checks-lints.rs

…

no-stack-overflow-25295.rs

…

no-unit-struct-field.rs

…

non_lifetime_binders.rs

…

normalize-assoc-item.rs

…

nul-error.rs

…

playground-arg.rs

…

playground-empty.rs

…

playground-none.rs

…

playground-syntax-error.rs

…

playground.rs

…

primitive-link.rs

…

primitive-raw-pointer-dox-15318-3.rs

…

primitive-raw-pointer-link-15318.rs

…

primitive-raw-pointer-link-no-inlined-15318-2.rs

…

primitive-reexport.rs

…

primitive-reference.rs

…

primitive-slice-auto-trait.rs

…

primitive-tuple-auto-trait.rs

…

primitive-tuple-variadic.rs

…

primitive-unit-auto-trait.rs

…

private-fields-tuple-struct.rs

…

private-type-alias.rs

…

private-use-decl-macro-47038.rs

…

private-use.rs

…

proc-macro.rs

…

process-termination.rs

…

pub-extern-crate.rs

…

pub-method.rs

…

pub-reexport-of-pub-reexport-46506.rs

…

pub-use-extern-macros.rs

…

public-impl-mention-private-generic-46380-2.rs

rustdoc: rename issue-\d+.rs tests to have meaningful names (part 5)

2024-01-03 15:33:12 -07:00

range-arg-pattern.rs

…

raw-ident-eliminate-r-hashtag.rs

…

read-more-unneeded.rs

…

recursion1.rs

…

recursion2.rs

…

recursion3.rs

…

redirect-const.rs

…

redirect-map-empty.rs

…

redirect-map.rs

…

redirect-rename.rs

…

redirect.rs

…

reexport-attr-merge.rs

…

reexport-cfg.rs

…

reexport-check.rs

…

reexport-dep-foreign-fn.rs

…

reexport-doc-hidden-inside-private.rs

…

reexport-doc-hidden.rs

…

reexport-doc.rs

…

reexport-hidden-macro.rs

…

reexport-macro.rs

…

reexport-of-doc-hidden.rs

…

reexport-stability-tags-deprecated-and-portability.rs

…

reexport-stability-tags-unstable-and-portability.rs

…

reexports-of-same-name.rs

…

reexports-priv.rs

…

reexports.rs

…

remove-duplicates.rs

…

remove-url-from-headings.rs

…

render-enum-variant-structlike-32395.rs

…

repr.rs

…

return-impl-trait.rs

…

rfc-2632-const-trait-impl.rs

…

rustc-incoherent-impls.rs

…

rustc-macro-crate.rs

…

safe-intrinsic.rs

…

same-crate-hidden-impl-parameter.rs

…

sanitizer-option.rs

…

search-index-primitive-inherent-method-23511.rs

…

search-index-summaries.rs

…

search-index.rs

…

short-docblock-codeblock.rs

…

short-docblock.rs

…

short-line.md

…

show-const-contents.rs

…

sidebar-all-page.rs

…

sidebar-items.rs

…

sidebar-link-generation.rs

…

sidebar-links-to-foreign-impl.rs

…

sized_trait.rs

…

slice-links.link_box_generic.html

…

slice-links.link_box_u32.html

…

slice-links.link_slice_generic.html

…

slice-links.link_slice_u32.html

…

slice-links.rs

…

smart-punct.rs

…

smoke.rs

…

sort-53812.rs

rustdoc: rename issue-\d+.rs tests to have meaningful names (part 5)

2024-01-03 15:33:12 -07:00

sort-modules-by-appearance.rs

…

source-file.rs

…

source-version-separator.rs

…

src-link-external-macro-26606.rs

…

src-links-auto-impls.rs

…

src-links-external.rs

…

src-links-implementor-43893.rs

…

src-links-inlined-34274.rs

…

src-links.rs

…

src-mod-path-absolute-26995.rs

…

stability.rs

…

staged-api-deprecated-unstable-32374.rs

…

staged-api-feature-issue-27759.rs

…

static-root-path.rs

…

static.rs

…

strip-block-doc-comments-stars.docblock.html

…

strip-block-doc-comments-stars.rs

…

strip-enum-variant.no-not-shown.html

…

strip-enum-variant.rs

…

strip-priv-imports-pass-27104.rs

…

struct-arg-pattern.rs

…

struct-field.rs

…

struct-implementations-title.rs

…

structfields.rs

…

summary-codeblock-31899.rs

…

summary-header-46377.rs

rustdoc: rename issue-\d+.rs tests to have meaningful names (part 5)

2024-01-03 15:33:12 -07:00

summary-reference-link-30366.rs

…

tab_title.rs

…

table-in-docblock.rs

…

task-lists.rs

…

test-lists.rs

…

test-parens.rs

…

test-strikethrough.rs

…

thread-local-src.rs

…

titles.rs

…

toggle-item-contents.rs

…

toggle-method.rs

…

toggle-trait-fn.rs

…

trait_alias.rs

…

trait-alias-mention.rs

…

trait-impl-items-links-and-anchors.rs

…

trait-impl.rs

…

trait-implementations-duplicate-self-45584.rs

…

trait-object-safe.rs

Strenghten tests/rustdoc/trait-object-safe.rs to prevent unforeseen regression

2023-12-23 11:28:33 +01:00

trait-self-link.rs

…

trait-src-link.rs

…

trait-visibility.rs

…

traits-in-bodies-private.rs

…

traits-in-bodies.rs

…

tuple-struct-fields-doc.rs

…

tuple-struct-where-clause-34928.rs

…

tuples.link1_i32.html

…

tuples.link1_t.html

…

tuples.link2_i32.html

…

tuples.link2_t.html

…

tuples.link2_tu.html

…

tuples.link_unit.html

…

tuples.rs

…

type-layout-flag-required.rs

…

type-layout.rs

…

typedef-inner-variants-lazy_type_alias.rs

…

typedef-inner-variants.rs

…

typedef.rs

…

unindent.md

…

unindent.rs

…

union-fields-html.rs

…

union.rs

…

unit-return.rs

…

universal-impl-trait.rs

…

unneeded-trait-implementations-title.rs

…

use-attr.rs

…

useless_lifetime_bound.rs

…

variadic.rs

…

version-separator-without-source.rs

…

viewpath-rename.rs

…

viewpath-self.rs

…

visibility.rs

…

where-clause-order.rs

…

where-sized.rs

…

where.alpha_trait_decl.html

…

where.bravo_trait_decl.html

…

where.charlie_fn_decl.html

…

where.golf_type_alias_decl.html

…

where.rs

…

where.SWhere_Echo_impl.html

…

where.SWhere_Simd_item-decl.html

…

where.SWhere_TraitWhere_item-decl.html

…

whitespace-after-where-clause.enum2.html

…

whitespace-after-where-clause.enum.html

…

whitespace-after-where-clause.rs

…

whitespace-after-where-clause.struct2.html

…

whitespace-after-where-clause.struct.html

…

whitespace-after-where-clause.trait2.html

…

whitespace-after-where-clause.trait.html

…

whitespace-after-where-clause.union2.html

…

whitespace-after-where-clause.union.html

…

without-redirect.rs

…

wrapping.rs

…