diff options
| author | bors <bors@rust-lang.org> | 2017-04-08 06:56:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-04-08 06:56:17 +0000 |
| commit | 3178d4318c669eb0a7bf985e2d603a8e9e1917e7 (patch) | |
| tree | 1a53c946e9407e71010e7cf0408eb3d12924fbb9 /src/libsyntax | |
| parent | 547c12b8a61d7d0c047649c236f84b59ca2d2cc9 (diff) | |
| parent | c04b39f1f8b645ff938e8ee610f76feeea9132ff (diff) | |
| download | rust-3178d4318c669eb0a7bf985e2d603a8e9e1917e7.tar.gz rust-3178d4318c669eb0a7bf985e2d603a8e9e1917e7.zip | |
Auto merge of #41156 - TimNN:rollup, r=TimNN
Rollup of 4 pull requests - Successful merges: #41135, #41143, #41146, #41152 - Failed merges:
Diffstat (limited to 'src/libsyntax')
| -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 550f1160bed..c68e2ae3468 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -408,7 +408,7 @@ declare_features! ( // Allows the definition recursive static items. (accepted, static_recursion, "1.17.0", Some(29719)), // pub(restricted) visibilities (RFC 1422) - (accepted, pub_restricted, "1.17.0", Some(32409)), + (accepted, pub_restricted, "1.18.0", Some(32409)), // The #![windows_subsystem] attribute (accepted, windows_subsystem, "1.18.0", Some(37499)), ); |