added hidden nonexaustive variant

fixes rust-lang-deprecated#182

Author: tinaun

.travis.yml

@@ -35,6 +35,7 @@ env:
   global:
   - secure: ncxJbvJM1vCZfcEftjsFKJMxxhKLgWKaR8Go9AMo0VB5fB2XVW/6NYO5bQEEYpOf1Nc/+2FbI2+Dkz0S/mJpUcNSfBgablCHgwU2sHse7KsoaqfHj2mf1E3exjzSHoP96hPGicC5zAjSXFjCgJPOUSGqqRaJ7z5AsJLhJT6LuK7QpvwPBZzklUN8T+n1sVmws8TNmRIbaniq/q6wYHANHcy6Dl59dx4sKwniUGiZdUhCiddVpoxbECSxc0A8mN2pk7/aW+WGxK3goBs5ZF7+JXF318F62pDcXQmR5CX6WdpenIcJ25g1Vg1WhQ4Ifpe17CN0bfxV8ShuzrQUThCDMffZCo9XySBtODdEowwK1UIpjnFLfIxjOs45Cd8o3tM2j0CfvtnjOz6BCdUU0qiwNPPNx0wFkx3ZiOfSh+FhBhvyPM12HN2tdN0esgVBItFmEci+sSIIXqjVL6DNiu5zTjbu0bs6COwlUWdmL6vmsZtq5tl7Cno9+C3szxRVAkShGydd04l9NYjqNEzTa1EPG50OsnVRKGdRiFzSxhc3BWExNKvcQ4v867t6/PpPkW6s4oXmYI3+De+8O7ExWc6a4alcrDXKlMs5fCb5Pcd4Ju9kowcjkoJo5yf2wW3Ox5R8SJpaEEpvyhx5O/qtIxjhHNzeo8Wsr/6gdNDv20r91TI=
   - TRAVIS_CARGO_NIGHTLY_FEATURE=""
+  - RUSTFLAGS="-D warnings"
   matrix:
   - FEATURES=--features=backtrace
   - FEATURES=--no-default-features

CHANGELOG.md

@@ -1,26 +1,32 @@
-# Unreleased
-
-- [Add a new method for `Error`: `chain_err`.](https://github.com/brson/error-chain/pull/141)
-- [Allow `chain_err` to be used on `Option<T>`](https://github.com/brson/error-chain/pull/156)
-- [Add support for creating an error chain on boxed trait errors (`Box<Error>`)](https://github.com/brson/error-chain/pull/156)
+# 0.11.0-rc.2
+
+- [Make `ErrorChainIter`'s field private](https://github.com/rust-lang-nursery/error-chain/issues/178)
+- [Rename `ErrorChainIter` to `Iter`](https://github.com/rust-lang-nursery/error-chain/issues/168)
+- [Implement `Debug` for `ErrorChainIter`](https://github.com/rust-lang-nursery/error-chain/issues/169)
+- [Rename `ChainedError::display` to `display_chain`](https://github.com/rust-lang-nursery/error-chain/issues/180)
+- [Add a new method for `Error`: `chain_err`.](https://github.com/rust-lang-nursery/error-chain/pull/141)
+- [Allow `chain_err` to be used on `Option<T>`](https://github.com/rust-lang-nursery/error-chain/pull/156)
+- [Add support for creating an error chain on boxed trait errors (`Box<Error>`)](https://github.com/rust-lang-nursery/error-chain/pull/156)
+- [Remove lint for unused doc comment.](https://github.com/rust-lang-nursery/error-chain/pull/199)
+- [Generated `ErrorKind` enums are now nonexaustive](https://github.com/rust-lang-nursery/error-chain/pull/193)
 
 # 0.10.0
 
-- [Add a new constructor for `Error`: `with_chain`.](https://github.com/brson/error-chain/pull/126)
-- [Add the `ensure!` macro.](https://github.com/brson/error-chain/pull/135)
+- [Add a new constructor for `Error`: `with_chain`.](https://github.com/rust-lang-nursery/error-chain/pull/126)
+- [Add the `ensure!` macro.](https://github.com/rust-lang-nursery/error-chain/pull/135)
 
 # 0.9.0
 
-- Revert [Add a `Sync` bound to errors](https://github.com/brson/error-chain/pull/110)
+- Revert [Add a `Sync` bound to errors](https://github.com/rust-lang-nursery/error-chain/pull/110)
 
 # 0.8.1
 
-- Add crates.io categorie.
+- Add crates.io category.
 
 # 0.8.0
 
-- [Add a `Sync` bound to errors](https://github.com/brson/error-chain/pull/110)
-- [Add `ChainedError::display` to format error chains](https://github.com/brson/error-chain/pull/113)
+- [Add a `Sync` bound to errors](https://github.com/rust-lang-nursery/error-chain/pull/110)
+- [Add `ChainedError::display` to format error chains](https://github.com/rust-lang-nursery/error-chain/pull/113)
 
 # 0.7.2
 
@@ -30,11 +36,11 @@
 
 # 0.7.1
 
-- [Add the `bail!` macro](https://github.com/brson/error-chain/pull/76)
+- [Add the `bail!` macro](https://github.com/rust-lang-nursery/error-chain/pull/76)
 
 # 0.7.0
 
-- [Rollback several design changes to fix regressions](https://github.com/brson/error-chain/pull/75)
+- [Rollback several design changes to fix regressions](https://github.com/rust-lang-nursery/error-chain/pull/75)
 - New `Variant(Error) #[attrs]` for `links` and `foreign_links`.
 - Hide implementation details from the doc.
 - Always generate `Error::backtrace`.
@@ -64,41 +70,42 @@
 
 # 0.5.0
 
-- [Only generate backtraces with RUST_BACKTRACE set](https://github.com/brson/error-chain/pull/27)
-- [Fixup matching, disallow repeating "types" section](https://github.com/brson/error-chain/pull/26)
-- [Fix tests on stable/beta](https://github.com/brson/error-chain/pull/28)
-- [Only deploy docs when tagged](https://github.com/brson/error-chain/pull/30)
+- [Only generate backtraces with RUST_BACKTRACE set](https://github.com/rust-lang-nursery/error-chain/pull/27)
+- [Fixup matching, disallow repeating "types" section](https://github.com/rust-lang-nursery/error-chain/pull/26)
+- [Fix tests on stable/beta](https://github.com/rust-lang-nursery/error-chain/pull/28)
+- [Only deploy docs when tagged](https://github.com/rust-lang-nursery/error-chain/pull/30)
 
 Contributors: benaryorg, Brian Anderson, Georg Brandl
 
 # 0.4.2
 
-- [Fix the resolution of the ErrorKind description method](https://github.com/brson/error-chain/pull/24)
+- [Fix the resolution of the ErrorKind description method](https://github.com/rust-lang-nursery/error-chain/pull/24)
 
 Contributors: Brian Anderson
 
 # 0.4.1 (yanked)
 
-- [Fix a problem with resolving methods of the standard Error type](https://github.com/brson/error-chain/pull/22)
+- [Fix a problem with resolving methods of the standard Error type](https://github.com/rust-lang-nursery/error-chain/pull/22)
 
 Contributors: Brian Anderson
 
 # 0.4.0 (yanked)
 
-- [Remove the foreign link description and forward to the foreign error](https://github.com/brson/error-chain/pull/19)
-- [Allow missing sections](https://github.com/brson/error-chain/pull/17)
+- [Remove the foreign link description and forward to the foreign error](https://github.com/rust-lang-nursery/error-chain/pull/19)
+- [Allow missing sections](https://github.com/rust-lang-nursery/error-chain/pull/17)
 
 Contributors: Brian Anderson, Taylor Cramer
 
 # 0.3.0
 
-- [Forward Display implementation for foreign errors](https://github.com/brson/error-chain/pull/13)
+- [Forward Display implementation for foreign errors](https://github.com/rust-lang-nursery/error-chain/pull/13)
 
 Contributors: Brian Anderson, Taylor Cramer
 
 # 0.2.2
 
-- [Don't require `types` section in macro invocation](https://github.com/brson/error-chain/pull/8)
-- [Add "quick start" to README](https://github.com/brson/error-chain/pull/9)
+- [Don't require `types` section in macro invocation](https://github.com/rust-lang-nursery/error-chain/pull/8)
+- [Add "quick start" to README](https://github.com/rust-lang-nursery/error-chain/pull/9)
 
 Contributors: Brian Anderson, Jake Shadle, Nate Mara
+

CHANGELOG.md.orig

@@ -0,0 +1,121 @@
+# 0.11.0-rc.2
+
+<<<<<<< HEAD
+- [Make `ErrorChainIter`'s field private](https://github.com/brson/error-chain/issues/178)
+- [Rename `ErrorChainIter` to `Iter`](https://github.com/brson/error-chain/issues/168)
+- [Implement `Debug` for `ErrorChainIter`](https://github.com/brson/error-chain/issues/169)
+- [Rename `ChainedError::display` to `display_chain`](https://github.com/brson/error-chain/issues/180)
+- [Add a new method for `Error`: `chain_err`.](https://github.com/brson/error-chain/pull/141)
+- [Allow `chain_err` to be used on `Option<T>`](https://github.com/brson/error-chain/pull/156)
+- [Add support for creating an error chain on boxed trait errors (`Box<Error>`)](https://github.com/brson/error-chain/pull/156)
+- [Remove lint for unused doc comment.](https://github.com/brson/error-chain/pull/199)
+- [Generated `ErrorKind` enums are now nonexaustive](https://github.com/brson/error-chain/pull/193)
+=======
+- [Make `ErrorChainIter`'s field private](https://github.com/rust-lang-nursery/error-chain/issues/178)
+- [Rename `ErrorChainIter` to `Iter`](https://github.com/rust-lang-nursery/error-chain/issues/168)
+- [Implement `Debug` for `ErrorChainIter`](https://github.com/rust-lang-nursery/error-chain/issues/169)
+- [Rename `ChainedError::display` to `display_chain`](https://github.com/rust-lang-nursery/error-chain/issues/180)
+- [Add a new method for `Error`: `chain_err`.](https://github.com/rust-lang-nursery/error-chain/pull/141)
+- [Allow `chain_err` to be used on `Option<T>`](https://github.com/rust-lang-nursery/error-chain/pull/156)
+- [Add support for creating an error chain on boxed trait errors (`Box<Error>`)](https://github.com/rust-lang-nursery/error-chain/pull/156)
+- [Remove lint for unused doc comment.](https://github.com/rust-lang-nursery/error-chain/pull/199)
+>>>>>>> 7feb96d... Fix broken links after move to rust-lang-nursery (#205)
+
+# 0.10.0
+
+- [Add a new constructor for `Error`: `with_chain`.](https://github.com/rust-lang-nursery/error-chain/pull/126)
+- [Add the `ensure!` macro.](https://github.com/rust-lang-nursery/error-chain/pull/135)
+
+# 0.9.0
+
+- Revert [Add a `Sync` bound to errors](https://github.com/rust-lang-nursery/error-chain/pull/110)
+
+# 0.8.1
+
+- Add crates.io category.
+
+# 0.8.0
+
+- [Add a `Sync` bound to errors](https://github.com/rust-lang-nursery/error-chain/pull/110)
+- [Add `ChainedError::display` to format error chains](https://github.com/rust-lang-nursery/error-chain/pull/113)
+
+# 0.7.2
+
+- Add `quick_main!` (#88).
+- `allow(unused)` for the `Result` wrapper.
+- Minimum rust version supported is now 1.10 on some conditions (#103).
+
+# 0.7.1
+
+- [Add the `bail!` macro](https://github.com/rust-lang-nursery/error-chain/pull/76)
+
+# 0.7.0
+
+- [Rollback several design changes to fix regressions](https://github.com/rust-lang-nursery/error-chain/pull/75)
+- New `Variant(Error) #[attrs]` for `links` and `foreign_links`.
+- Hide implementation details from the doc.
+- Always generate `Error::backtrace`.
+
+# 0.6.2
+
+- Allow dead code.
+
+# 0.6.1
+
+- Fix wrong trait constraint in ResultExt implementation (#66).
+
+# 0.6.0
+
+- Conditional compilation for error variants.
+- Backtrace generation is now a feature.
+- More standard trait implementations for extra convenience.
+- Remove ChainErr.
+- Remove need to specify `ErrorKind` in `links {}`.
+- Add ResultExt trait.
+- Error.1 is a struct instead of a tuple.
+- Error is now a struct.
+- The declarations order is more flexible.
+- Way better error reporting when there is a syntax error in the macro call.
+- `Result` generation can be disabled.
+- At most one declaration of each type can be present.
+
+# 0.5.0
+
+- [Only generate backtraces with RUST_BACKTRACE set](https://github.com/rust-lang-nursery/error-chain/pull/27)
+- [Fixup matching, disallow repeating "types" section](https://github.com/rust-lang-nursery/error-chain/pull/26)
+- [Fix tests on stable/beta](https://github.com/rust-lang-nursery/error-chain/pull/28)
+- [Only deploy docs when tagged](https://github.com/rust-lang-nursery/error-chain/pull/30)
+
+Contributors: benaryorg, Brian Anderson, Georg Brandl
+
+# 0.4.2
+
+- [Fix the resolution of the ErrorKind description method](https://github.com/rust-lang-nursery/error-chain/pull/24)
+
+Contributors: Brian Anderson
+
+# 0.4.1 (yanked)
+
+- [Fix a problem with resolving methods of the standard Error type](https://github.com/rust-lang-nursery/error-chain/pull/22)
+
+Contributors: Brian Anderson
+
+# 0.4.0 (yanked)
+
+- [Remove the foreign link description and forward to the foreign error](https://github.com/rust-lang-nursery/error-chain/pull/19)
+- [Allow missing sections](https://github.com/rust-lang-nursery/error-chain/pull/17)
+
+Contributors: Brian Anderson, Taylor Cramer
+
+# 0.3.0
+
+- [Forward Display implementation for foreign errors](https://github.com/rust-lang-nursery/error-chain/pull/13)
+
+Contributors: Brian Anderson, Taylor Cramer
+
+# 0.2.2
+
+- [Don't require `types` section in macro invocation](https://github.com/rust-lang-nursery/error-chain/pull/8)
+- [Add "quick start" to README](https://github.com/rust-lang-nursery/error-chain/pull/9)
+
+Contributors: Brian Anderson, Jake Shadle, Nate Mara

Cargo.toml

@@ -1,22 +1,22 @@
 [package]
-
 name = "error-chain"
-version = "0.10.1-pre"
+version = "0.11.0-rc.2" # remember to update html_root_url
 authors = [ "Brian Anderson <[email protected]>",
             "Paul Colomiets <[email protected]>",
             "Colin Kiegel <[email protected]>",
             "Yamakaky <[email protected]>"]
 description = "Yet another error boilerplate library."
+keywords = ["error"]
 categories = ["rust-patterns"]
 
 documentation = "https://docs.rs/error-chain"
-homepage = "https://github.com/brson/error-chain"
-repository = "https://github.com/brson/error-chain"
+repository = "https://github.com/rust-lang-nursery/error-chain"
+readme = "README.md"
 
 license = "MIT/Apache-2.0"
 
 [badges]
-travis-ci = { repository = "brson/error-chain" }
+travis-ci = { repository = "rust-lang-nursery/error-chain" }
 
 [features]
 default = ["backtrace", "example_generated"]

README.md

@@ -1,8 +1,8 @@
 # error-chain - Consistent error handling for Rust
 
-[![Build Status](https://api.travis-ci.org/brson/error-chain.svg?branch=master)](https://travis-ci.org/brson/error-chain)
+[![Build Status](https://api.travis-ci.org/rust-lang-nursery/error-chain.svg?branch=master)](https://travis-ci.org/rust-lang-nursery/error-chain)
 [![Latest Version](https://img.shields.io/crates/v/error-chain.svg)](https://crates.io/crates/error-chain)
-[![License](https://img.shields.io/github/license/brson/error-chain.svg)](https://github.com/brson/error-chain)
+[![License](https://img.shields.io/github/license/rust-lang-nursery/error-chain.svg)](https://github.com/rust-lang-nursery/error-chain)
 
 `error-chain` makes it easy to take full advantage of Rust's error
 handling features without the overhead of maintaining boilerplate
@@ -12,15 +12,15 @@ error types.
 
 [Documentation (crates.io)](https://docs.rs/error-chain).
 
-[Documentation (master)](https://brson.github.io/error-chain).
+[Documentation (master)](https://rust-lang-nursery.github.io/error-chain).
 
 ## Quick start
 
 If you just want to set up your new project with error-chain,
 follow the [quickstart.rs] template, and read this [intro]
 to error-chain.
 
-[quickstart.rs]: https://github.com/brson/error-chain/blob/master/examples/quickstart.rs
+[quickstart.rs]: https://github.com/rust-lang-nursery/error-chain/blob/master/examples/quickstart.rs
 [intro]: http://brson.github.io/2016/11/30/starting-with-error-chain
 
 ## Supported Rust version

examples/quickstart.rs

@@ -46,17 +46,17 @@ fn main() {
 
 // The above main gives you maximum control over how the error is
 // formatted. If you don't care (i.e. you want to display the full
-// error during an assert) you can just call the `display` method
+// error during an assert) you can just call the `display_chain` method
 // on the error object
 #[allow(dead_code)]
 fn alternative_main() {
     if let Err(ref e) = run() {
         use std::io::Write;
-        use error_chain::ChainedError; // trait which holds `display`
+        use error_chain::ChainedError; // trait which holds `display_chain`
         let stderr = &mut ::std::io::stderr();
         let errmsg = "Error writing to stderr";
 
-        writeln!(stderr, "{}", e.display()).expect(errmsg);
+        writeln!(stderr, "{}", e.display_chain()).expect(errmsg);
         ::std::process::exit(1);
     }
 }

src/error_chain.rs

@@ -96,8 +96,8 @@ macro_rules! error_chain_processed {
                 self.kind()
             }
 
-            fn iter(&self) -> $crate::ErrorChainIter {
-                $crate::ErrorChainIter(Some(self))
+            fn iter(&self) -> $crate::Iter {
+                $crate::Iter::new(Some(self))
             }
 
             fn chain_err<F, EK>(self, error: F) -> Self
@@ -151,7 +151,7 @@ macro_rules! error_chain_processed {
             }
 
             /// Iterates over the error chain.
-            pub fn iter(&self) -> $crate::ErrorChainIter {
+            pub fn iter(&self) -> $crate::Iter {
                 $crate::ChainedError::iter(self)
             }
 
@@ -172,6 +172,7 @@ macro_rules! error_chain_processed {
                 self.0.description()
             }
 
+            #[allow(unknown_lints, unused_doc_comment)]
             fn cause(&self) -> Option<&::std::error::Error> {
                 match self.1.next_error {
                     Some(ref c) => Some(&**c),
@@ -423,6 +424,7 @@ macro_rules! impl_extract_backtrace {
     ($error_name: ident
      $error_kind_name: ident
      $([$link_error_path: path, $(#[$meta_links: meta])*])*) => {
+        #[allow(unknown_lints, unused_doc_comment)]
         fn extract_backtrace(e: &(::std::error::Error + Send + 'static))
             -> Option<::std::sync::Arc<$crate::Backtrace>> {
             if let Some(e) = e.downcast_ref::<$error_name>() {