diff options
| author | bors <bors@rust-lang.org> | 2018-12-29 18:12:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-12-29 18:12:57 +0000 |
| commit | 007115746c6d0234742719dd67efba054abe97ce (patch) | |
| tree | 2747628993f65d132462cee937827bc9054d8580 /src/libsyntax | |
| parent | d969c61e8c8be5b54fd96b7c3bc40cb9b3ace3c2 (diff) | |
| parent | 68f370ce05405b73b7240d9eb25f23a4209687e2 (diff) | |
| download | rust-007115746c6d0234742719dd67efba054abe97ce.tar.gz rust-007115746c6d0234742719dd67efba054abe97ce.zip | |
Auto merge of #57197 - kennytm:rollup, r=kennytm
Rollup of 7 pull requests Successful merges: - #57149 (Fix typo in pin documentation) - #57153 (Small: Fix span in char documentation) - #57159 (Update references to closed issue) - #57163 (Give the crate select chevron room to breathe.) - #57168 (Removed aligned ZST requirement from docs of read_/write_unaligned.) - #57174 (Update link to rustc guide) - #57177 (Fix warning when compiling rustc) 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 70df403d0c2..be49c55a54c 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -111,7 +111,7 @@ declare_features! ( (active, concat_idents, "1.0.0", Some(29599), None), (active, link_args, "1.0.0", Some(29596), None), (active, log_syntax, "1.0.0", Some(29598), None), - (active, non_ascii_idents, "1.0.0", Some(28979), None), + (active, non_ascii_idents, "1.0.0", Some(55467), None), (active, plugin_registrar, "1.0.0", Some(29597), None), (active, thread_local, "1.0.0", Some(29594), None), (active, trace_macros, "1.0.0", Some(29598), None), |