Skip to content

Rollup of 5 pull requests #91350

New issue

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

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

Already on GitHub? # to your account

Merged
merged 10 commits into from
Nov 29, 2021
Merged

Rollup of 5 pull requests #91350

merged 10 commits into from
Nov 29, 2021

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

dimo414 and others added 10 commits November 20, 2021 12:28
This is similar to the note on [Python's `os.symlink()`](https://docs.python.org/3/library/os.html#os.symlink). Some additional notes in dimo414/bkt#3.
When `-C remark=...` option is specified multiple times,
accumulate all values instead of using only the last one.
Add a caveat to std::os::windows::fs::symlink_file

This is similar to the note on [Python's `os.symlink()`](https://docs.python.org/3/library/os.html#os.symlink). Some additional notes in dimo414/bkt#3.
…Mark-Simulacrum

Add demonstration test for rust-lang#91161

Since cross-crate things are hard to demonstrate in playground, here's a test showing that something currently works that shouldn't.

cc rust-lang#91161 that tracks fixing the problem (and updating this test)
Delete an unreachable codepath from format_args implementation
…ikic

Accumulate all values of `-C remark` option

When `-C remark=...` option is specified multiple times,
accumulate all values instead of using only the last one.

r? `@nikic`
@rustbot rustbot added the rollup A PR which is a rollup label Nov 29, 2021
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Nov 29, 2021

📌 Commit e15e0ba 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 Nov 29, 2021
@bors
Copy link
Collaborator

bors commented Nov 29, 2021

⌛ Testing commit e15e0ba with merge 8b95491...

@bors
Copy link
Collaborator

bors commented Nov 29, 2021

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 8b95491 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 29, 2021
@bors bors merged commit 8b95491 into rust-lang:master Nov 29, 2021
@rustbot rustbot added this to the 1.59.0 milestone Nov 29, 2021
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (8b95491): comparison url.

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

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-nleabdj branch December 12, 2021 09:58
# for free to join this conversation on GitHub. Already have an account? # 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants