Skip to content

Remove all i suffixes #21631

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
Merged
merged 1 commit into from
Jan 31, 2015
Merged

Remove all i suffixes #21631

merged 1 commit into from
Jan 31, 2015

Conversation

tbu-
Copy link
Contributor

@tbu- tbu- commented Jan 25, 2015

They are either constrained to isize anyway or correctly fall back to i32.

@rust-highfive
Copy link
Contributor

r? @pcwalton

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

@alexcrichton
Copy link
Member

@bors: r+ 82b0b02

@bors
Copy link
Collaborator

bors commented Jan 27, 2015

☔ Merge conflict

@tbu-
Copy link
Contributor Author

tbu- commented Jan 27, 2015

@alexcrichton Rebased.

@alexcrichton
Copy link
Member

@bors: r+ 4067be8

@bors
Copy link
Collaborator

bors commented Jan 27, 2015

🙀 You have the wrong number! Please try again with 4067b8e.

@alexcrichton
Copy link
Member

@bors: r+ 4067b8e

@bors
Copy link
Collaborator

bors commented Jan 28, 2015

☔ Merge conflict

@tbu-
Copy link
Contributor Author

tbu- commented Jan 28, 2015

@alexcrichton Rebased.

@alexcrichton
Copy link
Member

@bors: r+ 876fafe

@bors
Copy link
Collaborator

bors commented Jan 28, 2015

⌛ Testing commit 876fafe with merge c32614c...

@bors
Copy link
Collaborator

bors commented Jan 28, 2015

💔 Test failed - auto-mac-64-opt

@tbu-
Copy link
Contributor Author

tbu- commented Jan 28, 2015

@alexcrichton Fixed test failure, ran make check again.

@alexcrichton
Copy link
Member

@bors: r+ f0597ea

@frewsxcv
Copy link
Member

Needs a rebase

@tbu-
Copy link
Contributor Author

tbu- commented Jan 28, 2015

@alexcrichton Rebased.

@alexcrichton
Copy link
Member

@bors: r+ 8440329

sorry for all the rebases :(

@bors
Copy link
Collaborator

bors commented Jan 28, 2015

🙀 You have the wrong number! Please try again with f0597ea.

@alexcrichton
Copy link
Member

@bors: r+ 8440329

@bors
Copy link
Collaborator

bors commented Jan 29, 2015

🙀 You have the wrong number! Please try again with f0597ea.

@alexcrichton
Copy link
Member

@bors: r+ 8440329

@bors
Copy link
Collaborator

bors commented Jan 29, 2015

⌛ Testing commit 8440329 with merge f5f6ea6...

@bors
Copy link
Collaborator

bors commented Jan 29, 2015

💔 Test failed - auto-mac-64-opt

@tbu-
Copy link
Contributor Author

tbu- commented Jan 30, 2015

@alexcrichton Sorry, I ran make check locally, does that run all tests?

@alexcrichton
Copy link
Member

It should yeah, perhaps it was just a merge conflict between r+ and when it was tested?

@Gankra
Copy link
Contributor

Gankra commented Jan 30, 2015

Github seems to think it's a merge conflict. I sugges we p=1 this change when it's next ready.

@tbu-
Copy link
Contributor Author

tbu- commented Jan 30, 2015

@alexcrichton Rebased. Ran make check.

@Gankra
Copy link
Contributor

Gankra commented Jan 30, 2015

@bors r+ 7f64 p=1

@tbu-
Copy link
Contributor Author

tbu- commented Jan 30, 2015

@gankro It looks like you need a colon after the @bors.

@Gankra
Copy link
Contributor

Gankra commented Jan 30, 2015

@tbu- No if you checkout http://buildbot.rust-lang.org/homu/queue/rust your PR is there.

You know you did it right if bors doesn't complain.

e.g.

@bors r+ asdas

Should have it scream instantly.

@bors
Copy link
Collaborator

bors commented Jan 30, 2015

🙀 You have the wrong number! Please try again with 7f64fe4.

@bors
Copy link
Collaborator

bors commented Jan 30, 2015

⌛ Testing commit 7f64fe4 with merge 5ada928...

@bors
Copy link
Collaborator

bors commented Jan 30, 2015

💔 Test failed - auto-mac-64-opt

@Gankra
Copy link
Contributor

Gankra commented Jan 30, 2015

Looks like there's some conflicts in old_io

@alexcrichton
Copy link
Member

Merging this into a rollup I'm making (no need to rebase)

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Jan 30, 2015
@alexcrichton
rollup merge of rust-lang#21631: tbu-/isize_police
188d7c0 
Conflicts:
	src/libcoretest/iter.rs
@alexcrichton alexcrichton merged commit 7f64fe4 into rust-lang:master Jan 31, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@tbu- @rust-highfive @alexcrichton @bors @frewsxcv @Gankra @pcwalton