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

Eliminate more excessive null-checks from slice iterators #22669

Merged
merged 1 commit into from
Feb 28, 2015

Conversation

dotdash
Copy link
Contributor

@dotdash dotdash commented Feb 22, 2015

This adds the assume() calls back that got lost when rebasing #21886.

This adds the assume() calls back that got lost when rebasing rust-lang#21886.
@rust-highfive
Copy link
Collaborator

r? @pcwalton

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

@dotdash
Copy link
Contributor Author

dotdash commented Feb 22, 2015

r? @huonw -- you had r-ed #21886 before

@rust-highfive rust-highfive assigned huonw and unassigned pcwalton Feb 22, 2015
@huonw
Copy link
Member

huonw commented Feb 22, 2015

@bors r+ e457

@alexcrichton
Copy link
Member

I think that unfortunately this doesn't work on windows: https://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/3435/steps/compile/logs/stdio

@dotdash
Copy link
Contributor Author

dotdash commented Feb 23, 2015

Oh, #22395 accidently reverted LLVM to an older version that doesn't contain my fix to make assume() work correctly :-(

@dotdash
Copy link
Contributor Author

dotdash commented Feb 23, 2015

@bors r-

r- for now until the llvm fix has landed (again)

@alexcrichton
Copy link
Member

Ach sorry about that :( Feel free to re-include the update in this PR and send it back to bors.

@dotdash
Copy link
Contributor Author

dotdash commented Feb 23, 2015

I'll just wait for the new llvmup PR. It will merge eventually, I suppose ;-)

@dotdash
Copy link
Contributor Author

dotdash commented Feb 24, 2015

@bors r=huonw e457

@bors
Copy link
Contributor

bors commented Feb 24, 2015

⌛ Testing commit e457328 with merge 779490e...

@bors
Copy link
Contributor

bors commented Feb 24, 2015

💔 Test failed - auto-win-32-nopt-t

@dotdash
Copy link
Contributor Author

dotdash commented Feb 24, 2015

Ah, due to the previous revert to the old llvm version, the snapshot uses the old llvm again and so it crashes in stage0 sigh

@Manishearth
Copy link
Member

Now that new llvm landed, should this be working now?

@dotdash
Copy link
Contributor Author

dotdash commented Feb 26, 2015

It would, if guarded by if cfg!(not(stage0)). As is, it would need a new snapshot that has the updated LLVM.

@dotdash
Copy link
Contributor Author

dotdash commented Feb 27, 2015

@bors retry

Snapshot landed

@bors
Copy link
Contributor

bors commented Feb 27, 2015

⌛ Testing commit e457328 with merge ef5b15c...

@bors
Copy link
Contributor

bors commented Feb 27, 2015

💔 Test failed - auto-linux-64-x-android-t

@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Contributor

bors commented Feb 27, 2015

@bors
Copy link
Contributor

bors commented Feb 27, 2015

💔 Test failed - auto-win-32-opt

@alexcrichton
Copy link
Member

@bors: retry clean

@bors
Copy link
Contributor

bors commented Feb 28, 2015

⌛ Testing commit e457328 with merge 1c93934...

bors added a commit that referenced this pull request Feb 28, 2015
This adds the assume() calls back that got lost when rebasing #21886.
@bors bors merged commit e457328 into rust-lang:master Feb 28, 2015
@dotdash dotdash deleted the fast_slice_iter branch March 1, 2015 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants