Skip to content
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

Rollup of 4 pull requests #95148

Merged
merged 8 commits into from
Mar 21, 2022
Merged

Rollup of 4 pull requests #95148

merged 8 commits into from
Mar 21, 2022

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

ChrisDenton and others added 8 commits March 19, 2022 15:09
Skip a test if symlink creation is not possible

If someone running tests on Windows does not have Developer Mode enabled then creating symlinks will fail which in turn would cause this test to fail. This can be a stumbling block for contributors.
Fix docs for default rmeta filename.

The docs for the default filename for `--emit=metadata` was wrong, it was missing the `lib` prefix.  The current implementation for that default is [here](https://github.com/rust-lang/rust/blob/f2661cfe341f88bea919daf52a07015dceaf7a6a/compiler/rustc_session/src/output.rs#L140).  Perhaps somewhat confusing, but `lib` is used for all crate types.

cc rust-lang#68839 (comment)
…ngle-bracket-error, r=Dylan-DPC

Fix a not emitted unmatched angle bracket error

closes rust-lang#95128
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Mar 20, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=4

@bors
Copy link
Collaborator

bors commented Mar 20, 2022

📌 Commit e33a481 has been approved by matthiaskrgr

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 20, 2022
@bors
Copy link
Collaborator

bors commented Mar 20, 2022

⌛ Testing commit e33a481 with merge 51558cc...

@bors
Copy link
Collaborator

bors commented Mar 21, 2022

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 51558cc to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 21, 2022
@bors bors merged commit 51558cc into rust-lang:master Mar 21, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 21, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (51558cc): comparison url.

Summary: This benchmark run did not return any relevant results. 1 results were found to be statistically significant but too small to be relevant.

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

@rustbot label: -perf-regression

@matthiaskrgr matthiaskrgr deleted the rollup-jsb1ld9 branch July 30, 2022 10:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants