forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of rust-lang#110839 - jyn514:rollup-uikilwm, r=jyn514
Rollup of 9 pull requests Successful merges: - rust-lang#108416 (black_box doc corrections for clarification - Issue rust-lang#107957) - rust-lang#109379 (Replace `yes` command by `while-echo` in test `tests/ui/process/process-sigpipe.rs`) - rust-lang#110266 (Update documentation wording on path 'try_exists' functions) - rust-lang#110329 (Improve tests for rust-lang#110138) - rust-lang#110418 (Spelling rustdoc) - rust-lang#110587 (Fix `std` compilation error for wasi+atomics) - rust-lang#110594 (`rustc --help` add `--cfg` SPEC declaration.) - rust-lang#110792 (Use the standard macOS CI runner) - rust-lang#110817 (Add regression tests for const-generic inherent associated types) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
- Loading branch information
Showing
17 changed files
with
117 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
tests/rustdoc-json/reexport/auxiliary/enum_with_discriminant.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
//! Should not be inlined | ||
|
||
/// Should not be inlined | ||
pub enum O { | ||
L = -1, | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
// Regression Test for https://github.com/rust-lang/rust/issues/110138 | ||
// aux-build: enum_with_discriminant.rs | ||
|
||
#[doc(inline)] | ||
pub extern crate enum_with_discriminant; | ||
|
||
// @!has '$.index[*][?(@.docs == "Should not be inlined")]' | ||
// @is '$.index[*][?(@.name == "enum_with_discriminant")].kind' '"extern_crate"' | ||
// @set enum_with_discriminant = '$.index[*][?(@.name == "enum_with_discriminant")].id' | ||
// @is '$.index[*][?(@.name == "doc_inline_external_crate")].inner.items[*]' $enum_with_discriminant |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
// aux-build: enum_with_discriminant.rs | ||
|
||
extern crate enum_with_discriminant; | ||
|
||
#[doc(inline)] | ||
pub use enum_with_discriminant::*; | ||
|
||
// @!has '$.index[*][?(@.docs == "Should not be inlined")]' | ||
// @set use = '$.index[*][?(@.inner.name == "enum_with_discriminant")].id' | ||
// @is '$.index[*][?(@.name == "extern_crate_glob")].inner.items[*]' $use |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
// Regression test for issue #109759. | ||
// check-pass | ||
|
||
#![feature(inherent_associated_types)] | ||
#![allow(incomplete_features)] | ||
|
||
struct Foo; | ||
|
||
struct Bar<const X: usize>([(); X]); | ||
|
||
impl<const X: usize> Bar<X> { | ||
pub fn new() -> Self { | ||
Self([(); X]) | ||
} | ||
} | ||
|
||
impl Foo { | ||
type Bar<const X: usize> = Bar<X>; | ||
} | ||
|
||
fn main() { | ||
let _ = Foo::Bar::<10>::new(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
// check-pass | ||
|
||
#![feature(inherent_associated_types, generic_const_exprs)] | ||
#![allow(incomplete_features)] | ||
|
||
struct Parent<const O: usize>; | ||
|
||
impl<const O: usize> Parent<O> { | ||
type Mapping<const I: usize> = Store<{ O + I }> | ||
where | ||
[(); O + I]: | ||
; | ||
} | ||
|
||
struct Store<const N: usize>; | ||
|
||
impl<const N: usize> Store<N> { | ||
const REIFIED: usize = N; | ||
|
||
fn reify() -> usize { | ||
N | ||
} | ||
} | ||
|
||
fn main() { | ||
let _ = Parent::<2>::Mapping::<{ 12 * 2 }>::REIFIED; | ||
let _ = Parent::<1>::Mapping::<{ 2 * 5 }>::reify(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters