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

Remove mentions of removed offset_to method from align_offset docs #61965

Merged
merged 2 commits into from
Jul 30, 2019

Conversation

phil-opp
Copy link
Contributor

The offset_to method was deleted in #52814.

The replacement for the removed method is wrapping_offset_from. However, neither method takes an usize as argument, so I don't think that it makes sense to mention them.

@rust-highfive
Copy link
Collaborator

r? @joshtriplett

(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 Jun 19, 2019
src/libcore/ptr/mod.rs Outdated Show resolved Hide resolved
The `align_offset` method returns an `usize`, so using `add` makes more sense than using `offset`, which takes an `isize`.
@JohnTitor
Copy link
Member

Ping from triage: waiting on your review @joshtriplett

@scottmcm
Copy link
Member

Just mentioning add is good by me. Thanks for the PR!

r? @scottmcm
@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jul 29, 2019

📌 Commit c9c73f5 has been approved by scottmcm

@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 Jul 29, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 29, 2019
Remove mentions of removed `offset_to` method from `align_offset` docs

The `offset_to` method was deleted in rust-lang#52814.

The replacement for the removed method is `wrapping_offset_from`. However, neither method takes an `usize` as argument, so I don't think that it makes sense to mention them.
Centril added a commit to Centril/rust that referenced this pull request Jul 29, 2019
Remove mentions of removed `offset_to` method from `align_offset` docs

The `offset_to` method was deleted in rust-lang#52814.

The replacement for the removed method is `wrapping_offset_from`. However, neither method takes an `usize` as argument, so I don't think that it makes sense to mention them.
Centril added a commit to Centril/rust that referenced this pull request Jul 30, 2019
Remove mentions of removed `offset_to` method from `align_offset` docs

The `offset_to` method was deleted in rust-lang#52814.

The replacement for the removed method is `wrapping_offset_from`. However, neither method takes an `usize` as argument, so I don't think that it makes sense to mention them.
Centril added a commit to Centril/rust that referenced this pull request Jul 30, 2019
Remove mentions of removed `offset_to` method from `align_offset` docs

The `offset_to` method was deleted in rust-lang#52814.

The replacement for the removed method is `wrapping_offset_from`. However, neither method takes an `usize` as argument, so I don't think that it makes sense to mention them.
bors added a commit that referenced this pull request Jul 30, 2019
Rollup of 12 pull requests

Successful merges:

 - #61965 (Remove mentions of removed `offset_to` method from `align_offset` docs)
 - #62928 (Syntax: Recover on `for ( $pat in $expr ) $block`)
 - #63000 (Impl Debug for Chars)
 - #63083 (Make generic parameters always use modern hygiene)
 - #63087 (Add very simple edition check to tidy.)
 - #63093 (Properly check the defining scope of existential types)
 - #63096 (Add tests for some `existential_type` ICEs)
 - #63099 (vxworks: Remove Linux-specific comments.)
 - #63106 (ci: Skip installing SWIG/xz on OSX )
 - #63108 (Add links to None in Option doc)
 - #63109 (std: Fix a failing `fs` test on Windows)
 - #63111 (Add syntactic and semantic tests for rest patterns, i.e. `..`)

Failed merges:

r? @ghost
@bors bors merged commit c9c73f5 into rust-lang:master Jul 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants