From cf692dfb324aa8edc6ab6c688ba4cc6e2dd9b2eb Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 29 Nov 2017 15:05:19 +0100 Subject: [PATCH] cargo: update to 0.23.0. --- srcpkgs/cargo/patches/nonexhaustive.patch | 14 -------------- srcpkgs/cargo/template | 4 ++-- 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 srcpkgs/cargo/patches/nonexhaustive.patch diff --git a/srcpkgs/cargo/patches/nonexhaustive.patch b/srcpkgs/cargo/patches/nonexhaustive.patch deleted file mode 100644 index 9aa8d7321c9..00000000000 --- a/srcpkgs/cargo/patches/nonexhaustive.patch +++ /dev/null @@ -1,14 +0,0 @@ -Without this patch, cargo fails to build in rust 1.20 due to: -error[E0004]: non-exhaustive patterns: `&__Nonexhaustive { }` not covered - ---- src/cargo/util/errors.rs.orig -+++ src/cargo/util/errors.rs -@@ -83,7 +83,7 @@ - &CargoErrorKind::Parse(_) | - &CargoErrorKind::Git(_) | - &CargoErrorKind::Internal(_) | -- &CargoErrorKind::CargoTestErrorKind(_) => false -+ &CargoErrorKind::CargoTestErrorKind(_) | _ => false - } - } - } diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index d0fd91f9162..80506de33cc 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,6 +1,6 @@ # Template file for 'cargo' pkgname=cargo -version=0.22.0 +version=0.23.0 revision=1 _githash_installer=4f994850808a572e2cc8d43f968893c8e942e9bf hostmakedepends="rust python curl cmake pkg-config" @@ -12,7 +12,7 @@ license="MIT, Apache-2.0" homepage="https://crates.io/" distfiles="https://github.com/rust-lang/cargo/archive/${version}.tar.gz https://github.com/rust-lang/rust-installer/archive/${_githash_installer}.tar.gz" -checksum="6740e2f8d035a5a5246a12e84a141d37ad4c2b826355aff497e6f1fcfb637aef +checksum="f4bbe2a8719dbb8da20842235093f7f70f034d01633189e83f75897d68cd274f dc7240d60a869fa24a68c8734fb7c810c27cca0a6dad52df6279865e4e8e7fae" nocross=yes