Skip to content

Rename "Associated*" to "Assoc*" - #60955

Merged
bors merged 2 commits into
rust-lang:masterfrom
agnxy:rename-assoc
May 28, 2019
Merged

Rename "Associated*" to "Assoc*"#60955
bors merged 2 commits into
rust-lang:masterfrom
agnxy:rename-assoc

Conversation

@agnxy

@agnxyagnxy commented May 19, 2019

Copy link
Copy Markdown
Contributor

This change is for #60163.

r? @oli-obk

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 19, 2019
oli-obk
oli-obk reviewed May 19, 2019
View reviewed changes

@oli-obkoli-obk left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, just some nits and needs a rebase

Comment threadsrc/libsyntax/ast.rs Outdated
Comment threadsrc/librustc/error_codes.rs Outdated
@oli-obkoli-obk added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 19, 2019
@oli-obk

oli-obk commented May 19, 2019

Copy link
Copy Markdown
Contributor

Thanks, this is ready to merge now, but we need to wait until the beta is cut in the next few days as we can't break tools right now

@oli-obk

oli-obk commented May 19, 2019

Copy link
Copy Markdown
Contributor

If you want to be proactive about the breakage, you can run ./x.py test src/tools/{clippy,rls,miri} and fix all breakage and open PRs against the tools.

@agnxy

agnxy commented May 20, 2019

Copy link
Copy Markdown
ContributorAuthor

Thanks @oli-obk . I'm not aware this is a breaking change😅 I'll take a look at CONTRIBUTING.md first.

@bors

bors commented May 22, 2019

Copy link
Copy Markdown
Collaborator

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

@CentrilCentril added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels May 25, 2019
@Centril

Centril commented May 25, 2019

Copy link
Copy Markdown
Contributor

@bors r=oli-obk,Centril

@bors

bors commented May 25, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 0b7d4fa has been approved by oli-obk,Centril

@borsbors 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 May 25, 2019
Centril added a commit to Centril/rust that referenced this pull request May 25, 2019
@Centril
Rollup merge ofrust-lang#60955- agnxy:rename-assoc, r=oli-obk,Centril
f1fd063
Rename "Associated*" to "Assoc*"
This change is for rust-lang#60163.
r? @oli-obk
@CentrilCentril mentioned this pull request May 25, 2019
Closed
@Centril

Centril commented May 26, 2019

Copy link
Copy Markdown
Contributor

Failed in #61198 (comment). @bors r-

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 26, 2019
@agnxy

agnxy commented May 26, 2019

Copy link
Copy Markdown
ContributorAuthor

@Centril I have fixed the build failure at the tip of master branch.

@oli-obk

oli-obk commented May 26, 2019

Copy link
Copy Markdown
Contributor

@bors r=oli-obk,Centril

@bors

bors commented May 26, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 4dbeb48fca363252380412b28bea4dbfc6653bd0 has been approved by oli-obk,Centril

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 26, 2019
@bors

bors commented May 26, 2019

Copy link
Copy Markdown
Collaborator

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

@borsbors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 26, 2019
@borsbors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label May 26, 2019
agnxy added 2 commits May 26, 2019 17:49
@agnxy
Rename "Associated*" to "Assoc*"
46b9ed4
We are going to uniform the terminology of all associated items.
Methods that may or may not have `self` are called "associated
functions". Because `AssociatedFn` is a bit long, we rename `Associated`
to `Assoc`.
@agnxy
Rename "Associated*" to "Assoc*"
c963596
modify pretty.rs which recently added "Associated*"
@sanxiyn

sanxiyn commented May 28, 2019

Copy link
Copy Markdown
Contributor

@bors r=oli-obk,Centril

@bors

bors commented May 28, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit c963596 has been approved by oli-obk,Centril

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 28, 2019
@bors

bors commented May 28, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c963596 with merge 837b72c...

bors added a commit that referenced this pull request May 28, 2019
@bors
Auto merge of#60955- agnxy:rename-assoc, r=oli-obk,Centril
837b72c
Rename "Associated*" to "Assoc*"
This change is for #60163.
r? @oli-obk
@bors

bors commented May 28, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk,Centril
Pushing 837b72c to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label May 28, 2019
@bors
bors merged commit c963596 into rust-lang:masterMay 28, 2019
@borsbors mentioned this pull request May 28, 2019
Merged
@flip1995flip1995 mentioned this pull request May 28, 2019
Merged
This was referenced May 28, 2019
Merged
Merged
@matthiaskrgrmatthiaskrgr mentioned this pull request May 28, 2019
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obkoli-obkoli-obk left review comments

Assignees

@oli-obkoli-obk

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@agnxy@oli-obk@bors@Centril@sanxiyn@rust-highfive