diff options
| author | bors <bors@rust-lang.org> | 2018-05-11 04:45:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-05-11 04:45:25 +0000 |
| commit | 6923fb512aaf0af8fcfc7e5e60c05e6cf6c92cbe (patch) | |
| tree | f2932fe8531a223948a9c221f3596c15c49c5a4e /src | |
| parent | 4e5a155a93d21d17fc62fff3d61dc33b90880820 (diff) | |
| parent | 98eab06648fc597a51c17bf1163d1e0855acd07d (diff) | |
| download | rust-6923fb512aaf0af8fcfc7e5e60c05e6cf6c92cbe.tar.gz rust-6923fb512aaf0af8fcfc7e5e60c05e6cf6c92cbe.zip | |
Auto merge of #50609 - alexcrichton:no-nll-preview, r=nikomatsakis
Remove `nll` from `rust_2018_preview` NLL isn't quite ready yet so gonna hold off on inserting it into the preview.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 5155408ba63..a137faf689f 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -190,7 +190,7 @@ declare_features! ( (active, rustc_attrs, "1.0.0", Some(29642), None), // Allows the use of non lexical lifetimes; RFC 2094 - (active, nll, "1.0.0", Some(43234), Some(Edition::Edition2018)), + (active, nll, "1.0.0", Some(43234), None), // Allows the use of #[allow_internal_unstable]. This is an // attribute on macro_rules! and can't use the attribute handling |