diff options
| author | bors <bors@rust-lang.org> | 2022-02-12 19:01:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-02-12 19:01:00 +0000 |
| commit | 1945ce6579506787e0b18f0a2ea03fdb4dfc81c7 (patch) | |
| tree | 5eba45b701fae75841fb4395e8b4420a37f302d8 /compiler/rustc_feature/src/builtin_attrs.rs | |
| parent | f58f0dfd7261dba0cafc25273d8158b6965c7695 (diff) | |
| parent | 0ac18e7adb8470588e615365370de28a95e0ea70 (diff) | |
| download | rust-1945ce6579506787e0b18f0a2ea03fdb4dfc81c7.tar.gz rust-1945ce6579506787e0b18f0a2ea03fdb4dfc81c7.zip | |
Auto merge of #93922 - Mark-Simulacrum:beta-next, r=Mark-Simulacrum
[beta] backports This backports: * Complete removal of #[main] attribute from compiler #93753 * Resolve lifetimes for const generic defaults #93669 * backport llvm fix for issue 91671. #93426 * Fix invalid special casing of the unreachable! macro #93179 * Fix hashing for windows paths containing a CurDir component #93697 r? `@Mark-Simulacrum`
Diffstat (limited to 'compiler/rustc_feature/src/builtin_attrs.rs')
| -rw-r--r-- | compiler/rustc_feature/src/builtin_attrs.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/compiler/rustc_feature/src/builtin_attrs.rs b/compiler/rustc_feature/src/builtin_attrs.rs index f25b2d8f566..0644948704d 100644 --- a/compiler/rustc_feature/src/builtin_attrs.rs +++ b/compiler/rustc_feature/src/builtin_attrs.rs @@ -339,7 +339,6 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[ ), // Entry point: - ungated!(main, Normal, template!(Word), WarnFollowing), ungated!(start, Normal, template!(Word), WarnFollowing), ungated!(no_start, CrateLevel, template!(Word), WarnFollowing), ungated!(no_main, CrateLevel, template!(Word), WarnFollowing), |