]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #39552 - zackmdavis:more_struct_aliases_stabilization_version, r...
authorCorey Farwell <coreyf@rwell.org>
Sun, 5 Feb 2017 14:14:57 +0000 (09:14 -0500)
committerGitHub <noreply@github.com>
Sun, 5 Feb 2017 14:14:57 +0000 (09:14 -0500)
correct version in which more_struct_aliases was/will be stable

The stabilizing commit is 5056a437, which is not in 1.14, but is (at
time of writing) on the 1.16 beta branch. [See discussion](https://github.com/rust-lang/rust/pull/39282#discussion_r99481687).

1  2 
src/libsyntax/feature_gate.rs

index 60a940d4b7f5f5f0cb3da12f2b1fa2cef4af4d62,cc04727b698085042a502c255f1d9e9b02da9ab9..52ef2a05fcf195fa93fb1e72a875aff95ae47de2
@@@ -318,7 -318,7 +318,7 @@@ declare_features! 
      (active, abi_unadjusted, "1.16.0", None),
  
      // Macros 1.1
 -    (active, proc_macro, "1.16.0", Some(35900)),
 +    (active, proc_macro, "1.16.0", Some(38356)),
  
      // Allows attributes on struct literal fields.
      (active, struct_field_attributes, "1.16.0", Some(38814)),
@@@ -381,7 -381,7 +381,7 @@@ declare_features! 
      (accepted, dotdot_in_tuple_patterns, "1.14.0", Some(33627)),
      (accepted, item_like_imports, "1.14.0", Some(35120)),
      // Allows using `Self` and associated types in struct expressions and patterns.
-     (accepted, more_struct_aliases, "1.14.0", Some(37544)),
+     (accepted, more_struct_aliases, "1.16.0", Some(37544)),
  );
  // (changing above list without updating src/doc/reference.md makes @cmr sad)