Skip to content
This repository has been archived by the owner on Aug 16, 2021. It is now read-only.

Fix a resolve bug #22

Merged
merged 2 commits into from
Aug 6, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]

name = "error-chain"
version = "0.4.0"
version = "0.4.1"
authors = [ "Brian Anderson <banderson@mozilla.com>",
"Paul Colomiets <paul@colomiets.name>",
"Colin Kiegel <kiegel@gmx.de>"]
Expand Down
4 changes: 2 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -481,14 +481,14 @@ macro_rules! error_chain {

$(
$link_variant(e: $link_kind_path) {
description(e.description())
description(::std::error::Error::description(e))
display("{}", e)
}
) *

$(
$foreign_link_variant(err: $foreign_link_error_path) {
description(err.description())
description(::std::error::Error::description(err))
display("{}", err)
}
) *
Expand Down
13 changes: 6 additions & 7 deletions tests/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ fn empty() {
#[cfg(test)]
mod foreign_link_test {

use std::error::Error as StdError;
use std::fmt;

// Note: foreign errors must be `pub` because they appear in the
Expand All @@ -122,12 +121,12 @@ mod foreign_link_test {
cause: ForeignErrorCause
}

impl StdError for ForeignError {
impl ::std::error::Error for ForeignError {
fn description(&self) -> &'static str {
"Foreign error description"
}

fn cause(&self) -> Option<&StdError> { Some(&self.cause) }
fn cause(&self) -> Option<&::std::error::Error> { Some(&self.cause) }
}

impl fmt::Display for ForeignError {
Expand All @@ -139,12 +138,12 @@ mod foreign_link_test {
#[derive(Debug)]
pub struct ForeignErrorCause {}

impl StdError for ForeignErrorCause {
impl ::std::error::Error for ForeignErrorCause {
fn description(&self) -> &'static str {
"Foreign error cause description"
}

fn cause(&self) -> Option<&StdError> { None }
fn cause(&self) -> Option<&::std::error::Error> { None }
}

impl fmt::Display for ForeignErrorCause {
Expand Down Expand Up @@ -178,7 +177,7 @@ mod foreign_link_test {
let chained_error = try_foreign_error().err().unwrap();
assert_eq!(
format!("{}", ForeignErrorCause{}),
format!("{}", chained_error.cause().unwrap())
format!("{}", ::std::error::Error::cause(&chained_error).unwrap())
);
}

Expand All @@ -195,7 +194,7 @@ mod foreign_link_test {
format!("{}", error_iter.next().unwrap())
);
assert_eq!(
format!("{:?}", None as Option<&StdError>),
format!("{:?}", None as Option<&::std::error::Error>),
format!("{:?}", error_iter.next())
);
}
Expand Down