Skip to content

Rename AsPredicate to ToPredicate in order to match naming conventions - #26415

Merged
bors merged 1 commit into
rust-lang:masterfrom
jroesch:rename-as-predicate
Jun 26, 2015
Merged

Rename AsPredicate to ToPredicate in order to match naming conventions#26415
bors merged 1 commit into
rust-lang:masterfrom
jroesch:rename-as-predicate

Conversation

@jroesch

Copy link
Copy Markdown
Contributor

@nikomatsakis and I ran into this earlier and I figured we should rename the trait and method to match the typical naming convention.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @pnkfelix

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

@nikomatsakis

Copy link
Copy Markdown
Contributor

r+ (but needs rebase)

@jroesch
jroeschforce-pushed the rename-as-predicate branch from a1612f8 to 4f441f9CompareJune 19, 2015 18:00
@nikomatsakis

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jun 19, 2015

Copy link
Copy Markdown
Collaborator

📌 Commit 4f441f9 has been approved by nikomatsakis

@bors

bors commented Jun 19, 2015

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #26351) made this pull request unmergeable. Please resolve the merge conflicts.

@jroesch
jroeschforce-pushed the rename-as-predicate branch from 4f441f9 to af9e3b7CompareJune 20, 2015 04:50
@arielb1

Copy link
Copy Markdown
Contributor

@bors r=nmatsakis

@bors

bors commented Jun 20, 2015

Copy link
Copy Markdown
Collaborator

📌 Commit af9e3b7 has been approved by nmatsakis

@bors

bors commented Jun 20, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit af9e3b7 with merge ac16fe3...

@bors

bors commented Jun 20, 2015

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-linux-64-nopt-t

@bors

bors commented Jun 23, 2015

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #26435) made this pull request unmergeable. Please resolve the merge conflicts.

@jroesch
jroeschforce-pushed the rename-as-predicate branch from af9e3b7 to 0914c52CompareJune 23, 2015 06:24
@alexcrichton

Copy link
Copy Markdown
Member

@bors:r=nikomatsakis 0914c52

@bluss

Copy link
Copy Markdown
Contributor

I'm sorry but I don't see any fix to address the error bors found for you:

../src/librustc_typeck/check/method/suggest.rs:18:44: 18:55 error: unresolved import `middle::ty::AsPredicate`. There is no `AsPredicate` in `rustc::middle::ty`
../src/librustc_typeck/check/method/suggest.rs:18 use middle::ty::{self, Ty, ToPolyTraitRef, AsPredicate};
^~~~~~~~~~~
error: aborting due to previous error
make: *** [x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib/stamp.rustc_typeck] Error 101

@bors

bors commented Jun 23, 2015

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #26354) made this pull request unmergeable. Please resolve the merge conflicts.

@jroesch

Copy link
Copy Markdown
ContributorAuthor

@bluss I built the wrong branch last night before pushing, should be fixed.

@jroesch
jroeschforce-pushed the rename-as-predicate branch from 0914c52 to eab2895CompareJune 23, 2015 15:56
@alexcrichton

Copy link
Copy Markdown
Member

@bors: r=nikomatsakis

On Tue, Jun 23, 2015 at 8:49 AM Jared Roesch notifications@github.com
wrote:

@blusshttps://github.com/bluss I built the wrong branch last night
before pushing, should be fixed.


Reply to this email directly or view it on GitHub
#26415 (comment).

@bors

bors commented Jun 23, 2015

Copy link
Copy Markdown
Collaborator

📌 Commit eab2895 has been approved by nikomatsakis

@jroesch
jroeschforce-pushed the rename-as-predicate branch 3 times, most recently from 88631b3 to 8433801CompareJune 23, 2015 18:51
@jroesch
jroeschforce-pushed the rename-as-predicate branch from 8433801 to 44bccd8CompareJune 26, 2015 00:29
@alexcrichton

Copy link
Copy Markdown
Member

@bors: r=nikomatsakis 44bccd8

bors added a commit that referenced this pull request Jun 26, 2015
@nikomatsakis and I ran into this earlier and I figured we should rename the trait and method to match the typical naming convention.
@bors

bors commented Jun 26, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 44bccd8 with merge b70d1c6...

@bors

bors commented Jun 26, 2015

Copy link
Copy Markdown
Collaborator

Sign up for freeto 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.

8 participants

@jroesch@rust-highfive@nikomatsakis@bors@arielb1@alexcrichton@bluss@pnkfelix