diff options
| author | bors <bors@rust-lang.org> | 2019-01-14 13:03:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-14 13:03:24 +0000 |
| commit | d10680818b2a0aabb76e6a07098e031b31707fcc (patch) | |
| tree | 441a29928ac1f0af09beac0f604ddd3125246fb2 /src/libsyntax | |
| parent | 1a3a3dfcdd7faf0b8ab266a79a4a35ab30e5136a (diff) | |
| parent | 47ccf2a7fc2fa17c7316e29a05f0a0b432253743 (diff) | |
| download | rust-d10680818b2a0aabb76e6a07098e031b31707fcc.tar.gz rust-d10680818b2a0aabb76e6a07098e031b31707fcc.zip | |
Auto merge of #57592 - Centril:rollup, r=Centril
Rollup of 6 pull requests Successful merges: - #57232 (Parallelize and optimize parts of HIR map creation) - #57418 (MetadataOnlyCodegenBackend: run the collector only once) - #57465 (Stabilize cfg_target_vendor) - #57477 (clarify resolve typo suggestion) - #57556 (privacy: Fix private-in-public check for existential types) - #57584 (Remove the `connect_timeout_unroutable` test.) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 9b4231d8803..ac20a62f117 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -244,9 +244,6 @@ declare_features! ( // rustc internal (active, omit_gdb_pretty_printer_section, "1.5.0", None, None), - // Allows `cfg(target_vendor = "...")`. - (active, cfg_target_vendor, "1.5.0", Some(29718), None), - // Allows attributes on expressions and non-item statements. (active, stmt_expr_attributes, "1.6.0", Some(15701), None), @@ -686,6 +683,8 @@ declare_features! ( (accepted, if_while_or_patterns, "1.33.0", Some(48215), None), // Allows `use x::y;` to search `x` in the current scope. (accepted, uniform_paths, "1.32.0", Some(53130), None), + // Allows `cfg(target_vendor = "...")`. + (accepted, cfg_target_vendor, "1.33.0", Some(29718), None), ); // If you change this, please modify `src/doc/unstable-book` as well. You must @@ -1181,7 +1180,6 @@ pub const BUILTIN_ATTRIBUTES: &[(&str, AttributeType, AttributeGate)] = &[ // cfg(...)'s that are feature gated const GATED_CFGS: &[(&str, &str, fn(&Features) -> bool)] = &[ // (name in cfg, feature, function to check if the feature is enabled) - ("target_vendor", "cfg_target_vendor", cfg_fn!(cfg_target_vendor)), ("target_thread_local", "cfg_target_thread_local", cfg_fn!(cfg_target_thread_local)), ("target_has_atomic", "cfg_target_has_atomic", cfg_fn!(cfg_target_has_atomic)), ("rustdoc", "doc_cfg", cfg_fn!(doc_cfg)), |