about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-01-11 11:36:39 +0000
committerbors <bors@rust-lang.org>2020-01-11 11:36:39 +0000
commitbfd04876b93ad5c013d90bc46937e28b6ee1a3f4 (patch)
treefc35ad7fae01337e6873d43c00087dd53c3992db /src/libsyntax
parent543b7d97d019bff882cc70cf2f8bdc317e7b840f (diff)
parent4eee796679bd13e0935c16f41a5e6e2ab0d5c018 (diff)
downloadrust-bfd04876b93ad5c013d90bc46937e28b6ee1a3f4.tar.gz
rust-bfd04876b93ad5c013d90bc46937e28b6ee1a3f4.zip
Auto merge of #68126 - Centril:rollup-cz5u7xx, r=Centril
Rollup of 8 pull requests

Successful merges:

 - #67756 (Collector tweaks)
 - #67889 (Compile some CGUs in parallel at the start of codegen)
 - #67930 (Rename Result::as_deref_ok to as_deref)
 - #68018 (feature_gate: Remove `GateStrength`)
 - #68070 (clean up E0185 explanation)
 - #68072 (Fix ICE #68058)
 - #68114 (Don't require `allow_internal_unstable` unless `staged_api` is enabled.)
 - #68120 (Ban `...X` pats, harden tests, and improve diagnostics)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index a96fee0cf8f..0184a3214b5 100644
--- a/src/libsyntax/lib.rs
+++ b/src/libsyntax/lib.rs
@@ -7,7 +7,7 @@
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/", test(attr(deny(warnings))))]
 #![feature(bool_to_option)]
 #![feature(box_syntax)]
-#![feature(const_fn)]
+#![feature(const_fn)] // For the `transmute` in `P::new`
 #![feature(const_transmute)]
 #![feature(crate_visibility_modifier)]
 #![feature(label_break_value)]