Rollup of 8 pull requests #77712
Closed
Rollup of 8 pull requests #77712
Conversation
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
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
`DirEntry` contains a `ReadDir` handle, which used to just be a wrapper on `Arc<InnerReadDir>`. Commit af75314 added `end_of_stream: bool` which is not needed by `DirEntry`, but adds 8 bytes after padding. We can let `DirEntry` have an `Arc<InnerReadDir>` directly to avoid that.
…t, r=Mark-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 rust-lang#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
suggest `MAX` constant if -1 is assigned to unsigned type Fixes rust-lang#76413. Fixes rust-lang#77416.
(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.
…-object-safe, r=Aaron1011 Add compile fail test for issue 27675 A recently merged PR (rust-lang#73905) strengthened the checks on bounds of associated items. This rejects the attack path of rust-lang#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](rust-lang#27675 (comment)), checks that this is rejected.
Remove unnecessary lamda on emitter map.
unix/vxworks: make DirEntry slightly smaller `DirEntry` contains a `ReadDir` handle, which used to just be a wrapper on `Arc<InnerReadDir>`. Commit af75314 added `end_of_stream: bool` which is not needed by `DirEntry`, but adds 8 bytes after padding. We can let `DirEntry` have an `Arc<InnerReadDir>` directly to avoid that.
Use shorter path for std::hash::Hash
…crum Make `max_log_info` easily greppable (for figuring out why debug logging is disabled) Follow-up to rust-lang#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 rust-lang#77678, but it practice it won't hurt anything. r? @Mark-Simulacrum
|
@bors r+ rollup=never p=5 |
|
📌 Commit 4b99066 has been approved by |
bors
added
the
S-waiting-on-bors
|
⌛ Testing commit 4b99066 with merge f26192a2b065ce753fb42c88a2f41c6ef32a5d0f... |
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Successful merges:
MAXconstant if -1 is assigned to unsigned type #77578 (suggestMAXconstant if -1 is assigned to unsigned type)max_log_infoeasily greppable (for figuring out why debug logging is disabled) #77701 (Makemax_log_infoeasily greppable (for figuring out why debug logging is disabled))Failed merges:
r? @ghost