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

Use pointer is_aligned* methods #100820

Merged
merged 2 commits into from
Aug 22, 2022
Merged

Use pointer is_aligned* methods #100820

merged 2 commits into from
Aug 22, 2022

Conversation

WaffleLapkin
Copy link
Member

This PR replaces some manual alignment checks with calls to pointer::{is_aligned, is_aligned_to} and removes a useless pointer cast.

r? @scottmcm

split off from #100746

@rustbot rustbot added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Aug 20, 2022
@rustbot
Copy link
Collaborator

rustbot commented Aug 20, 2022

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 20, 2022
WaffleLapkin
WaffleLapkin commented Aug 20, 2022
View reviewed changes
library/alloc/src/vec/into_iter.rs
@@ -148,7 +148,7 @@ impl<T, A: Allocator> Iterator for IntoIter<T, A> {

#[inline]
fn next(&mut self) -> Option<T> {
if self.ptr as *const _ == self.end {
if self.ptr == self.end {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd guess this was left from times when self.ptr and self.end had different types?... But they currently use the same type, so this is useless:

rust/library/alloc/src/vec/into_iter.rs

Lines 41 to 42 in de9da0b

pub(super) ptr: *const T,
pub(super) end: *const T,

@compiler-errors compiler-errors changed the title Use pointer is_ligned* methods Use pointer is_aligned* methods Aug 20, 2022
@scottmcm
Copy link
Member

Thanks for splitting these out!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 21, 2022

📌 Commit de9da0b has been approved by scottmcm

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 21, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 21, 2022
@matthiaskrgr
Rollup merge of rust-lang#100820 - WaffleLapkin:use_ptr_is_aligned_me…
4b880d5 
…thods, r=scottmcm

Use pointer `is_aligned*` methods

This PR replaces some manual alignment checks with calls to `pointer::{is_aligned, is_aligned_to}` and removes a useless pointer cast.

r? `@scottmcm`

_split off from #100746_
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 21, 2022
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 21, 2022
@matthiaskrgr
Rollup merge of rust-lang#100820 - WaffleLapkin:use_ptr_is_aligned_me…
223bd89 
…thods, r=scottmcm

Use pointer `is_aligned*` methods

This PR replaces some manual alignment checks with calls to `pointer::{is_aligned, is_aligned_to}` and removes a useless pointer cast.

r? ``@scottmcm``

_split off from #100746_
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 21, 2022
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 21, 2022
@matthiaskrgr
Rollup merge of rust-lang#100820 - WaffleLapkin:use_ptr_is_aligned_me…
667d8dc 
…thods, r=scottmcm

Use pointer `is_aligned*` methods

This PR replaces some manual alignment checks with calls to `pointer::{is_aligned, is_aligned_to}` and removes a useless pointer cast.

r? ```@scottmcm```

_split off from #100746_
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 21, 2022
Closed
@matthiaskrgr
Copy link
Member

@bors r- failed in rollup
#100837 (comment)

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 21, 2022
@WaffleLapkin
Copy link
Member Author

I've added the missing feature flag 🥲

@scottmcm
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Aug 22, 2022

📌 Commit efef211 has been approved by scottmcm

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 22, 2022
@Dylan-DPC Dylan-DPC mentioned this pull request Aug 22, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 22, 2022
@bors
Auto merge of rust-lang#100881 - Dylan-DPC:rollup-q9rr658, r=Dylan-DPC
a785176 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#98200 (Expand potential inner `Or` pattern for THIR)
 - rust-lang#99770 (Make some const prop mir-opt tests `unit-test`s)
 - rust-lang#99957 (Rework Ipv6Addr::is_global to check for global reachability rather than global scope - rebase)
 - rust-lang#100331 (Guarantee `try_reserve` preserves the contents on error)
 - rust-lang#100336 (Fix two const_trait_impl issues)
 - rust-lang#100713 (Convert diagnostics in parser/expr to SessionDiagnostic)
 - rust-lang#100820 (Use pointer `is_aligned*` methods)
 - rust-lang#100872 (Add guarantee that Vec::default() does not alloc)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 58d2373 into rust-lang:master Aug 22, 2022
@rustbot rustbot added this to the 1.65.0 milestone Aug 22, 2022
@WaffleLapkin WaffleLapkin deleted the use_ptr_is_aligned_methods branch September 4, 2022 16:27
@WaffleLapkin WaffleLapkin mentioned this pull request Sep 4, 2022
Open
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@scottmcm scottmcm

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.65.0
Development

Successfully merging this pull request may close these issues.
6 participants
@WaffleLapkin @rustbot @scottmcm @bors @matthiaskrgr @rust-highfive