Stable point release (1.26.1) #51045
Merged
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
This commit updates our manifest generation for rustup to filter out any components/extensions which are actually missing. This is intended to help mitigate rust-lang#49462 by making the manifests reflect reality, that many targets now are missing a `rust-docs` component rather than requiring it exists.
Fixes rust-lang#50595. This bug currently affects stable. Why I think we can go for hard error: - It will in stable for at most one cycle and there is no legitimate reason to abuse it, nor any known uses in the wild. - It only affects `bin` crates (which have a `main`), so there is little practical difference between a hard error or a deny lint, both are a one line fix. The fix was to just unshadow a variable. Thanks @nikomatsakis for the mentoring! r? @nikomatsakis
Fix rust-lang#50811 Make sure the float comparison output is consistent with the expected behavior when NaN is involved. ---- Note: This PR is a **BREAKING CHANGE**. If you have used `>` or `>=` to compare floats, and make the result as the length of a fixed array type, like: ```rust use std::f64::NAN; let x: [u8; (NAN > NAN) as usize] = [1]; ``` then the code will no longer compile. Previously, all float comparison involving NaN will just return "Greater", i.e. `NAN > NAN` would wrongly return `true` during const evaluation. If you need to retain the old behavior (why), you may replace `a > b` with `a != a || b != b || a > b`.
A high impact bug because a lot of common traits use a `Self` substitution by default. Should be backported to beta. There was a check for this which wasn't catching all cases, it was made more robust. Fixes rust-lang#49376 Fixes rust-lang#50626 r? @petrochenkov
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
|
rust-highfive
added
the
S-waiting-on-review
|
Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem. Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
kennytm
reviewed
May 24, 2018
| Lt => PrimVal::from_bool(l.try_cmp(r).unwrap() == Ordering::Less), | ||
| Le => PrimVal::from_bool(l.try_cmp(r).unwrap() != Ordering::Greater), | ||
| Gt => PrimVal::from_bool(l.try_cmp(r).unwrap() == Ordering::Greater), | ||
| Ge => PrimVal::from_bool(l.try_cmp(r).unwrap() != Ordering::Less), |
There was a problem hiding this comment.
Oof. rustc_const_math::ConstFloat in 1.26 doesn't impl PartialOrd.
We either need to modify the try_cmp method or creates a new method which returns Result<Option<Ordering>, ConstMathErr>.
There was a problem hiding this comment.
How do you feel about 7b58d76? That looks fairly minimal and implements the required change to make the original patch work on stable AFAICT.
|
Do we want to hold off on this to try and sneak in a fix to #50950? cc @nikomatsakis |
|
I would like to request inclusion of #49462 if possible, since it makes stable Rust unusable on the Raspberry Pi. |
|
Oh nice this even includes release notes for the 1.26.1 release itself. ❤️ |
|
Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem. Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
I don't think so - a point release is for emergency bug fixes, and this sounds like a new feature. |
|
My understanding is that we didn't intend turbofish to be supported with impl Trait in argument position, but in some cases it is -- the PR @nikomatsakis wrote disables that behavior, so it is in fact a bug fix (accidental stabilization). |
|
Thanks @Mark-Simulacrum for preparing this! r=me once travis is green |
kennytm
added
S-waiting-on-author
|
Const-eval of |
I do not see that commit in any branch. I think the right one is 59059f2, which was merged by #49696. However, the commit does not exist in stable branch, but only master and beta. That is why 1.26.0 has #49462. We need to cherry-pick it into this pull request. |
|
It’s not in any branch because the PR hasn’t been merged yet...
If you go to the « commits » section you’ll see that it’s the first commit
of this PR
…On Fri 25 May 2018 at 13:40, Tatsuya Kawano ***@***.***> wrote:
@fenhl <https://github.com/fenhl> @Mark-Simulacrum
<https://github.com/Mark-Simulacrum>
I would like to request inclusion of #49462
<#49462> if possible, since it
makes stable Rust unusable on the Raspberry Pi.
The fix for #49462 <#49462> is
already included with 4c67e70
<4c67e70>,
I believe.
I do not see that commit in any branch.
git remote -v
origin ***@***.***:rust-lang/rust.git (fetch)
origin ***@***.***:rust-lang/rust.git (push)
$ git branch -a --contains 4c67e70
error: no such commit 4c67e70
I think the right one is 59059f2
<59059f2>,
which was merged by #49696 <#49696>.
*However, the commit does not exist in stable branch*, but only master
and beta. That is why 1.26.0 has #49462
<#49462>. We need to cherry-pick
it into this pull request.
$ git branch -a --contains 59059f2
* master
remotes/origin/HEAD -> origin/master
remotes/origin/alex-tmp
remotes/origin/auto
remotes/origin/beta
remotes/origin/master
remotes/origin/nll-alias-analysis
remotes/origin/try
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<#51045 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AANm3t9yHwdgE_YZLyZ82FiFSB_ekVr-ks5t1-29gaJpZM4UM_-g>
.
|
|
@cramertj @nikomatsakis #51051 was merged. |
Ah, ok. Thanks. |
Mark-Simulacrum
force-pushed
the
stable-point
branch
from
7b58d76 to
59d8d67
Compare
|
Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem. Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Mark-Simulacrum
force-pushed
the
stable-point
branch
from
59d8d67 to
b3785a3
Compare
|
@bors r+ p=50 |
|
📌 Commit b3785a3 has been approved by |
bors
added
S-waiting-on-bors
|
er, @bors r=alexcrichton |
|
💡 This pull request was already approved, no need to approve it again.
|
|
📌 Commit b3785a3 has been approved by |
|
☀️ Test successful - status-appveyor, status-travis |
|
@Mark-Simulacrum you might need to merge this manually? |
|
Note to future visitors: Merging a branch on your own is a bad idea as we only promote stable artifacts if the last commit is by bors (I think) -- instead, we should force(?)-push the bors commit from auto to stable if this happens. |
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.
This includes all items on the wishlist, plus #50694, which backported cleanly.
The target date is May 29th, Tuesday next week.
cc @rust-lang/compiler @oli-obk @eddyb -- I backported #50812, but it wasn't a clean patch so review would be appreciated.