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

Fix FP of manual_range_contains in const fn #6382

Merged
merged 1 commit into from
Dec 12, 2020
Merged

Fix FP of manual_range_contains in const fn #6382

merged 1 commit into from
Dec 12, 2020

Conversation

giraffate
Copy link
Contributor

Fix #6373.

changelog: Fix FP of manual_range_contains in const fn

@rust-highfive
Copy link

r? @llogiq

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Nov 25, 2020
@llogiq
Copy link
Contributor

llogiq commented Dec 7, 2020

Thank you! @bors r+

@bors
Copy link
Contributor

bors commented Dec 7, 2020

📌 Commit 14736ab has been approved by llogiq

@bors
Copy link
Contributor

bors commented Dec 7, 2020

⌛ Testing commit 14736ab with merge e02fa2e...

bors added a commit that referenced this pull request Dec 7, 2020
@bors
Auto merge of #6382 - giraffate:fix_fp_in_manual_range_contains_when_…
e02fa2e 
…const_fn, r=llogiq

Fix FP of `manual_range_contains` in `const fn`

Fix #6373.

changelog: Fix FP of `manual_range_contains` in `const fn`
@bors
Copy link
Contributor

bors commented Dec 7, 2020

💔 Test failed - checks-action_dev_test

@llogiq
Copy link
Contributor

llogiq commented Dec 7, 2020

Seems rustfmt has changed? Perhaps cargo dev fmt will fix this.

@giraffate giraffate force-pushed the fix_fp_in_manual_range_contains_when_const_fn branch from 14736ab to 59c319a Compare December 10, 2020 23:38
@bors
Copy link
Contributor

bors commented Dec 11, 2020

☔ The latest upstream changes (presumably #6424) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

@giraffate giraffate force-pushed the fix_fp_in_manual_range_contains_when_const_fn branch from 59c319a to 26c61c7 Compare December 11, 2020 14:09
@Manishearth
Copy link
Member

@bors r=llogiq

@bors
Copy link
Contributor

bors commented Dec 12, 2020

📌 Commit 26c61c7 has been approved by llogiq

@bors
Copy link
Contributor

bors commented Dec 12, 2020

⌛ Testing commit 26c61c7 with merge 3b89a67...

@bors
Copy link
Contributor

bors commented Dec 12, 2020

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: llogiq
Pushing 3b89a67 to master...

@bors bors merged commit 3b89a67 into rust-lang:master Dec 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@llogiq llogiq

Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

manual_range_contains suggests breaking code constness
5 participants
@giraffate @rust-highfive @llogiq @bors @Manishearth