From: Mazdak Farrokhzad <twingoow@gmail.com>
Date: Wed, 29 May 2019 06:16:04 +0000 (+0200)
Subject: Rollup merge of #61294 - eddyb:no-trait-nor-impl, r=varkor
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=3013c0b698d7e294333be280e7051f96f7da2f41;p=rust.git

Rollup merge of #61294 - eddyb:no-trait-nor-impl, r=varkor

Rename `TraitOrImpl` to `Assoc` and `trait_or_impl` to `assoc`.
---

3013c0b698d7e294333be280e7051f96f7da2f41