diff options
| author | bors <bors@rust-lang.org> | 2018-10-02 23:29:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-10-02 23:29:58 +0000 |
| commit | 4cf11765dc98536c6eedf33f2df7f72f6e161263 (patch) | |
| tree | 3b16725548b5703f39b05a0deb2bde6b36223246 /src/libsyntax | |
| parent | 2bd5993ca25e09b894e4fd6539a2fba64599eee2 (diff) | |
| parent | 00e4b27796dc9e533777c2cbf323df94c3427592 (diff) | |
| download | rust-4cf11765dc98536c6eedf33f2df7f72f6e161263.tar.gz rust-4cf11765dc98536c6eedf33f2df7f72f6e161263.zip | |
Auto merge of #54767 - pietroalbini:rollup, r=pietroalbini
Rollup of 10 pull requests Successful merges: - #54269 (#53840: Consolidate pattern check errors) - #54458 (Allow both explicit and elided lifetimes in the same impl header) - #54603 (Add `crate::` to trait suggestions in Rust 2018.) - #54648 (Update Cargo's submodule) - #54680 (make run-pass tests with empty main just compile-pass tests) - #54687 (Use impl_header_lifetime_elision in libcore) - #54699 (Re-export `getopts` so custom drivers can reference it.) - #54702 (do not promote comparing function pointers) - #54728 (Renumber `proc_macro` tracking issues) - #54745 (make `CStr::from_bytes_with_nul_unchecked()` a const fn) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index bbadfa01221..adbe2f9d439 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -441,10 +441,10 @@ declare_features! ( // Allows macro invocations on modules expressions and statements and // procedural macros to expand to non-items. - (active, proc_macro_mod, "1.27.0", Some(38356), None), - (active, proc_macro_expr, "1.27.0", Some(38356), None), - (active, proc_macro_non_items, "1.27.0", Some(38356), None), - (active, proc_macro_gen, "1.27.0", Some(38356), None), + (active, proc_macro_mod, "1.27.0", Some(54727), None), + (active, proc_macro_expr, "1.27.0", Some(54727), None), + (active, proc_macro_non_items, "1.27.0", Some(54727), None), + (active, proc_macro_gen, "1.27.0", Some(54727), None), // #[doc(alias = "...")] (active, doc_alias, "1.27.0", Some(50146), None), @@ -502,7 +502,7 @@ declare_features! ( (active, custom_test_frameworks, "1.30.0", Some(50297), None), // Non-builtin attributes in inner attribute position - (active, custom_inner_attributes, "1.30.0", Some(38356), None), + (active, custom_inner_attributes, "1.30.0", Some(54726), None), // Self struct constructor (RFC 2302) (active, self_struct_ctor, "1.30.0", Some(51994), None), |