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

fix u32 steps_between for 16-bit systems #53755

Merged
merged 1 commit into from
Sep 1, 2018

Conversation

llogiq
Copy link
Contributor

@llogiq llogiq commented Aug 28, 2018

This fixes #48006.

@rust-highfive
Copy link
Collaborator

r? @dtolnay

(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 Aug 28, 2018
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-5.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
[00:47:30] ....................................................................................................
[00:47:34] ....................................................................................................
[00:47:36] ..........i.........................................................................................
[00:47:39] ....................................................................................................
[00:47:41] ...........................................................iiiiiiiii................................
[00:47:47] ....................................................................................................
[00:47:50] ....................................................................................................
[00:47:53] .......................................i............................................................
[00:47:56] .........................................................................................i.i..ii....
---
[00:53:58] ---- [run-pass] run-pass/issue-48006.rs stdout ----
[00:53:58] 
[00:53:58] error: compilation failed!
[00:53:58] status: exit code: 1
[00:53:58] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/run-pass/issue-48006.rs" "--target=x86_64-unknown-linux-gnu" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/issue-48006/a" "-Crpath" "-O" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/issue-48006/auxiliary"
[00:53:58] ------------------------------------------
[00:53:58] 
[00:53:58] ------------------------------------------
[00:53:58] stderr:
[00:53:58] stderr:
[00:53:58] ------------------------------------------
[00:53:58] error[E0432]: unresolved import `std::ops::Step`
[00:53:58]   --> /checkout/src/test/run-pass/issue-48006.rs:13:5
[00:53:58]    |
[00:53:58] 13 | use std::ops::Step;
[00:53:58]    |     ^^^^^^^^^^^^^^ no `Step` in `ops`
[00:53:58] error: aborting due to previous error
[00:53:58] 
[00:53:58] For more information about this error, try `rustc --explain E0432`.
[00:53:58] 
---
[00:53:58] 
[00:53:58] thread 'main' panicked at 'Some tests failed', tools/compiletest/src/main.rs:497:22
[00:53:58] 
[00:53:58] 
[00:53:58] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/run-pass" "--build-base" "/checkout/obj/build/x86_65cod2e
129804 ./obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release
129128 ./obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu
129124 ./obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release
126284 ./obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@nagisa
Copy link
Member

nagisa commented Aug 28, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Aug 28, 2018

📌 Commit 99eccbe7f0e23d4564b204ddfd5962c9ae8f35e7 has been approved by nagisa

@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 28, 2018
@nagisa
Copy link
Member

nagisa commented Aug 28, 2018

@bors r-

Seems like tests have failed.

r=me once fixed.

@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 28, 2018
@llogiq
Copy link
Contributor Author

llogiq commented Aug 28, 2018

Oops, it's std::iter::Step, not std::ops::Step. Let's see if this works...

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-5.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
[00:48:57] ....................................................................................................
[00:49:01] ....................................................................................................
[00:49:03] ..........i.........................................................................................
[00:49:06] ....................................................................................................
[00:49:09] ...........................................................iiiiiiiii................................
[00:49:14] ....................................................................................................
[00:49:18] ....................................................................................................
[00:49:21] .......................................i............................................................
[00:49:23] .........................................................................................i.i..ii....

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@llogiq
Copy link
Contributor Author

llogiq commented Aug 30, 2018

@nagisa this should now work, and hopefully we have at least one 16bit system to test this...

@nagisa
Copy link
Member

nagisa commented Aug 30, 2018

Sadly, there are no CI runners that have pointer_width = 16, no.

@bors r+

@bors
Copy link
Contributor

bors commented Aug 30, 2018

📌 Commit 9dab56c has been approved by nagisa

@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 30, 2018
@bors
Copy link
Contributor

bors commented Aug 31, 2018

⌛ Testing commit 9dab56c with merge 571a624...

bors added a commit that referenced this pull request Aug 31, 2018
fix u32 steps_between for 16-bit systems

This fixes #48006.
@bors
Copy link
Contributor

bors commented Sep 1, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: nagisa
Pushing 571a624 to master...

@bors bors merged commit 9dab56c into rust-lang:master Sep 1, 2018
@llogiq llogiq deleted the fix-unsound-16bit-range branch September 1, 2018 06:24
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.

Memory Unsafety on 16bit Platforms for Range.collect()
5 participants