Skip to content

Rollup of 10 pull requests #110546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Apr 19, 2023
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
9aa3f05
'./configure' now checks if 'config.toml' exists before writing to th…
madsravn Apr 9, 2023
69b12ff
Merge remote-tracking branch 'upstream/master'
madsravn Apr 10, 2023
70ce74e
Spelling src/bootstrap
jsoref Apr 9, 2023
9c8d10a
Spelling src/ci
jsoref Apr 9, 2023
5a8b189
Don't special-case download-rustc in `maybe_install_llvm`
jyn514 Apr 19, 2023
abf9cbc
Fix `x test lint-docs` when download-rustc is enabled
jyn514 Apr 19, 2023
23cf3ce
Fix `tests/run-make-translation` when download-rustc is enabled
jyn514 Apr 19, 2023
16d061e
small type system cleanup
lcnr Apr 19, 2023
9876a11
Fix missing blanket impl if the trait is not directly public
GuillaumeGomez Apr 19, 2023
96f4f4e
Add regression test for #94183
GuillaumeGomez Apr 19, 2023
010d797
Changing position of early exit and using standard error method with …
madsravn Apr 19, 2023
6d07dbc
configure: Fix bug in `configure_top_level_key`
jyn514 Apr 19, 2023
0b6b72e
Fix wrong comment in rustc_hir/src/hir.rs
safinaskar Apr 19, 2023
b7607a9
configure: Set `profile = user` by default
jyn514 Apr 19, 2023
8a9668d
Update readme to suggest `./configure` instead of printf
jyn514 Apr 19, 2023
73bfa18
Rollup merge of #110123 - madsravn:master, r=jyn514
matthiaskrgr Apr 19, 2023
af92c6a
Rollup merge of #110429 - jsoref:spelling-src-bootstrap, r=albertlars…
matthiaskrgr Apr 19, 2023
dc0de09
Rollup merge of #110430 - jsoref:spelling-src-ci, r=albertlarsan68
matthiaskrgr Apr 19, 2023
6fdc121
Rollup merge of #110515 - jyn514:download-rustc-llvm, r=albertlarsan68
matthiaskrgr Apr 19, 2023
1de29ac
Rollup merge of #110521 - jyn514:test-lint-docs, r=albertlarsan68
matthiaskrgr Apr 19, 2023
9a13f4f
Rollup merge of #110525 - jyn514:translation-download-rustc, r=albert…
matthiaskrgr Apr 19, 2023
75de33c
Rollup merge of #110531 - lcnr:type-system-stuff, r=aliemjay
matthiaskrgr Apr 19, 2023
770f6cd
Rollup merge of #110533 - GuillaumeGomez:missing-blanket-impl-trait-n…
matthiaskrgr Apr 19, 2023
b59658c
Rollup merge of #110540 - safinaskar:patch-1, r=WaffleLapkin
matthiaskrgr Apr 19, 2023
0820e31
Rollup merge of #110541 - jyn514:fix-configure, r=ozkanonur
matthiaskrgr Apr 19, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add regression test for #94183
  • Loading branch information
GuillaumeGomez committed Apr 19, 2023
commit 96f4f4e02eaf9ff43b8749dc165258468799c86c
31 changes: 31 additions & 0 deletions tests/rustdoc/issue-94183-blanket-impl-reexported-trait.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// Regression test for <https://github.com/rust-lang/rust/issues/94183>.
// This test ensures that a publicly re-exported private trait will
// appear in the blanket impl list.

#![crate_name = "foo"]

// @has 'foo/struct.S.html'

mod actual_sub {
pub trait Actual {}
pub trait Another {}

// `Another` is publicly re-exported so it should appear in the blanket impl list.
// @has - '//*[@id="blanket-implementations-list"]//*[@class="code-header"]' 'impl<T> Another for T'
impl<T> Another for T {}

trait Foo {}

// `Foo` is not publicly re-exported nor reachable so it shouldn't appear in the
// blanket impl list.
// @!has - '//*[@id="blanket-implementations-list"]//*[@class="code-header"]' 'impl<T> Foo for T'
impl<T> Foo for T {}
}

pub use actual_sub::{Actual, Another};

// `Actual` is publicly re-exported so it should appear in the blanket impl list.
// @has - '//*[@id="blanket-implementations-list"]//*[@class="code-header"]' 'impl<T> Actual for T'
impl<T> Actual for T {}

pub struct S;