about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-02-22 23:08:35 +0000
committerbors <bors@rust-lang.org>2017-02-22 23:08:35 +0000
commitbfe45974a18af63191d40a6ac5beb0cf2ab9c9f7 (patch)
tree63744c8d78aac8b988ee952ac52db0a34e3d3727 /src/libsyntax
parentfc6f092c21a7a7249a9f8860f3cd10160aa36c02 (diff)
parent06e311b66a833cc99bddbf3b7afaed609230e463 (diff)
downloadrust-bfe45974a18af63191d40a6ac5beb0cf2ab9c9f7.tar.gz
rust-bfe45974a18af63191d40a6ac5beb0cf2ab9c9f7.zip
Auto merge of #39866 - steveklabnik:unstable-book, r=alexcrichton
Create the Unstable Book

Part of https://github.com/rust-lang/rust/issues/39588

This isn't done yet. To do:

- [x] import the nightly book contents here
- [ ] possibly write some more chapters

This will _not_ be done before it lands; that's part of the whole unstable thing.
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/feature_gate.rs9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index 1bed3e27847..b7be084fa0b 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -91,11 +91,14 @@ macro_rules! declare_features {
     }
 }
 
-// If you change this list without updating src/doc/reference.md, @cmr will be sad
+// If you change this, please modify src/doc/unstable-book as well.
+//
 // Don't ever remove anything from this list; set them to 'Removed'.
+//
 // The version numbers here correspond to the version in which the current status
 // was set. This is most important for knowing when a particular feature became
 // stable (active).
+//
 // NB: The featureck.py script parses this information directly out of the source
 // so take care when modifying it.
 
@@ -385,7 +388,9 @@ declare_features! (
     // Allows field shorthands (`x` meaning `x: x`) in struct literal expressions.
     (accepted, field_init_shorthand, "1.17.0", Some(37340)),
 );
-// (changing above list without updating src/doc/reference.md makes @cmr sad)
+// If you change this, please modify src/doc/unstable-book as well. You must
+// move that documentation into the relevant place in the other docs, and
+// remove the chapter on the flag.
 
 #[derive(PartialEq, Copy, Clone, Debug)]
 pub enum AttributeType {