Uh oh!
There was an error while loading. Please reload this page.
[beta] Final round of beta backports - #44062
Merged
Merged
Conversation
A change in rust-lang#41911 had made `for_all_relevant_impls` do a linear scan over all impls, instead of using an HashMap. Use an HashMap again to avoid quadratic blowup when there is a large number of structs with impls. I think this fixesrust-lang#43141 completely, but I want better measurements in order to be sure. As a perf patch, please don't roll this up.
Historically many `Display` and `Debug` implementations for `OsStr`-like abstractions have gone through `String::from_utf8_lossy`, but this was updated in rust-lang#42613 to use an internal `Utf8Lossy` abstraction instead. This had the unfortunate side effect of causing a regression (rust-lang#43765) in code which relied on these `fmt` trait implementations respecting the various formatting flags specified. This commit opportunistically adds back interpretation of formatting trait flags in the "common case" where where `OsStr`-like "thing" is all valid utf-8 and can delegate to the formatting implementation for `str`. This doesn't entirely solve the regression as non-utf8 paths will format differently than they did before still (in that they will not respect formatting flags), but this should solve the regression for all "real world" use cases of paths and such. The door's also still open for handling these flags in the future! Closesrust-lang#43765
Since rust-lang#42886, macros can create "nonstandard" PatKind::Lit patterns, that contain path expressions instead of the usual literal expr. These can cause trouble, including ICEs. We *could* map these nonstandard patterns to PatKind::Path patterns during HIR lowering, but that would be much effort for little gain, and I think is too risky for beta. So let's just forbid them during AST validation. Fixesrust-lang#43250.
No test cases for these ones, but they would all ICE if they ever run with a non-empty set of obligations.
This commit flags all allocation-related functions in liballoc as "this can't unwind" which should largely resolve the size-related issues found on rust-lang#42808. The documentation on the trait was updated with such a restriction (they can't panic) as well as some other words about the relative instability about implementing a bullet-proof allocator. Closesrust-lang#42808
rust-highfive
commented
Aug 23, 2017
Contributor
r? @pnkfelix (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
commented
Aug 23, 2017
Contributor
|
alexcrichton
commented
Aug 23, 2017
MemberAuthor
Note that not everything is approved just yet, so I'm going to wait for all these backports to get approved |
alexcrichton
commented
Aug 23, 2017
MemberAuthor
@bors: r+ p=10 |
bors
commented
Aug 23, 2017
Collaborator
📌 Commit 7c076fc has been approved by |
alexcrichton
commented
Aug 23, 2017
MemberAuthor
@bors: r+ p=10 |
bors
commented
Aug 23, 2017
Collaborator
📌 Commit 0e9969c has been approved by |
bors
commented
Aug 23, 2017
Collaborator
Member
Never mind, it actually started, after sleeping for 1.5 hours. Let's wait 2 more hours on this. Update: It is now stuck at Update 2: The job is currently at the documentation stage. So it is Travis's logger being stuck, not the job itself. Letting it to continue. |
bors
commented
Aug 23, 2017
Collaborator
☀️ Test successful - status-appveyor, status-travis |
This file contains hidden or 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
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
Includes:
for_all_relevant_implsO(1) again #43723