diff options
| author | bors <bors@rust-lang.org> | 2019-11-19 12:11:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-19 12:11:09 +0000 |
| commit | 9d6ff1553b7debbe5c99c102ce0978b6130592f8 (patch) | |
| tree | ecd66e45b8f75d0ad7b407c61e9570a9b5e9646d /src/libstd | |
| parent | 2cad8bb659066b42fc518c95def384956126bd3f (diff) | |
| parent | e1a32faf880360c836a350dbfe9a02d2cd45bcf9 (diff) | |
Auto merge of #66545 - Centril:rollup-xv2rx7v, r=Centril
Rollup of 11 pull requests Successful merges: - #66090 (Misc CI improvements) - #66155 (Add long error explanation for E0594) - #66239 (Suggest calling async closure when needed) - #66430 ([doc] Fix the source code highlighting on source comments) - #66431 (Fix 'type annotations needed' error with opaque types) - #66461 (Add explanation message for E0641) - #66493 (Add JohnTitor to rustc-guide toolstate notification list) - #66511 (std::error::Chain: remove Copy) - #66529 (resolve: Give derive helpers highest priority during resolution) - #66536 (Move the definition of `QueryResult` into `plumbing.rs`.) - #66538 (Remove compiler_builtins_lib feature from libstd) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/error.rs | 2 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs index df24b6635f4..d1cb0862d82 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.rs @@ -791,7 +791,7 @@ impl dyn Error { /// /// [`Error`]: trait.Error.html #[unstable(feature = "error_iter", issue = "58520")] -#[derive(Copy, Clone, Debug)] +#[derive(Clone, Debug)] pub struct Chain<'a> { current: Option<&'a (dyn Error + 'static)>, } diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 72d998de9c4..32023a5b75b 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -244,7 +244,6 @@ #![feature(cfg_target_thread_local)] #![feature(char_error_internals)] #![feature(clamp)] -#![feature(compiler_builtins_lib)] #![feature(concat_idents)] #![feature(const_cstr_unchecked)] #![feature(const_raw_ptr_deref)] |