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

Revert #51601 #56049

Merged
merged 3 commits into from
Nov 20, 2018
Merged

Revert #51601 #56049

merged 3 commits into from
Nov 20, 2018

Conversation

newpavlov
Copy link
Contributor

Closes: #55985

Specialization of StepBy<Range(Inclusive)> results in an incorrectly behaving code when step_by is combined with skip or nth.

If this will get merged we probably should reopen issues previously closed by #51601 (if there was any).

@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 Nov 18, 2018
@newpavlov
Copy link
Contributor Author

r? @sfackler

@sfackler sfackler added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 18, 2018
src/libcore/tests/iter.rs Outdated Show resolved Hide resolved
@sfackler
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Nov 18, 2018

📌 Commit 6ad61b9 has been approved by sfackler

@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 Nov 18, 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.
travis_time:end:01bd88e0:start=1542572185734652880,finish=1542572188255765792,duration=2521112912
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#Pull-Requests-and-Security-Restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-5.0
---
[00:48:45] .................................................................................................... 100/5022
[00:48:48] .................................................................................................... 200/5022
[00:48:51] .............................ii............................................ii...................ii.. 300/5022
[00:48:53] ..............................................................................................iii... 400/5022
[00:48:56] .....iiiiiiii.iii............................iii...........................................i........ 500/5022
[00:49:03] .................................................................................................... 700/5022
[00:49:09] .................................................................................i...........i...... 800/5022
[00:49:12] .................................................................................................... 900/5022
[00:49:15] iiiii...................iiiiii...................................................................... 1000/5022
---
[00:49:50] .................................................................................................... 2200/5022
[00:49:54] .................................................................................................... 2300/5022
[00:49:57] .................................................................................................... 2400/5022
[00:50:01] .................................................................................................... 2500/5022
[00:50:04] .................................................................................iiiiiiiii.......... 2600/5022
[00:50:11] ...............................................ii................................................... 2800/5022
[00:50:14] .................................................................................................... 2900/5022
[00:50:17] .................................................................................................... 3000/5022
[00:50:20] ..........................................i......................................................... 3100/5022
---
travis_time:start:test_codegen
Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:03:32] 
[01:03:32] running 116 tests
[01:03:35] i..ii...iii..iiii.....i...i.........i..iii...........i.....i.....ii...i..i.ii..............i...ii..i 100/116
[01:03:35] i.i....iiii.....
[01:03:35] 
[01:03:35]  finished in 3.344
[01:03:35] travis_fold:end:test_codegen

---
travis_time:start:test_debuginfo
Check compiletest suite=debuginfo mode=debuginfo-both (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:03:49] 
[01:03:49] running 118 tests
[01:04:13] .iiiii...i.....i..i...i..i.i..i.i..i.....i..i....i..........iiii.........i.i....i...i.......ii.i.i.i 100/118
[01:04:17] ......iii.i.....ii
[01:04:17] 
[01:04:17]  finished in 28.118
[01:04:17] travis_fold:end:test_debuginfo

---
[01:17:09] 
[01:17:09] running 911 tests
[01:17:09] .................................................................................................... 100/911
[01:17:09] .................................................................................................... 200/911
[01:17:09] .......................................................................F............................ 300/911
[01:17:09] .................................................................................................... 500/911
[01:17:09] .................................................................................................... 600/911
[01:17:09] .................................................................................................... 700/911
[01:17:09] .................................................................................................... 800/911
[01:17:09] .................................................................................................... 800/911
[01:17:09] .................................................................................................... 900/911
[01:17:10] ...........
[01:17:10] failures:
[01:17:10] 
[01:17:10] ---- iter::test_step_by_skip stdout ----
[01:17:10] thread 'iter::test_step_by_skip' panicked at 'assertion failed: `(left == right)`
[01:17:10]   left: `None`,
[01:17:10]  right: `Some(230)`', libcore/../libcore/tests/iter.rs:1625:5
[01:17:10] 
[01:17:10] failures:
[01:17:10]     iter::test_step_by_skip
[01:17:10] 
[01:17:10] 
[01:17:10] test result: FAILED. 908 passed; 1 failed; 2 ignored; 0 measured; 0 filtered out
[01:17:10] 
[01:17:10] error: test failed, to rerun pass '--test coretests'
[01:17:10] 
[01:17:10] 
[01:17:10] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "-p" "core" "--" "--quiet"
[01:17:10] 
[01:17:10] 
[01:17:10] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:17:10] Build completed unsuccessfully in 0:32:02
[01:17:10] Build completed unsuccessfully in 0:32:02
[01:17:10] Makefile:58: recipe for target 'check' failed
[01:17:10] make: *** [check] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:36b9e11e
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Sun Nov 18 21:33:47 UTC 2018

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)

@sfackler
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Nov 18, 2018

📌 Commit 6357021 has been approved by sfackler

@nikomatsakis nikomatsakis added the T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. label Nov 19, 2018
@nikomatsakis
Copy link
Contributor

cc @rust-lang/libs -- might be good to beta-accept this (or not, as you choose)

@alexcrichton alexcrichton added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Nov 19, 2018
@alexcrichton
Copy link
Member

Yeah this looks fine to backport, tagged as such

@alexcrichton
Copy link
Member

@bors: p=1

beta nominated

bors added a commit that referenced this pull request Nov 20, 2018
Revert #51601

Closes: #55985

Specialization of `StepBy<Range(Inclusive)>` results in an incorrectly behaving code when `step_by` is combined with `skip` or `nth`.

If this will get merged we probably should reopen issues previously closed by #51601 (if there was any).
@bors
Copy link
Contributor

bors commented Nov 20, 2018

⌛ Testing commit 6357021 with merge 31fa301...

@bors
Copy link
Contributor

bors commented Nov 20, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: sfackler
Pushing 31fa301 to master...

@bors bors merged commit 6357021 into rust-lang:master Nov 20, 2018
@nikomatsakis nikomatsakis mentioned this pull request Nov 20, 2018
20 tasks
@alexcrichton alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 20, 2018
bors added a commit that referenced this pull request Nov 20, 2018
beta backport rollup

Backports of some beta-approved PRs

- [x] #55385: NLL: cast causes failure to promote to static
- [x] #56043: remove "approx env bounds" if we already know from trait
- [x] #56003: do not propagate inferred bounds on trait objects if they involve `Self`
- [x] #55852: Rewrite `...` as `..=` as a `MachineApplicable` 2018 idiom lint
- [x] #55804: rustdoc: don't inline `pub use some_crate` unless directly asked to
- [x] #56059: Increase `Duration` approximate equal threshold to 1us
- [x]  Keep resolved defs in path prefixes and emit them in save-analysis #54145
- [x]  Adjust Ids of path segments in visibility modifiers #55487
- [x]  save-analysis: bug fix and optimisation. #55521
- [x]   save-analysis: be even more aggressive about ignorning macro-generated defs #55936
- [x]  save-analysis: fallback to using path id #56060
- [x]  save-analysis: Don't panic for macro-generated use globs #55879
- [x]  Add temporary renames to manifests for rustfmt/clippy #56081
- [x] Revert #51601 #56049
- [x]  Fix stability hole with `static _` #55983
- [x] #56077
- [x] Fix Rustdoc ICE when checking blanket impls #55258
- [x]  Updated RELEASES.md for 1.31.0 #55678
- [x] ~~#56061~~ #56111
- [x]  Stabilize `extern_crate_item_prelude` #56032

Still running tests locally, and I plan to backport @nrc's other PRs too

(cc @petrochenkov -- thanks for the advice)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

step_by + skip produce incorrect results
7 participants