diff options
| author | bors <bors@rust-lang.org> | 2018-07-19 00:56:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-07-19 00:56:21 +0000 |
| commit | 629d891499bca79aeb8ea079f756c566fdabbd3e (patch) | |
| tree | 57437d0b26123c42852dd692743584fcb35a631d /src/libsyntax | |
| parent | 166795dda66ce8132e2686923704d6bdcb5c2bc3 (diff) | |
| parent | ae9c550415f639791e83b4b058c69f2842a4ff5c (diff) | |
| download | rust-629d891499bca79aeb8ea079f756c566fdabbd3e.tar.gz rust-629d891499bca79aeb8ea079f756c566fdabbd3e.zip | |
Auto merge of #52486 - kennytm:rollup, r=kennytm
Rollup of 13 pull requests Successful merges: - #51628 (use checked write in `LineWriter` example) - #52116 (Handle array manually in str case conversion methods) - #52218 (Amend option.take examples) - #52418 (Do not use desugared ident when suggesting adding a type) - #52439 (Revert some changes from #51917 to fix custom libdir) - #52455 (Fix doc comment: use `?` instead of `.unwrap()`) - #52458 (rustc: Fix a suggestion for the `proc_macro` feature) - #52464 (Allow clippy to be installed with make install) - #52472 (rustc: Enable `use_extern_macros` in 2018 edition) - #52477 (Clarify short-circuiting behvaior of Iterator::zip.) - #52480 (Cleanup #24958) - #52487 (Don't build twice the sanitizers on Linux) - #52510 (rustdoc: remove FIXME about macro redirects) Failed merges: r? @ghost
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 2ef90e3ec47..84b5f9659b5 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -284,7 +284,7 @@ declare_features! ( // Allows #[link(..., cfg(..))] (active, link_cfg, "1.14.0", Some(37406), None), - (active, use_extern_macros, "1.15.0", Some(35896), None), + (active, use_extern_macros, "1.15.0", Some(35896), Some(Edition::Edition2018)), // `extern "ptx-*" fn()` (active, abi_ptx, "1.15.0", Some(38788), None), |