diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-12-11 18:12:42 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-12-11 18:12:42 +0000 |
| commit | 1e4378b5406756413d0be9e89a13904bfad5ca79 (patch) | |
| tree | 826cf37e65c91ef001216db87b73d3043665aad4 /crates/hir_def/src | |
| parent | 3674e494ca5213633b85b3a65823f31742e0638b (diff) | |
| parent | 00c34b048e5e1025f968dc10735d32b77a31e2f5 (diff) | |
Merge #6832
6832: Add upstream commit to builtin_attr.rs r=jonas-schievink a=jonas-schievink
bors r+
Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to 'crates/hir_def/src')
| -rw-r--r-- | crates/hir_def/src/builtin_attr.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crates/hir_def/src/builtin_attr.rs b/crates/hir_def/src/builtin_attr.rs index a02bf01cd..2e989c504 100644 --- a/crates/hir_def/src/builtin_attr.rs +++ b/crates/hir_def/src/builtin_attr.rs | |||
| @@ -2,6 +2,8 @@ | |||
| 2 | //! | 2 | //! |
| 3 | //! The actual definitions were copied from rustc's `compiler/rustc_feature/src/builtin_attrs.rs`. | 3 | //! The actual definitions were copied from rustc's `compiler/rustc_feature/src/builtin_attrs.rs`. |
| 4 | //! | 4 | //! |
| 5 | //! It was last synchronized with upstream commit 2225ee1b62ff089917434aefd9b2bf509cfa087f. | ||
| 6 | //! | ||
| 5 | //! The macros were adjusted to only expand to the attribute name, since that is all we need to do | 7 | //! The macros were adjusted to only expand to the attribute name, since that is all we need to do |
| 6 | //! name resolution, and `BUILTIN_ATTRIBUTES` is almost entirely unchanged from the original, to | 8 | //! name resolution, and `BUILTIN_ATTRIBUTES` is almost entirely unchanged from the original, to |
| 7 | //! ease updating. | 9 | //! ease updating. |