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

Rustup #6404

Merged
merged 3 commits into from
Dec 3, 2020
Merged

Rustup #6404

merged 3 commits into from
Dec 3, 2020

Conversation

flip1995
Copy link
Member

r? @ghost

changelog: none

camelid and others added 3 commits November 27, 2020 19:08
For example, `1` is parsed as an integer literal, but it can be turned
into a float with the suffix `f32`. Now the error calls them "numeric
literals" and notes that you can add a float suffix since they can be
either integers or floats.
Part of #68490.

Care has been taken to leave the old consts where appropriate, for testing backcompat regressions, module shadowing, etc. The intrinsics docs were accidentally referring to some methods on f64 as std::f64, which I changed due to being contrary with how we normally disambiguate the shadow module from the primitive. In one other place I changed std::u8 to std::ops since it was just testing path handling in macros.

For places which have legitimate uses of the old consts, deprecated attributes have been optimistically inserted. Although currently unnecessary, they exist to emphasize to any future deprecation effort the necessity of these specific symbols and prevent them from being accidentally removed.
Update error to reflect that integer literals can have float suffixes

For example, `1` is parsed as an integer literal, but it can be turned
into a float with the suffix `f32`. Now the error calls them "numeric
literals" and notes that you can add a float suffix since they can be
either integers or floats.
@flip1995
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Nov 30, 2020

📌 Commit 3be53bc has been approved by flip1995

bors added a commit that referenced this pull request Nov 30, 2020
Rustup

r? `@ghost`

changelog: none
@bors
Copy link
Contributor

bors commented Nov 30, 2020

⌛ Testing commit 3be53bc with merge 873abf9...

@bors
Copy link
Contributor

bors commented Nov 30, 2020

💔 Test failed - checks-action_test

@matthiaskrgr
Copy link
Member

Looks like rust-lang/rust#79560

@matthiaskrgr
Copy link
Member

Should be able to land now as the breaking pr was reverted 🎉

@flip1995
Copy link
Member Author

flip1995 commented Dec 3, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Dec 3, 2020

💡 This pull request was already approved, no need to approve it again.

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.

@bors
Copy link
Contributor

bors commented Dec 3, 2020

📌 Commit 3be53bc has been approved by flip1995

@bors
Copy link
Contributor

bors commented Dec 3, 2020

⌛ Testing commit 3be53bc with merge 4785da6...

@bors
Copy link
Contributor

bors commented Dec 3, 2020

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: flip1995
Pushing 4785da6 to master...

@bors bors merged commit 4785da6 into rust-lang:master Dec 3, 2020
@flip1995 flip1995 deleted the rustup branch December 3, 2020 09:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants