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 8 pull requests #77723

Merged
merged 17 commits into from
Oct 9, 2020
Merged

Rollup of 8 pull requests #77723

merged 17 commits into from
Oct 9, 2020

Conversation

jonas-schievink
Copy link
Contributor

Successful merges:

Failed merges:

r? @ghost

ssomers and others added 17 commits October 3, 2020 21:18
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Explain when you should use it and when you should not.
…rk-Simulacrum

Don't discourage implementing `core::fmt::Write`

Fixes #76729.

Explain when you should use it and when you should not.
…-Simulacrum

BTreeMap: comment why drain_filter's size_hint is somewhat pessimistic

The `size_hint` of the `DrainFilter` iterator doesn't adjust as you iterate. This hardly seems important to me, but there has been a comparable PR #64383 in the past. I guess a scenario is that you first iterate half the map manually and keep most of the key/value pairs in the map, and then tell the predicate to drain most of the key/value pairs and `.collect` the iterator over the remaining half of the map.

I am totally ambivalent whether this is better or not.

r? @Mark-Simulacrum
(docs): make mutex error comment consistent with codebase

Although exceptionally minor, I found this stands out from other error reporting language used in doc comments. With the existence of the `failure` crate, I suppose this could be slightly ambiguous. In any case, this change brings the particular comment into a consistent state with other mentions of returning errors.
…afe, r=Aaron1011

Add compile fail test for issue 27675

A recently merged PR (#73905) strengthened the checks on bounds of associated items. This rejects the attack path of #27675 which consisted of constructing a `dyn Trait<Item=T>` where `T` would not fulfill the bounds required on `Item` of the `Trait` behind the dyn object.

This regression test, extracted from [the weaponized instance](#27675 (comment)), checks that this is rejected.
Remove unnecessary lamda on emitter map.
Make `max_log_info` easily greppable (for figuring out why debug logging is disabled)

Follow-up to #77678 (comment). I'll make a PR to the dev-guide shortly changing `debug = true` to `debug-logging = true` and using this text.

Ideally wouldn't be merged before #77678, but it practice it won't hurt anything.

r? @Mark-Simulacrum
Update submodule llvm to get LVI bugfix

The LLVM LVI mitigations used register %rcs as a clobber register. This is problematic when rust uses this register to return (part of) function values. The problem was fixed upstream in:

    https://reviews.llvm.org/D88924
    https://reviews.llvm.org/D88925

PR rust-lang/llvm-project#79 merged it in the llvm_project. This PR updates the submodule

Bug report: https://bugs.llvm.org/show_bug.cgi?id=47740
Fixes #77607

cc: @jethrogb
@jonas-schievink
Copy link
Contributor Author

@bors r+ rollup=never p=8

@rustbot modify labels: rollup

@bors
Copy link
Contributor

bors commented Oct 8, 2020

📌 Commit d252848 has been approved by jonas-schievink

@rustbot rustbot added the rollup A PR which is a rollup label Oct 8, 2020
@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 Oct 8, 2020
@bors
Copy link
Contributor

bors commented Oct 8, 2020

⌛ Testing commit d252848 with merge 8a84c4f...

@bors
Copy link
Contributor

bors commented Oct 9, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: jonas-schievink
Pushing 8a84c4f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 9, 2020
@bors bors merged commit 8a84c4f into rust-lang:master Oct 9, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 9, 2020
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants