Skip to content

Rollup of 6 pull requests - #96904

Merged
bors merged 17 commits into
rust-lang:masterfrom
JohnTitor:rollup-f1sz5x0
May 10, 2022
Merged

Rollup of 6 pull requests#96904
bors merged 17 commits into
rust-lang:masterfrom
JohnTitor:rollup-f1sz5x0

Conversation

@JohnTitor

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

BoxyUwUand others added 17 commits May 5, 2022 12:24
…atch_err, r=lcnr
Handle mismatched generic param kinds in trait impls betterly
- Check that generic params on a generic associated type are the same as in the trait definition
- Check that const generics are not used in place of type generics (and the other way round too)
r? `@lcnr`
Expose process windows_process_extensions_main_thread_handle on Windows
~~I did not find any tests in https://github.com/rust-lang/rust/blob/7d3e03666a93bd2b0f78b3933f9305832af771a5/library/std/src/sys/windows/process/tests.rs that actually launch processes, so I haven't added tests for this.~~ I ran the following locally, to check that it works as expected:
```rs
#![feature(windows_process_extensions_main_thread_handle)]
fn main() {
use std::os::windows::process::{ChildExt, CommandExt};
const CREATE_SUSPENDED: u32 = 0x00000004;
let proc = std::process::Command::new("cmd")
.args(["/C", "echo hello"])
.creation_flags(CREATE_SUSPENDED)
.spawn()
.unwrap();
extern "system" {
fn ResumeThread(_: *mut std::ffi::c_void) -> u32;
}
unsafe {
ResumeThread(proc.main_thread_handle());
}
let output = proc.wait_with_output().unwrap();
let str_output = std::str::from_utf8(&output.stdout[..]).unwrap();
println!("{}", str_output);
}
```
Without the feature attribute it wouldn't compile, and commenting the `ResumeThread` line makes it hang forever, showing that it works.
Trakcing issue rust-lang#96723
Move some tests to more reasonable places
cc rust-lang#73494
r? `@petrochenkov`
…htriplett
Use Rust 2021 prelude in std itself.
Don't subst an AdtDef with its own substs
@rustbotrustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels May 10, 2022
@JohnTitor

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=6 rollup=never

@bors

bors commented May 10, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit c5f2c44 has been approved by JohnTitor

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 10, 2022
@bors

bors commented May 10, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c5f2c44 with merge d4c3643...

@bors

bors commented May 10, 2022

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing d4c3643 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label May 10, 2022
@bors
bors merged commit d4c3643 into rust-lang:masterMay 10, 2022
@rustbotrustbot added this to the 1.62.0 milestone May 10, 2022
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (d4c3643): comparison url.

Summary: This benchmark run did not return any relevant results.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@JohnTitor
JohnTitor deleted the rollup-f1sz5x0 branch May 10, 2022 23:49
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-libsRelevant to the library team, which will review and decide on the PR/issue.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants

@JohnTitor@bors@rust-timer@rustbot@BoxyUwU@c410-f3r@m-ou-se@notriddle@jackh726@nico-abram