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.

Sign up for GitHub

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

Jump to bottom

[beta] backports and bump stage0 #129033

Merged
merged 12 commits into from
Aug 15, 2024
Merged

[beta] backports and bump stage0 #129033

merged 12 commits into from
Aug 15, 2024

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Aug 13, 2024 •
edited
Loading

r? cuviper

Noratrieb and others added 9 commits August 12, 2024 18:17
@Noratrieb @cuviper
Disable jump threading of float equality
73f1331 
Jump threading stores values as `u128` (`ScalarInt`) and does its
comparisons for equality as integer comparisons.
This works great for integers. Sadly, not everything is an integer.

Floats famously have wonky equality semantcs, with `NaN!=NaN` and
`0.0 == -0.0`. This does not match our beautiful integer bitpattern
equality and therefore causes things to go horribly wrong.

While jump threading could be extended to support floats by remembering
that they're floats in the value state and handling them properly,
it's signficantly easier to just disable it for now.

(cherry picked from commit f305e18)
@compiler-errors @cuviper
Normalize when equating dyn tails in MIR borrowck
9fce4e1 
(cherry picked from commit c6f8672)
@Voultapher @cuviper
Improve panic message and surrounding documentation for Ord violations
fa977e8 
The new sort implementations have the ability to
detect Ord violations in many cases. This commit
improves the message in a way that should help
users realize what went wrong in their program.

(cherry picked from commit 644550f)
@Voultapher @cuviper
Improve panic sections for sort*, sort_unstable* and select_nth_unsta…
a3446ae 
…ble*

- Move panic information into # Panics section
- Fix mentions of T: Ord that should be compare
- Add missing information

(cherry picked from commit 00ce238)
@Voultapher @cuviper
Apply review comments
2a4e738 
- Use if the implementation of [`Ord`] for `T`
  language
- Link to total order wiki page
- Rework total order help and examples
- Improve language to be more precise and less
  prone to misunderstandings.
- Fix usage of `sort_unstable_by` in `sort_by`
  example
- Fix missing author mention
- Use more consistent example input for sort
- Use more idiomatic assert_eq! in examples
- Use more natural "comparison function" language
  instead of "comparator function"

(cherry picked from commit afc404f)
@Voultapher @cuviper
Hide internal sort module
2810c2a 
(cherry picked from commit eae7a18)
@Voultapher @cuviper
Apply review comments to PartialOrd section
cecf4a1 
(cherry picked from commit 613155c)
@Voultapher @cuviper
Fix linkchecker issue
2d78075 
(cherry picked from commit 1be60b5)
@cuviper
bump stage0 to stable 1.80.1
97e5fb6
@rustbot
Copy link
Collaborator

rustbot commented Aug 13, 2024

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. labels Aug 13, 2024
@cuviper
Copy link
Member Author

cuviper commented Aug 13, 2024

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Aug 13, 2024

📌 Commit 97e5fb6 has been approved by cuviper

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 13, 2024
BoxyUwU and others added 3 commits August 15, 2024 09:15
@BoxyUwU @cuviper
Revert "Auto merge of rust-lang#125915 - camelid:const-arg-refactor, …
9fe9265 
…r=BoxyUwU"

This reverts commit 8c3a94a, reversing
changes made to 3d68afc.
@dingxiangfei2009 @cuviper
derive(SmartPointer): register helper attributes
418695d 
(cherry picked from commit 5534cb0)
@nnethercote @cuviper
Fix bug in Parser::look_ahead.
ef56e6f 
The special case was failing to handle invisible delimiters on one path.

Fixes rust-lang#128895.

(cherry picked from commit 46b4c5a)
@cuviper cuviper mentioned this pull request Aug 15, 2024
Closed
@cuviper
Copy link
Member Author

cuviper commented Aug 15, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Aug 15, 2024

📌 Commit ef56e6f has been approved by cuviper

It is now in the queue for this repository.

@cuviper
Copy link
Member Author

cuviper commented Aug 15, 2024

Bumping priority since this includes the fix for P-critical #128243 (already fixed in nightly and stable 1.80.1).

@bors p=1

@bors
Copy link
Contributor

bors commented Aug 15, 2024

⌛ Testing commit ef56e6f with merge 6c199c8...

@bors
Copy link
Contributor

bors commented Aug 15, 2024

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing 6c199c8 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 15, 2024
@bors bors merged commit 6c199c8 into rust-lang:beta Aug 15, 2024
7 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Aug 15, 2024
@jieyouxu jieyouxu mentioned this pull request Aug 22, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@cuviper cuviper

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.81.0
Development

Successfully merging this pull request may close these issues.
9 participants
@cuviper @rustbot @bors @Noratrieb @compiler-errors @Voultapher @BoxyUwU @dingxiangfei2009 @nnethercote