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

More align_offset things #44537

Merged
merged 1 commit into from
Sep 18, 2017
Merged

More align_offset things #44537

merged 1 commit into from
Sep 18, 2017

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Sep 13, 2017

cc #44488

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@oli-obk oli-obk mentioned this pull request Sep 13, 2017
Merged
@oli-obk oli-obk force-pushed the memchr branch 2 times, most recently from 3f8abb7 to 18ab95f Compare September 13, 2017 13:31
alexcrichton
alexcrichton reviewed Sep 13, 2017
View reviewed changes
src/libstd/sys_common/memchr.rs Outdated
let mut offset;
if align > 0 {
offset = cmp::min(usize_bytes - align, len);
let mut offset = unsafe { align_offset(ptr as *const _, usize_bytes) };
Copy link
Member

Choose a reason for hiding this comment

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

Should this be using the inherent methods added in this PR?

Copy link
Contributor Author

@oli-obk oli-obk Sep 13, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

The compiler complained that it doesn't know the unstable feature (on stage0). This would become a mess of cfgs, so I opted to not do this here.

Copy link
Member

Choose a reason for hiding this comment

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

Sounds like a stage0 inherent method on pointers which does the old method via casts and not(stage0) uses the intrinsic?

alexcrichton
alexcrichton reviewed Sep 13, 2017
View reviewed changes
src/libcore/ptr.rs Outdated
/// remove me after the next release
pub fn align_offset(self, align: usize) -> usize {
unsafe {
intrinsics::align_offset(self as *const _, align)
Copy link
Member

Choose a reason for hiding this comment

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

This looks the same as the above function? I think the #[cfg] in the intrinsics module should be enough?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It differs in the stability. I couldn't use the function within core without giving core the corresponding feature, which then complained about an unknown feature.

Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure I understand this? Can't the stage0 shim in the intrinsics module be just as unstable as the real intrinsic in non-stage0?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I must have misread the error messages I got. It works now without duplicating the inherent methods. The intrinsics are still duplicated.

@aidanhs aidanhs added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 13, 2017
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Sep 14, 2017

📌 Commit 1462cab has been approved by alexcrichton

@alexcrichton
Copy link
Member

@bors: rollup

@alexcrichton alexcrichton mentioned this pull request Sep 16, 2017
Closed
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Sep 16, 2017
@frewsxcv
Rollup merge of rust-lang#44537 - oli-obk:memchr, r=alexcrichton
458c805 
More `align_offset` things

cc rust-lang#44488
@frewsxcv frewsxcv mentioned this pull request Sep 16, 2017
Closed
@alexcrichton alexcrichton mentioned this pull request Sep 16, 2017
Merged
@bors
Copy link
Contributor

bors commented Sep 16, 2017

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

bors added a commit that referenced this pull request Sep 17, 2017
@bors
Auto merge of #44634 - alexcrichton:rollup, r=alexcrichton
71e3767 
Rollup of 19 pull requests

- Successful merges: #44273, #44356, #44395, #44531, #44537, #44542, #44560, #44567, #44574, #44577, #44586, #44589, #44590, #44593, #44598, #44606, #44609, #44616, #44631
- Failed merges:
@oli-obk
Copy link
Contributor Author

oli-obk commented Sep 17, 2017

Rebased

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Sep 17, 2017

📌 Commit 2787a28 has been approved by alexcrichton

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Sep 18, 2017
@alexcrichton
Rollup merge of rust-lang#44537 - oli-obk:memchr, r=alexcrichton
1907827 
More `align_offset` things

cc rust-lang#44488
@alexcrichton alexcrichton mentioned this pull request Sep 18, 2017
Closed
bors added a commit that referenced this pull request Sep 18, 2017
@bors
Auto merge of #44676 - alexcrichton:rollup, r=alexcrichton
4a8bc8a 
Rollup of 10 pull requests

- Successful merges: #44364, #44466, #44537, #44640, #44651, #44657, #44661, #44668, #44671, #44675
- Failed merges:
alexcrichton added a commit to alexcrichton/rust that referenced this pull request Sep 18, 2017
@alexcrichton
Rollup merge of rust-lang#44537 - oli-obk:memchr, r=alexcrichton
8dae2b0 
More `align_offset` things

cc rust-lang#44488
@alexcrichton alexcrichton mentioned this pull request Sep 18, 2017
Merged
bors added a commit that referenced this pull request Sep 18, 2017
@bors
Auto merge of #44678 - alexcrichton:rollup, r=alexcrichton
0701b37 
Rollup of 11 pull requests

- Successful merges: #44364, #44466, #44537, #44548, #44640, #44651, #44657, #44661, #44668, #44671, #44675
- Failed merges:
@bors bors merged commit 2787a28 into rust-lang:master Sep 18, 2017
@Manishearth Manishearth mentioned this pull request Sep 21, 2017
Closed
@oli-obk oli-obk deleted the memchr branch April 11, 2018 13:53
@RalfJung RalfJung mentioned this pull request Jul 26, 2018
Merged
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Jul 27, 2018
@Mark-Simulacrum
Rollup merge of rust-lang#52744 - RalfJung:align_offset, r=Kimundi
0805a6b 
make memrchr use align_offset

I hope I did not screw that up...

Cc @oli-obk who authored the original rust-lang#44537
bors added a commit that referenced this pull request Jul 28, 2018
@bors
Auto merge of #52744 - RalfJung:align_offset, r=Kimundi
d754582 
make memrchr use align_offset

I hope I did not screw that up...

Cc @oli-obk who authored the original #44537

Fixes #50567 (thanks @bjorn3)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexcrichton alexcrichton alexcrichton left review comments

Assignees

@alexcrichton alexcrichton

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.

None yet
5 participants
@oli-obk @rust-highfive @alexcrichton @bors @aidanhs