]> git.lizzy.rs Git - rust.git/commit
Auto merge of #36678 - TimNN:fix-dist, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 27 Sep 2016 00:44:25 +0000 (17:44 -0700)
committerGitHub <noreply@github.com>
Tue, 27 Sep 2016 00:44:25 +0000 (17:44 -0700)
commitd0623cf7bda44849ab5df78a06b22f9108cf821a
tree9cdc98941940328cb7208f074f8529b81c88d3e4
parent388c3f25f95c55add63d436a8e8bb207d003c63b
parentf0e1738e5188b53d6af809481bea58f578bfdbe2
Auto merge of #36678 - TimNN:fix-dist, r=alexcrichton

emit feature help in cheat mode (fix nightlies)

This should fix the `distcheck` failure in the latest nightly.

cc #36539

It's probably not ideal to check the environment that often and the code ist duplicated from `librustc/session/config.rs` but this was the easiest fix I could think of.

A cleaner solution would probably be to move the `unstable_features` from `Options` to `ParseSess` and change the `diag` parameter of `emit_feature_err` to take `ParseSess` instead of a `Handler`.
src/librustc_resolve/macros.rs
src/librustc_typeck/check/mod.rs