Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade error-chain #841

Merged
merged 2 commits into from
Dec 1, 2016
Merged

Upgrade error-chain #841

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift click to select a range
72bdaee
Upgrade error-chain
brson Nov 30, 2016
b78a1ac
Work around missing into_kind method
brson Dec 1, 2016
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
Next Next commit
Upgrade error-chain
  • Loading branch information
@brson
brson committed Nov 30, 2016
commit 72bdaee782166894a3e11ad864c76b1d817c6acc
18 changes: 9 additions & 9 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 35,7 @@ msi-installed = []
rustup-dist = { path = "src/rustup-dist", version = "0.6.5" }
rustup-utils = { path = "src/rustup-utils", version = "0.6.5" }
download = { path = "src/download" }
error-chain = "0.5.0"
error-chain = "0.7.1"
clap = "2.18.0"
regex = "0.1.41"
url = "1.1.0"
Expand Down
2 changes: 1 addition & 1 deletion src/download/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 15,7 @@ hyper-backend = ["hyper", "env_proxy", "native-tls", "openssl-sys"]
rustls-backend = ["hyper", "env_proxy", "rustls", "lazy_static", "ca-loader"]

[dependencies]
error-chain = "0.5.0"
error-chain = "0.7.1"
url = "1.1"
curl = { version = "0.3", optional = true }
lazy_static = { version = "0.2", optional = true }
Expand Down
8 changes: 4 additions & 4 deletions src/rustup-cli/errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 8,13 @@ use rustup_utils;

error_chain! {
links {
rustup::Error, rustup::ErrorKind, Rustup;
rustup_dist::Error, rustup_dist::ErrorKind, Dist;
rustup_utils::Error, rustup_utils::ErrorKind, Utils;
Rustup(rustup::Error, rustup::ErrorKind);
Dist(rustup_dist::Error, rustup_dist::ErrorKind);
Utils(rustup_utils::Error, rustup_utils::ErrorKind);
}

foreign_links {
temp::Error, Temp;
Temp(temp::Error);
}

errors {
Expand Down
2 changes: 1 addition & 1 deletion src/rustup-dist/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 24,7 @@ walkdir = "0.1.5"
toml = "0.1.27"
sha2 = "0.1.2"
rustup-utils = { path = "../rustup-utils", version = "0.6.5" }
error-chain = "0.5.0"
error-chain = "0.7.1"
rustup-mock = { path = "../rustup-mock", version = "0.6.5" }

[target."cfg(windows)".dependencies]
Expand Down
4 changes: 2 additions & 2 deletions src/rustup-dist/src/errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 7,11 @@ use manifest::Component;

error_chain! {
links {
rustup_utils::Error, rustup_utils::ErrorKind, Utils;
Utils(rustup_utils::Error, rustup_utils::ErrorKind);
}

foreign_links {
temp::Error, Temp;
Temp(temp::Error);
}

errors {
Expand Down
2 changes: 1 addition & 1 deletion src/rustup-utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 14,7 @@ license = "MIT OR Apache-2.0"
[dependencies]
rand = "0.3.11"
scopeguard = "0.1.2"
error-chain = "0.5.0"
error-chain = "0.7.1"
libc = "0.2.0"
rustc-serialize = "0.3.19"
sha2 = "0.1.2"
Expand Down
2 changes: 1 addition & 1 deletion src/rustup-utils/src/errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 5,7 @@ use download;

error_chain! {
links {
download::Error, download::ErrorKind, Download;
Download(download::Error, download::ErrorKind);
}

foreign_links { }
Expand Down
6 changes: 3 additions & 3 deletions src/rustup/errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 5,12 @@ use toml;

error_chain! {
links {
rustup_dist::Error, rustup_dist::ErrorKind, Dist;
rustup_utils::Error, rustup_utils::ErrorKind, Utils;
Dist(rustup_dist::Error, rustup_dist::ErrorKind);
Utils(rustup_utils::Error, rustup_utils::ErrorKind);
}

foreign_links {
temp::Error, Temp;
Temp(temp::Error);
}

errors {
Expand Down