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

Rename TraitOrImpl to Assoc and trait_or_impl to assoc. #61294

Merged
merged 1 commit into from
May 29, 2019

Conversation

eddyb
Copy link
Member

@eddyb eddyb commented May 28, 2019

No description provided.

@rust-highfive
Copy link
Collaborator

r? @zackmdavis

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 28, 2019
@varkor
Copy link
Member

varkor commented May 28, 2019

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 28, 2019

📌 Commit 120ce12 has been approved by varkor

@bors bors 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 28, 2019
@zackmdavis zackmdavis removed their assignment May 29, 2019
Centril added a commit to Centril/rust that referenced this pull request May 29, 2019
Rename `TraitOrImpl` to `Assoc` and `trait_or_impl` to `assoc`.
Centril added a commit to Centril/rust that referenced this pull request May 29, 2019
Rename `TraitOrImpl` to `Assoc` and `trait_or_impl` to `assoc`.
bors added a commit that referenced this pull request May 29, 2019
Rollup of 11 pull requests

Successful merges:

 - #58975 (Implement `iter::Sum` and `iter::Product` for `Option`)
 - #60542 (Add Step::sub_usize)
 - #60555 (Implement nth_back for RChunks(Exact)(Mut))
 - #60766 (Weak::into_raw)
 - #61048 (Feature/nth back chunks)
 - #61191 (librustc_errors: Move annotation collection to own impl)
 - #61235 (Stabilize bufreader_buffer feature)
 - #61249 (Rename Place::local to Place::local_or_deref_local)
 - #61291 (Avoid unneeded bug!() call)
 - #61294 (Rename `TraitOrImpl` to `Assoc` and `trait_or_impl` to `assoc`.)
 - #61297 (Remove LLVM instruction stats and other (obsolete) codegen stats.)

Failed merges:

r? @ghost
@bors bors merged commit 120ce12 into rust-lang:master May 29, 2019
@eddyb eddyb deleted the no-trait-nor-impl branch May 29, 2019 13:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants