Skip to content

Remove all i suffixes#21631

Merged
alexcrichton merged 1 commit into
rust-lang:masterfrom
tbu-:isize_police
Jan 31, 2015
Merged

Remove all i suffixes#21631
alexcrichton merged 1 commit into
rust-lang:masterfrom
tbu-:isize_police

Conversation

@tbu-

@tbu- tbu- commented Jan 25, 2015

Copy link
Copy Markdown
Contributor

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

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @pcwalton

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

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+ 82b0b02

@bors

bors commented Jan 27, 2015

Copy link
Copy Markdown
Collaborator

☔ Merge conflict

@tbu-

tbu- commented Jan 27, 2015

Copy link
Copy Markdown
Contributor Author

@alexcrichton Rebased.

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+ 4067be8

@bors

bors commented Jan 27, 2015

Copy link
Copy Markdown
Collaborator

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

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+ 4067b8e

@bors

bors commented Jan 28, 2015

Copy link
Copy Markdown
Collaborator

☔ Merge conflict

@tbu-

tbu- commented Jan 28, 2015

Copy link
Copy Markdown
Contributor Author

@alexcrichton Rebased.

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+ 876fafe

@bors

bors commented Jan 28, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 876fafe with merge c32614c...

@bors

bors commented Jan 28, 2015

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-mac-64-opt

@tbu-

tbu- commented Jan 28, 2015

Copy link
Copy Markdown
Contributor Author

@alexcrichton Fixed test failure, ran make check again.

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+ f0597ea

@frewsxcv

Copy link
Copy Markdown
Contributor

Needs a rebase

@tbu-

tbu- commented Jan 28, 2015

Copy link
Copy Markdown
Contributor Author

@alexcrichton Rebased.

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+ 8440329

sorry for all the rebases :(

@bors

bors commented Jan 28, 2015

Copy link
Copy Markdown
Collaborator

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

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+ 8440329

@bors

bors commented Jan 29, 2015

Copy link
Copy Markdown
Collaborator

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

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+ 8440329

@bors

bors commented Jan 29, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 8440329 with merge f5f6ea6...

@bors

bors commented Jan 29, 2015

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-mac-64-opt

@tbu-

tbu- commented Jan 30, 2015

Copy link
Copy Markdown
Contributor Author

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

@alexcrichton

Copy link
Copy Markdown
Member

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

@Gankra

Gankra commented Jan 30, 2015

Copy link
Copy Markdown
Contributor

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

@tbu-

tbu- commented Jan 30, 2015

Copy link
Copy Markdown
Contributor Author

@alexcrichton Rebased. Ran make check.

@Gankra

Gankra commented Jan 30, 2015

Copy link
Copy Markdown
Contributor

@bors r+ 7f64 p=1

@tbu-

tbu- commented Jan 30, 2015

Copy link
Copy Markdown
Contributor Author

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

@Gankra

Gankra commented Jan 30, 2015

Copy link
Copy Markdown
Contributor

@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

bors commented Jan 30, 2015

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Jan 30, 2015

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Jan 30, 2015

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-mac-64-opt

@Gankra

Gankra commented Jan 30, 2015

Copy link
Copy Markdown
Contributor

Looks like there's some conflicts in old_io

@alexcrichton

Copy link
Copy Markdown
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
Conflicts:
	src/libcoretest/iter.rs
@alexcrichton alexcrichton merged commit 7f64fe4 into rust-lang:master Jan 31, 2015
lnicola pushed a commit to lnicola/rust that referenced this pull request Feb 23, 2026
…ing-cycles

internal: Refactor handling of associated type shorthand for type parameters, i.e. `T::AssocType` without specifying the trait
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