diff options
| author | bors <bors@rust-lang.org> | 2017-03-09 08:26:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-03-09 08:26:17 +0000 |
| commit | 3087a1f39eaeac9d76c8b159dcc64de515bb2b83 (patch) | |
| tree | bace37e5277d56098ee4d1bb0727d930d68b650c /src/libsyntax | |
| parent | 5c9208faf1f180cd15cf93f74f1e57b24856d11e (diff) | |
| parent | f2886e8bda7d628ae0cc16e4fe579cbc2c6dc1b0 (diff) | |
| download | rust-3087a1f39eaeac9d76c8b159dcc64de515bb2b83.tar.gz rust-3087a1f39eaeac9d76c8b159dcc64de515bb2b83.zip | |
Auto merge of #40368 - arielb1:rollup, r=arielb1
Rollup of 20 pull requests - Successful merges: #40154, #40222, #40226, #40237, #40254, #40258, #40265, #40268, #40279, #40283, #40292, #40293, #40296, #40316, #40321, #40325, #40326, #40327, #40333, #40335 - Failed merges:
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 6eb7d449f26..e7bf16eae9e 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -330,8 +330,7 @@ declare_features! ( // `extern "msp430-interrupt" fn()` (active, abi_msp430_interrupt, "1.16.0", Some(38487)), - // Used to identify crates that contain sanitizer runtimes - // rustc internal + // Coerces non capturing closures to function pointers (active, closure_to_fn_coercion, "1.17.0", Some(39817)), // Used to identify crates that contain sanitizer runtimes |
