From: bors <bors@rust-lang.org>
Date: Sat, 13 May 2017 11:35:59 +0000 (+0000)
Subject: Auto merge of #41965 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=ef3ec5ece5bdf8950810225a9a3bc3cd1926e3d5;p=rust.git

Auto merge of #41965 - Mark-Simulacrum:rollup, r=Mark-Simulacrum

Rollup of 15 pull requests

- Successful merges: #41820, #41860, #41876, #41896, #41912, #41916, #41918, #41921, #41923, #41934, #41935, #41940, #41942, #41943, #41951
- Failed merges:
---

ef3ec5ece5bdf8950810225a9a3bc3cd1926e3d5
diff --cc src/librustc_errors/lib.rs
index 0f2e1669a47,e1ec23479ab..7a561e3a970
--- a/src/librustc_errors/lib.rs
+++ b/src/librustc_errors/lib.rs
@@@ -18,13 -19,12 +18,14 @@@
  
  #![feature(custom_attribute)]
  #![allow(unused_attributes)]
 -#![feature(rustc_private)]
 -#![feature(staged_api)]
  #![feature(range_contains)]
  #![feature(libc)]
+ #![feature(conservative_impl_trait)]
  
 +#![cfg_attr(stage0, unstable(feature = "rustc_private", issue = "27812"))]
 +#![cfg_attr(stage0, feature(rustc_private))]
 +#![cfg_attr(stage0, feature(staged_api))]
 +
  extern crate term;
  extern crate libc;
  extern crate serialize as rustc_serialize;