diff options
| author | bors <bors@rust-lang.org> | 2019-10-07 09:21:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-07 09:21:30 +0000 |
| commit | e3cb9ea15a2082f39d4d4f10a22e779701dd0d64 (patch) | |
| tree | a5aec59e5cfcd213687e6e281995e4727a5a81d4 /src/libsyntax | |
| parent | f92f3c4bc67c003fe66afaf5d772731c074d7459 (diff) | |
| parent | 68a4cfc242ef542e18bafe6046eb6e3c9cbd71dd (diff) | |
| download | rust-e3cb9ea15a2082f39d4d4f10a22e779701dd0d64.tar.gz rust-e3cb9ea15a2082f39d4d4f10a22e779701dd0d64.zip | |
Auto merge of #65178 - Centril:rollup-ep1zztj, r=Centril
Rollup of 4 pull requests Successful merges: - #63948 (Add feature gate for raw_dylib.) - #65137 (remove event that causes panics in measureme tools) - #65164 (Add long error explanation for E0566) - #65173 (Update reference) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate/active.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/feature_gate/builtin_attrs.rs | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/libsyntax/feature_gate/active.rs b/src/libsyntax/feature_gate/active.rs index 20a77fa37cf..19ef430318d 100644 --- a/src/libsyntax/feature_gate/active.rs +++ b/src/libsyntax/feature_gate/active.rs @@ -522,6 +522,9 @@ declare_features! ( /// Allows the definition of `const extern fn` and `const unsafe extern fn`. (active, const_extern_fn, "1.40.0", Some(64926), None), + // Allows the use of raw-dylibs (RFC 2627). + (active, raw_dylib, "1.40.0", Some(58713), None), + // ------------------------------------------------------------------------- // feature-group-end: actual feature gates // ------------------------------------------------------------------------- @@ -536,4 +539,5 @@ pub const INCOMPLETE_FEATURES: &[Symbol] = &[ sym::const_generics, sym::or_patterns, sym::let_chains, + sym::raw_dylib, ]; diff --git a/src/libsyntax/feature_gate/builtin_attrs.rs b/src/libsyntax/feature_gate/builtin_attrs.rs index 80a80ff0a0d..c12d0ce06ff 100644 --- a/src/libsyntax/feature_gate/builtin_attrs.rs +++ b/src/libsyntax/feature_gate/builtin_attrs.rs @@ -276,6 +276,10 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[ "the `link_args` attribute is experimental and not portable across platforms, \ it is recommended to use `#[link(name = \"foo\")] instead", ), + gated!( + link_ordinal, Whitelisted, template!(List: "ordinal"), raw_dylib, + experimental!(link_ordinal) + ), // Plugins: ( |