-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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 #100171 - Mark-Simulacrum:beta-next, r=Mark-Simulacrum
[beta] Rollup of beta backports Includes the following PRs: * rustc-docs: Be less specific about the representation of +bundle #100074 * Fix backwards-compatibility check for tests with +whole-archive #100068 * Revert write! and writeln! to late drop temporaries #99689 * Upgrade indexmap and thorin-dwp to use hashbrown 0.12 #99251 * rustdoc: avoid inlining modules with duplicate names #99738 r? `@ghost`
- Loading branch information
Showing
21 changed files
with
247 additions
and
83 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
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
7 changes: 7 additions & 0 deletions
7
...t/run-make/native-link-modifier-whole-archive/directly_linked_test_minus_whole_archive.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,7 @@ | ||
| use std::io::Write; | ||
|
|
||
| #[test] | ||
| fn test_thing() { | ||
| print!("ran the test"); | ||
| std::io::stdout().flush().unwrap(); | ||
| } |
7 changes: 7 additions & 0 deletions
7
...st/run-make/native-link-modifier-whole-archive/directly_linked_test_plus_whole_archive.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,7 @@ | ||
| use std::io::Write; | ||
|
|
||
| #[test] | ||
| fn test_thing() { | ||
| print!("ran the test"); | ||
| std::io::stdout().flush().unwrap(); | ||
| } |
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,11 @@ | ||
| pub struct Option; | ||
| impl Option { | ||
| pub fn unwrap(self) {} | ||
| } | ||
|
|
||
| /// [`Option::unwrap`] | ||
| pub mod task {} | ||
|
|
||
| extern "C" { | ||
| pub fn main() -> std::os::raw::c_int; | ||
| } |
16 changes: 16 additions & 0 deletions
16
src/test/rustdoc/issue-99734-multiple-foreigns-w-same-name.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,16 @@ | ||
| // aux-build:issue-99734-aux.rs | ||
| // build-aux-docs | ||
| // ignore-cross-compile | ||
|
|
||
| #![crate_name = "foo"] | ||
|
|
||
| #[macro_use] | ||
| extern crate issue_99734_aux; | ||
|
|
||
| pub use issue_99734_aux::*; | ||
|
|
||
| // @count foo/index.html '//a[@class="fn"][@title="foo::main fn"]' 1 | ||
|
|
||
| extern "C" { | ||
| pub fn main() -> std::os::raw::c_int; | ||
| } |
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,14 @@ | ||
| // aux-build:issue-99734-aux.rs | ||
| // build-aux-docs | ||
| // ignore-cross-compile | ||
|
|
||
| #![crate_name = "foo"] | ||
|
|
||
| #[macro_use] | ||
| extern crate issue_99734_aux; | ||
|
|
||
| pub use issue_99734_aux::*; | ||
|
|
||
| // @count foo/index.html '//a[@class="mod"][@title="foo::task mod"]' 1 | ||
|
|
||
| pub mod task {} |
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,37 @@ | ||
| // check-pass | ||
| // edition:2021 | ||
|
|
||
| use std::fmt::{self, Display}; | ||
| use std::future::Future; | ||
| use std::io; | ||
| use std::pin::Pin; | ||
| use std::task::{Context, Poll}; | ||
|
|
||
| struct AsyncStdout; | ||
|
|
||
| impl AsyncStdout { | ||
| fn write_fmt<'a>(&'a mut self, _args: fmt::Arguments) -> WriteFmtFuture<'a, Self> | ||
| where | ||
| Self: Unpin, | ||
| { | ||
| WriteFmtFuture(self) | ||
| } | ||
| } | ||
|
|
||
| struct WriteFmtFuture<'a, T>(&'a mut T); | ||
|
|
||
| impl<'a, T> Future for WriteFmtFuture<'a, T> { | ||
| type Output = io::Result<()>; | ||
| fn poll(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> { | ||
| unimplemented!() | ||
| } | ||
| } | ||
|
|
||
| async fn async_main() { | ||
| let _write = write!(&mut AsyncStdout, "...").await; | ||
| let _writeln = writeln!(&mut AsyncStdout, "...").await; | ||
| } | ||
|
|
||
| fn main() { | ||
| let _ = async_main; | ||
| } |
Oops, something went wrong.