Skip to content

Commit d05009b

Browse files
committed
Rollup merge of #49667 - Manishearth:preview-features, r=nikomatsakis
Add more features to rust_2018_preview Doesn't handle lib features like never_type; we need to figure out a scheme for that.
2 parents 84f6440 + 3237955 commit d05009b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/libsyntax/feature_gate.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ declare_features! (
193193
(active, rustc_attrs, "1.0.0", Some(29642), None),
194194

195195
// Allows the use of non lexical lifetimes; RFC 2094
196-
(active, nll, "1.0.0", Some(43234), None),
196+
(active, nll, "1.0.0", Some(43234), Some(Edition::Edition2018)),
197197

198198
// Allows the use of #[allow_internal_unstable]. This is an
199199
// attribute on macro_rules! and can't use the attribute handling
@@ -391,7 +391,7 @@ declare_features! (
391391
(active, dyn_trait, "1.22.0", Some(44662), Some(Edition::Edition2018)),
392392

393393
// `crate` as visibility modifier, synonymous to `pub(crate)`
394-
(active, crate_visibility_modifier, "1.23.0", Some(45388), None),
394+
(active, crate_visibility_modifier, "1.23.0", Some(45388), Some(Edition::Edition2018)),
395395

396396
// extern types
397397
(active, extern_types, "1.23.0", Some(43467), None),
@@ -400,10 +400,10 @@ declare_features! (
400400
(active, arbitrary_self_types, "1.23.0", Some(44874), None),
401401

402402
// `crate` in paths
403-
(active, crate_in_paths, "1.23.0", Some(45477), None),
403+
(active, crate_in_paths, "1.23.0", Some(45477), Some(Edition::Edition2018)),
404404

405405
// In-band lifetime bindings (e.g. `fn foo(x: &'a u8) -> &'a u8`)
406-
(active, in_band_lifetimes, "1.23.0", Some(44524), None),
406+
(active, in_band_lifetimes, "1.23.0", Some(44524), Some(Edition::Edition2018)),
407407

408408
// generic associated types (RFC 1598)
409409
(active, generic_associated_types, "1.23.0", Some(44265), None),
@@ -412,10 +412,10 @@ declare_features! (
412412
(active, extern_absolute_paths, "1.24.0", Some(44660), None),
413413

414414
// `foo.rs` as an alternative to `foo/mod.rs`
415-
(active, non_modrs_mods, "1.24.0", Some(44660), None),
415+
(active, non_modrs_mods, "1.24.0", Some(44660), Some(Edition::Edition2018)),
416416

417417
// Termination trait in tests (RFC 1937)
418-
(active, termination_trait_test, "1.24.0", Some(48854), None),
418+
(active, termination_trait_test, "1.24.0", Some(48854), Some(Edition::Edition2018)),
419419

420420
// Allows use of the :lifetime macro fragment specifier
421421
(active, macro_lifetime_matcher, "1.24.0", Some(46895), None),

0 commit comments

Comments
 (0)