From patchwork Thu Jul 12 09:49:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell Currey X-Patchwork-Id: 943264 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41RWC813M3z9s0n for ; Fri, 13 Jul 2018 08:41:56 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=russell.cc Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="Qw3gMrMO"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 41RWC76MJHzF35c for ; Fri, 13 Jul 2018 08:41:55 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=russell.cc Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="Qw3gMrMO"; dkim-atps=neutral X-Original-To: snowpatch@lists.ozlabs.org Delivered-To: snowpatch@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (mailfrom) smtp.mailfrom=russell.cc (client-ip=64.147.123.20; helo=wout4-smtp.messagingengine.com; envelope-from=ruscur@russell.cc; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=russell.cc Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="Qw3gMrMO"; dkim-atps=neutral Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 41RBCY3SwczDr10 for ; Thu, 12 Jul 2018 19:56:09 +1000 (AEST) Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 6EC222A4; Thu, 12 Jul 2018 05:50:08 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Thu, 12 Jul 2018 05:50:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=cITdGTusmQXF2QIJgyscfto77+Cf11heFTnXoR4pJiY=; b=Qw3gMrMO hrDBZk1yOuAoiiHbrkYb7AptvqAYx/d+tV2nydNSIcj3x1cY71AtpmPq3so2sTfP mvB+dphNQB5XnfAZycDLZS/DtGLThkP6yZBG1NNd3813mGS706XoWeB57PWYPiDl XRl4EncZmlXEocLoFRXyEwAXiMXVdwj0rDN5yurYlE8S0ctnozU2OhV4QcGGYrL4 s+/AG2yJ+Q3w0zeFMnfEPiABWnsZtsGgoHBmWcmEkw7qlyRZ4ZLbdosOm+ZqoFyx 73ZquGIyWZAlikopsw1xoz/DAAHNudU08nEOTFlhkeXoodmHgLyiKOtUHh72VLJC TDQLllM4tN+SHQ== X-ME-Proxy: X-ME-Sender: Received: from snap.au.ibm.com (unknown [122.99.82.10]) by mail.messagingengine.com (Postfix) with ESMTPA id 0B4341027E; Thu, 12 Jul 2018 05:50:05 -0400 (EDT) From: Russell Currey To: snowpatch@lists.ozlabs.org Date: Thu, 12 Jul 2018 19:49:43 +1000 Message-Id: <20180712094945.8368-2-ruscur@russell.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180712094945.8368-1-ruscur@russell.cc> References: <20180712094945.8368-1-ruscur@russell.cc> X-Mailman-Approved-At: Fri, 13 Jul 2018 08:41:49 +1000 Subject: [snowpatch] [PATCH 2/4] Cargo.lock minor point updates X-BeenThere: snowpatch@lists.ozlabs.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: Continuous Integration for patch-based workflows List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Russell Currey MIME-Version: 1.0 Errors-To: snowpatch-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "snowpatch" Signed-off-by: Russell Currey --- Cargo.lock | 505 ++++++++++++++++++++++++----------------------------- 1 file changed, 233 insertions(+), 272 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 48a29b5..de3ea3b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ [[package]] name = "aho-corasick" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -13,12 +13,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "atty" -version = "0.2.6" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -26,7 +26,7 @@ name = "base64" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -37,53 +37,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "bitflags" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "byteorder" -version = "1.2.1" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cc" -version = "1.0.4" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cfg-if" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "chrono" -version = "0.4.0" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "num 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "cmake" -version = "0.1.29" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "curl-sys" -version = "0.4.1" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.33 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", + "vcpkg 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -91,28 +82,28 @@ name = "docopt" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", "strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "dtoa" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "env_logger" -version = "0.5.3" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "atty 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "termcolor 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "atty 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -133,7 +124,7 @@ name = "fuchsia-zircon" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -148,34 +139,42 @@ version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "libgit2-sys 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.33 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "httparse" -version = "1.2.4" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "humantime" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "hyper" version = "0.10.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "httparse 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "httparse 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -185,32 +184,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.9.23 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "idna" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "itoa" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "kernel32-sys" -version = "0.2.2" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "language-tags" @@ -219,12 +209,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "lazy_static" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libc" -version = "0.2.36" +version = "0.2.42" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -232,26 +222,27 @@ name = "libgit2-sys" version = "0.6.19" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "cmake 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "curl-sys 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", - "libssh2-sys 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", + "cmake 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", + "curl-sys 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", + "libssh2-sys 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.33 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "libssh2-sys" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cmake 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", + "cmake 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.33 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", + "vcpkg 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -259,10 +250,10 @@ name = "libz-sys" version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", + "vcpkg 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -270,15 +261,15 @@ name = "log" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "log" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -291,7 +282,7 @@ name = "memchr" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -304,70 +295,30 @@ dependencies = [ [[package]] name = "mime" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unicase 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "num" -version = "0.1.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", - "num-iter 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "num-integer" -version = "0.1.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "num-iter" -version = "0.1.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "num-traits" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "num-traits" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "num_cpus" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "openssl" -version = "0.9.23" +version = "0.9.24" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.33 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -377,13 +328,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "openssl-sys" -version = "0.9.24" +version = "0.9.33" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", + "vcpkg 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -393,13 +344,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "pkg-config" -version = "0.3.9" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "proc-macro2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "quick-error" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "quote" -version = "0.3.15" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "rand" @@ -407,13 +374,13 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "redox_syscall" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -421,33 +388,55 @@ name = "redox_termios" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "regex" -version = "0.2.5" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "aho-corasick 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", + "thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "regex" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "aho-corasick 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "regex-syntax 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "regex-syntax" -version = "0.4.2" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "regex-syntax" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "remove_dir_all" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -457,37 +446,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "1.0.27" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde_derive" -version = "1.0.27" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive_internals 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "serde_derive_internals" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", - "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_json" -version = "1.0.9" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", + "dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "itoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -495,18 +474,18 @@ name = "snowpatch" version = "0.1.0" dependencies = [ "docopt 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", "git2 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)", "hyper-openssl 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", - "tempdir 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)", + "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "yup-hyper-mock 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -517,37 +496,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "syn" -version = "0.11.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "synom" -version = "0.11.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tempdir" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "remove_dir_all 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "termcolor" -version = "0.3.3" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "wincolor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -555,8 +526,8 @@ name = "termion" version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -565,26 +536,26 @@ name = "thread_local" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "time" -version = "0.1.39" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "toml" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -597,12 +568,17 @@ name = "typeable" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "ucd-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "unicase" version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "version_check 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "version_check 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -610,7 +586,7 @@ name = "unicase" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "version_check 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "version_check 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -623,12 +599,12 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.5" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "unicode-xid" -version = "0.0.4" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -641,10 +617,10 @@ dependencies = [ [[package]] name = "url" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -656,12 +632,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "vcpkg" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "version_check" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -671,23 +647,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "winapi" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" @@ -700,10 +666,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "wincolor" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -712,97 +678,92 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [metadata] -"checksum aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d6531d44de723825aa81398a6415283229725a00fa30713812ab9323faa82fc4" +"checksum aho-corasick 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f0ba20154ea1f47ce2793322f049c5646cc6d0fa9759d5f333f286e507bf8080" "checksum antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" -"checksum atty 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8352656fd42c30a0c3c89d26dea01e3b77c0ab2af18230835c15e2e13cd51859" +"checksum atty 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "2fc4a1aa4c24c0718a250f0681885c1af91419d242f29eb8f2ab28502d80dbd1" "checksum base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96434f987501f0ed4eb336a411e0631ecd1afa11574fe148587adc4ff96143c9" "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" -"checksum bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf" -"checksum byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "652805b7e73fada9d85e9a6682a4abd490cb52d96aeecc12e33a0de34dfd0d23" -"checksum cc 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "deaf9ec656256bb25b404c51ef50097207b9cbb29c933d31f92cae5a8a0ffee0" -"checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de" -"checksum chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c20ebe0b2b08b0aeddba49c609fe7957ba2e33449882cb186a180bc60682fa9" -"checksum cmake 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "56d741ea7a69e577f6d06b36b7dff4738f680593dc27a701ffa8506b73ce28bb" -"checksum curl-sys 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f46e49c7125131f5afaded06944d6888b55cbdf8eba05dae73c954019b907961" +"checksum bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c54bb8f454c567f21197eefcdbf5679d0bd99f2ddbe52e84c77061952e6789" +"checksum byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "74c0b906e9446b0a2e4f760cdb3fa4b2c48cdc6db8766a845c54b6ff063fd2e9" +"checksum cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "2119ea4867bd2b8ed3aecab467709720b2d55b1bcfe09f772fd68066eaf15275" +"checksum cfg-if 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "efe5c877e17a9c717a0bf3613b2709f723202c4e4675cc8f12926ded29bcb17e" +"checksum cmake 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "95470235c31c726d72bf2e1f421adc1e65b9d561bf5529612cbe1a72da1467b3" +"checksum curl-sys 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "71c63a540a9ee4e15e56c3ed9b11a2f121239b9f6d7b7fe30f616e048148df9a" "checksum docopt 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d8acd393692c503b168471874953a2531df0e9ab77d0b6bbc582395743300a4a" -"checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab" -"checksum env_logger 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f15f0b172cb4f52ed5dbf47f774a387cd2315d1bf7894ab5af9b083ae27efa5a" +"checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd" +"checksum env_logger 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0e6e40ebb0e66918a37b38c7acab4e10d299e0463fe2af5d29b9cc86710cfd2a" "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" "checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" "checksum git2 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ee5b4bb7cd2a44e6e5ee3a26ba6a9ca10d4ce2771cdc3839bbc54b47b7d1be84" -"checksum httparse 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c2f407128745b78abc95c0ffbe4e5d37427fdc0d45470710cfef8c44522a2e37" +"checksum httparse 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7b6288d7db100340ca12873fd4d08ad1b8f206a9457798dfb17c018a33fee540" +"checksum humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0484fda3e7007f2a4a0d9c3a703ca38c71c54c55602ce4660c419fd32e188c9e" "checksum hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)" = "368cb56b2740ebf4230520e2b90ebb0461e69034d85d1945febd9b3971426db2" "checksum hyper-openssl 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5ecb3cd8e4d53f8abe7cb2227e66674bb63c1bd0ba60ca9ba7b74ea1e0054891" -"checksum idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d" -"checksum itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c" -"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" +"checksum itoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5adb58558dcd1d786b5f0bd15f3226ee23486e24b7b58304b60f64dc68e62606" "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" -"checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d" -"checksum libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "1e5d97d6708edaa407429faa671b942dc0f2727222fb6b6539bf1db936e4b121" +"checksum lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e6412c5e2ad9584b0b8e979393122026cdd6d2a80b933f890dcd694ddbe73739" +"checksum libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)" = "b685088df2b950fccadf07a7187c8ef846a959c142338a48f9dc0b94517eb5f1" "checksum libgit2-sys 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "6eeae66e7b1c995de45cb4e65c5ab438a96a7b4077e448645d4048dc753ad357" -"checksum libssh2-sys 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0db4ec23611747ef772db1c4d650f8bd762f07b461727ec998f953c614024b75" +"checksum libssh2-sys 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5afcb36f9a2012ab8d3a9ba5186ee2d1c4587acf199cb47879a73c5fe1b731a4" "checksum libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "87f737ad6cc6fd6eefe3d9dc5412f1573865bded441300904d2f42269e140f16" "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -"checksum log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "89f010e843f2b1a31dbd316b3b8d443758bc634bed37aabade59c686d644e0a2" +"checksum log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "61bd98ae7f7b754bc53dca7d44b604f733c6bba044ea6f41bc8d89272d8161d2" "checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376" "checksum memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "796fba70e76612589ed2ce7f45282f5af869e0fdd7cc6199fa1aa1f1d591ba9d" "checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" -"checksum mime 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e2e00e17be181010a91dbfefb01660b17311059dc8c7f48b9017677721e732bd" -"checksum num 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "cc4083e14b542ea3eb9b5f33ff48bd373a92d78687e74f4cc0a30caeb754f0ca" -"checksum num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f8d26da319fb45674985c78f1d1caf99aa4941f785d384a2ae36d0740bc3e2fe" -"checksum num-iter 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "4b226df12c5a59b63569dd57fafb926d91b385dfce33d8074a412411b689d593" -"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -"checksum num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e7de20f146db9d920c45ee8ed8f71681fd9ade71909b48c3acbd766aa504cf10" +"checksum mime 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "fe51c8699d2dc522bf8c1ebe26ea2193d151fb54bcdfd7d0318750c189994cd9" "checksum num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30" -"checksum openssl 0.9.23 (registry+https://github.com/rust-lang/crates.io-index)" = "169a4b9160baf9b9b1ab975418c673686638995ba921683a7f1e01470dcb8854" +"checksum openssl 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "a3605c298474a3aa69de92d21139fb5e2a81688d308262359d85cdd0d12a7985" "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -"checksum openssl-sys 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "14ba54ac7d5a4eabd1d5f2c1fdeb7e7c14debfa669d94b983d01b465e767ba9e" +"checksum openssl-sys 0.9.33 (registry+https://github.com/rust-lang/crates.io-index)" = "d8abc04833dcedef24221a91852931df2f63e3369ae003134e70aff3645775cc" "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" -"checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903" -"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" +"checksum pkg-config 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "110d5ee3593dbb73f56294327fe5668bcc997897097cbc76b51e7aed3f52452f" +"checksum proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "effdb53b25cdad54f8f48843d67398f7ef2e14f12c1b4cb4effc549a6462a4d6" +"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" +"checksum quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e44651a0dc4cdd99f71c83b561e221f714912d11af1a4dff0631f923d53af035" "checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5" -"checksum redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "0d92eecebad22b767915e4d529f89f28ee96dbbf5a4810d2b844373f136417fd" +"checksum redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c214e91d3ecf43e9a4e41e578973adeb14b474f2bee858742d127af75a0112b1" "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" -"checksum regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "744554e01ccbd98fff8c457c3b092cd67af62a555a43bfe97ae8a0451f7799fa" -"checksum regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8e931c58b93d86f080c734bfd2bce7dd0079ae2331235818133c8be7f422e20e" -"checksum remove_dir_all 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b5d2f806b0fcdabd98acd380dc8daef485e22bcb7cddc811d1337967f2528cf5" +"checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" +"checksum regex 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "13c93d55961981ba9226a213b385216f83ab43bd6ac53ab16b2eeb47e337cf4e" +"checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" +"checksum regex-syntax 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05b06a75f5217880fc5e905952a42750bf44787e56a6c6d6852ed0992f5e1d54" +"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" "checksum safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f" -"checksum serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)" = "db99f3919e20faa51bb2996057f5031d8685019b5a06139b1ce761da671b8526" -"checksum serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)" = "f4ba7591cfe93755e89eeecdbcc668885624829b020050e6aec99c2a03bd3fd0" -"checksum serde_derive_internals 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6e03f1c9530c3fb0a0a5c9b826bdd9246a5921ae995d75f512ac917fc4dd55b5" -"checksum serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c9db7266c7d63a4c4b7fe8719656ccdd51acf1bed6124b174f933b009fb10bcb" +"checksum serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)" = "0c3adf19c07af6d186d91dae8927b83b0553d07ca56cbf7f2f32560455c91920" +"checksum serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)" = "3525a779832b08693031b8ecfb0de81cd71cfd3812088fafe9a7496789572124" +"checksum serde_json 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)" = "84b8035cabe9b35878adec8ac5fe03d5f6bc97ff6edd7ccb96b44c1276ba390e" "checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694" -"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" -"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" -"checksum tempdir 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f73eebdb68c14bcb24aef74ea96079830e7fa7b31a6106e42ea7ee887c1e134e" -"checksum termcolor 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9065bced9c3e43453aa3d56f1e98590b8455b341d2fa191a1090c0dd0b242c75" +"checksum syn 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)" = "2beff8ebc3658f07512a413866875adddd20f4fd47b2a4e6c9da65cd281baaea" +"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" +"checksum termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" "checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" "checksum thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "279ef31c19ededf577bfd12dfae728040a21f635b06a24cd670ff510edd38963" -"checksum time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "a15375f1df02096fb3317256ce2cee6a1f42fc84ea5ad5fc8c421cfe40c73098" -"checksum toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a7540f4ffc193e0d3c94121edb19b055670d369f77d5804db11ae053a45b6e7e" +"checksum time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "d825be0eb33fda1a7e68012d51e9c7f451dc1a69391e7fdc197060bb8c56667b" +"checksum toml 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a0263c6c02c4db6c8f7681f9fd35e90de799ebd4cfdeab77a38f4ff6b3d8c0d9" "checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" "checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" +"checksum ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd2be2d6639d0f8fe6cdda291ad456e23629558d466e2789d2c3e9892bda285d" "checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" "checksum unicase 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "284b6d3db520d67fbe88fd778c21510d1b0ba4a551e5d0fbb023d33405f6de8a" "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -"checksum unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "51ccda9ef9efa3f7ef5d91e8f9b83bbe6955f9bf86aec89d5cce2c874625920f" -"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" +"checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25" +"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" -"checksum url 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa35e768d4daf1d85733418a49fb42e10d7f633e394fccab4ab7aba897053fe2" +"checksum url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2a321979c09843d272956e73700d12c4e7d3d92b2ee112b31548aef0d4efc5a6" "checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122" -"checksum vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9e0a7d8bed3178a8fb112199d466eeca9ed09a14ba8ad67718179b4fd5487d0b" -"checksum version_check 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6b772017e347561807c1aa192438c5fd74242a670a6cffacc40f2defd1dc069d" +"checksum vcpkg 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cbe533e138811704c0e3cbde65a818b35d3240409b4346256c5ede403e082474" +"checksum version_check 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7716c242968ee87e5542f8021178248f267f295a5c4803beae8b8b7fd9bc6051" "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" -"checksum winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04e3bd221fcbe8a271359c04f21a76db7d0c6028862d1bb5512d85e1e2eb5bb3" -"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" +"checksum winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "773ef9dcc5f24b7d850d0ff101e542ff24c3b090a9768e03ff889fdef41f00fd" "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -"checksum wincolor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0878187fa88838d2006c0a76f30d64797098426245b375383f60acb6aed8a203" +"checksum wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" "checksum yup-hyper-mock 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1b19be9a18db9400bac5717cafb85a5d97fe16c5796c63faf3ea73a3e3ec47fe" From patchwork Thu Jul 12 09:49:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell Currey X-Patchwork-Id: 942880 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41RBCs6CS5z9rxs for ; Thu, 12 Jul 2018 19:56:25 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=russell.cc Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="Qe+2viUM"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 41RBCs4brkzF35Y for ; Thu, 12 Jul 2018 19:56:25 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=russell.cc Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="Qe+2viUM"; dkim-atps=neutral X-Original-To: snowpatch@lists.ozlabs.org Delivered-To: snowpatch@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (mailfrom) smtp.mailfrom=russell.cc (client-ip=64.147.123.20; helo=wout4-smtp.messagingengine.com; envelope-from=ruscur@russell.cc; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=russell.cc Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="Qe+2viUM"; dkim-atps=neutral Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 41RBCY5HjHzF35P for ; Thu, 12 Jul 2018 19:56:09 +1000 (AEST) Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 710A431E; Thu, 12 Jul 2018 05:50:10 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Thu, 12 Jul 2018 05:50:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=O2Ec1e+LaHRplJi6aMxZ7J2+/sruWVxqTxZjXwePFIg=; b=Qe+2viUM eWU4jdmyJ4x0z+Wlh5TVj1ndeotPVu2onr38eCdCwSY98SvwZBbrYQNzeC9MYQOb VmodlKGYw4NghKX6wLcW7YdZ+1YC2VbQQOLIuym8WlWl6tNRAzltYspjPCEj+ud1 umOhp6H2zq+z7Qr+K8VVIKNOJMaMqW4HmPk2zlpnt7XQv9BfwYIVqFJQziiePmy4 KsZrQrlOR5j80CvB+H+3B9+muFzny5oX8qiF6MstScXe/santT4LiXTxQoqKg23j oUafqc7QZU1vA+5w71IZntiTjR0M7zuPsmBLgKfh4F5bGWSyWWdGdJeptuDlGPkl kp1VaCZoCY3Xug== X-ME-Proxy: X-ME-Sender: Received: from snap.au.ibm.com (unknown [122.99.82.10]) by mail.messagingengine.com (Postfix) with ESMTPA id 5072B1028B; Thu, 12 Jul 2018 05:50:08 -0400 (EDT) From: Russell Currey To: snowpatch@lists.ozlabs.org Date: Thu, 12 Jul 2018 19:49:44 +1000 Message-Id: <20180712094945.8368-3-ruscur@russell.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180712094945.8368-1-ruscur@russell.cc> References: <20180712094945.8368-1-ruscur@russell.cc> Subject: [snowpatch] [PATCH 3/4] Style changes from rustfmt X-BeenThere: snowpatch@lists.ozlabs.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: Continuous Integration for patch-based workflows List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Russell Currey MIME-Version: 1.0 Errors-To: snowpatch-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "snowpatch" Signed-off-by: Russell Currey --- src/git.rs | 53 ++++++++------ src/jenkins.rs | 75 +++++++++++-------- src/main.rs | 182 +++++++++++++++++++++++++++++------------------ src/patchwork.rs | 149 ++++++++++++++++++++++---------------- src/settings.rs | 20 +++--- src/utils.rs | 19 +++-- 6 files changed, 303 insertions(+), 195 deletions(-) diff --git a/src/git.rs b/src/git.rs index ccf8bdf..bc93009 100644 --- a/src/git.rs +++ b/src/git.rs @@ -14,12 +14,12 @@ // git.rs - snowpatch git functionality // -use git2::{Repository, Commit, Remote, Error, PushOptions, Cred}; use git2::build::CheckoutBuilder; +use git2::{Commit, Cred, Error, PushOptions, Remote, Repository}; -use std::result::Result; use std::path::Path; use std::process::{Command, Output}; +use std::result::Result; use settings::Git; @@ -31,9 +31,11 @@ pub fn get_latest_commit(repo: &Repository) -> Commit { repo.find_commit(oid).unwrap() } -pub fn push_to_remote(remote: &mut Remote, branch: &str, - mut opts: &mut PushOptions) - -> Result<(), Error> { +pub fn push_to_remote( + remote: &mut Remote, + branch: &str, + mut opts: &mut PushOptions, +) -> Result<(), Error> { let refspecs: &[&str] = &[&format!("+{}/{}", GIT_REF_BASE, branch)]; remote.push(refspecs, Some(&mut opts)) } @@ -49,12 +51,14 @@ pub fn pull(repo: &Repository) -> Result { .unwrap(); // TODO if output.status.success() { - debug!("Pull: {}", String::from_utf8(output.clone().stdout).unwrap()); + debug!( + "Pull: {}", + String::from_utf8(output.clone().stdout).unwrap() + ); Ok(output) } else { Err("Error: couldn't pull changes") } - } pub fn checkout_branch(repo: &Repository, branch: &str) -> () { @@ -99,8 +103,7 @@ pub fn checkout_branch(repo: &Repository, branch: &str) -> () { () } -pub fn apply_patch(repo: &Repository, path: &Path) - -> Result { +pub fn apply_patch(repo: &Repository, path: &Path) -> Result { let workdir = repo.workdir().unwrap(); // TODO: support bare repositories // We call out to "git am" since libgit2 doesn't implement "am" @@ -113,15 +116,23 @@ pub fn apply_patch(repo: &Repository, path: &Path) .unwrap(); // TODO if output.status.success() { - debug!("Patch applied with text {}", - String::from_utf8(output.clone().stdout).unwrap()); + debug!( + "Patch applied with text {}", + String::from_utf8(output.clone().stdout).unwrap() + ); Ok(output) } else { - info!("Patch failed to apply with text {} {}", - String::from_utf8(output.clone().stdout).unwrap(), - String::from_utf8(output.clone().stderr).unwrap()); - Command::new("git").arg("am").arg("--abort") - .current_dir(&workdir).output().unwrap(); + info!( + "Patch failed to apply with text {} {}", + String::from_utf8(output.clone().stdout).unwrap(), + String::from_utf8(output.clone().stderr).unwrap() + ); + Command::new("git") + .arg("am") + .arg("--abort") + .current_dir(&workdir) + .output() + .unwrap(); Err("Patch did not apply successfully") } } @@ -131,8 +142,10 @@ pub fn cred_from_settings(settings: &Git) -> Result { let public_key = settings.public_key.as_ref().map(String::as_ref); let passphrase = settings.passphrase.as_ref().map(String::as_ref); - Cred::ssh_key(&settings.user, - public_key, - Path::new(&settings.private_key), - passphrase) + Cred::ssh_key( + &settings.user, + public_key, + Path::new(&settings.private_key), + passphrase, + ) } diff --git a/src/jenkins.rs b/src/jenkins.rs index d8a2068..3d6ffb1 100644 --- a/src/jenkins.rs +++ b/src/jenkins.rs @@ -23,15 +23,15 @@ extern crate hyper; extern crate url; +use std::collections::BTreeMap; use std::io::Read; -use std::time::Duration; -use std::thread::sleep; use std::sync::Arc; -use std::collections::BTreeMap; +use std::thread::sleep; +use std::time::Duration; -use hyper::Client; use hyper::client::{IntoUrl, RequestBuilder}; -use hyper::header::{Headers, Basic, Authorization, Location}; +use hyper::header::{Authorization, Basic, Headers, Location}; +use hyper::Client; use serde_json::{self, Value}; use patchwork::TestState; @@ -41,8 +41,10 @@ const JENKINS_POLLING_INTERVAL: u64 = 5000; // Polling interval in milliseconds // Jenkins API definitions -pub trait CIBackend { // TODO: Separate out - fn start_test(&self, job_name: &str, params: Vec<(&str, &str)>) -> Result; +pub trait CIBackend { + // TODO: Separate out + fn start_test(&self, job_name: &str, params: Vec<(&str, &str)>) + -> Result; } pub struct JenkinsBackend { @@ -58,15 +60,20 @@ impl CIBackend for JenkinsBackend { /// # Failures /// /// Returns Err when HTTP request fails or when no Location: header is returned - fn start_test(&self, job_name: &str, params: Vec<(&str, &str)>) - -> Result { + fn start_test( + &self, + job_name: &str, + params: Vec<(&str, &str)>, + ) -> Result { let params = url::form_urlencoded::Serializer::new(String::new()) .extend_pairs(params) .finish(); - let res = self.post(&format!("{}/job/{}/buildWithParameters?{}", - self.base_url, job_name, params)) - .send().expect("HTTP request error"); // TODO don't panic here + let res = self.post(&format!( + "{}/job/{}/buildWithParameters?{}", + self.base_url, job_name, params + )).send() + .expect("HTTP request error"); // TODO don't panic here match res.headers.get::() { Some(loc) => Ok(loc.to_string()), @@ -85,14 +92,10 @@ impl JenkinsBackend { fn headers(&self) -> Headers { let mut headers = Headers::new(); if let Some(ref username) = self.username { - headers.set( - Authorization( - Basic { - username: username.clone(), - password: self.token.clone(), - } - ) - ); + headers.set(Authorization(Basic { + username: username.clone(), + password: self.token.clone(), + })); } headers } @@ -119,31 +122,37 @@ impl JenkinsBackend { resp.read_to_string(&mut result_str) .unwrap_or_else(|err| panic!("Couldn't read from server: {}", err)); break; - } - serde_json::from_str(&result_str).unwrap_or_else( - |err| panic!("Couldn't parse JSON from Jenkins: {}", err) - ) + } + serde_json::from_str(&result_str) + .unwrap_or_else(|err| panic!("Couldn't parse JSON from Jenkins: {}", err)) } pub fn get_build_url(&self, build_queue_entry: &str) -> Option { loop { let entry = self.get_api_json_object(build_queue_entry); match entry.get("executable") { - Some(exec) => return Some(exec + Some(exec) => { + return Some( + exec .as_object() // Option .unwrap() // BTreeMap .get("url") // Option<&str> .unwrap() // &str ? .as_str() .unwrap() - .to_string()), + .to_string(), + ); + } None => sleep(Duration::from_millis(JENKINS_POLLING_INTERVAL)), } } } pub fn get_build_status(&self, build_url: &str) -> JenkinsBuildStatus { - if self.get_api_json_object(build_url)["building"].as_bool().unwrap() { + if self.get_api_json_object(build_url)["building"] + .as_bool() + .unwrap() + { JenkinsBuildStatus::Running } else { JenkinsBuildStatus::Done @@ -151,10 +160,14 @@ impl JenkinsBackend { } pub fn get_build_result(&self, build_url: &str) -> Option { - match self.get_api_json_object(build_url).get("result").unwrap() - .as_str() { + match self.get_api_json_object(build_url) + .get("result") + .unwrap() + .as_str() + { None => None, - Some(result) => match result { // TODO: Improve this... + Some(result) => match result { + // TODO: Improve this... "SUCCESS" => Some(TestState::Success), "FAILURE" => Some(TestState::Fail), "UNSTABLE" => Some(TestState::Warning), @@ -166,7 +179,7 @@ impl JenkinsBackend { pub fn get_results_url(&self, build_url: &str, job: &BTreeMap) -> String { match job.get("artifact") { Some(artifact) => format!("{}/artifact/{}", build_url, artifact), - None => format!("{}/consoleText/", build_url) + None => format!("{}/consoleText/", build_url), } } diff --git a/src/main.rs b/src/main.rs index aaa3ac9..c5a9ebf 100644 --- a/src/main.rs +++ b/src/main.rs @@ -19,11 +19,11 @@ // Equivalent of -Werror #![deny(warnings)] +extern crate docopt; +extern crate git2; extern crate hyper; extern crate hyper_openssl; -extern crate git2; extern crate tempdir; -extern crate docopt; extern crate url; #[macro_use] extern crate log; @@ -34,34 +34,34 @@ extern crate serde_derive; extern crate serde_json; extern crate toml; -use git2::{BranchType, RemoteCallbacks, PushOptions}; +use git2::{BranchType, PushOptions, RemoteCallbacks}; -use hyper::Client; use hyper::client::ProxyConfig; +use hyper::client::RedirectPolicy; use hyper::net::HttpsConnector; +use hyper::Client; use hyper_openssl::OpensslClient; -use hyper::client::RedirectPolicy; use docopt::Docopt; use url::Url; -use log::LevelFilter; use env_logger::Builder; +use log::LevelFilter; +use std::env; use std::fs; +use std::path::Path; use std::string::String; use std::sync::Arc; use std::thread; use std::time::Duration; -use std::path::Path; -use std::env; mod patchwork; -use patchwork::{PatchworkServer, TestState, TestResult}; +use patchwork::{PatchworkServer, TestResult, TestState}; mod jenkins; -use jenkins::{JenkinsBackend, CIBackend}; +use jenkins::{CIBackend, JenkinsBackend}; mod settings; use settings::{Config, Project}; @@ -101,8 +101,14 @@ struct Args { flag_project: String, } -fn run_tests(settings: &Config, client: Arc, project: &Project, tag: &str, - branch_name: &str, hefty_tests: bool) -> Vec { +fn run_tests( + settings: &Config, + client: Arc, + project: &Project, + tag: &str, + branch_name: &str, + hefty_tests: bool, +) -> Vec { let mut results: Vec = Vec::new(); let jenkins = JenkinsBackend { base_url: settings.jenkins.url.clone(), @@ -126,7 +132,8 @@ fn run_tests(settings: &Config, client: Arc, project: &Project, tag: &st jenkins_params.push((&job.branch, tag)); info!("Starting job: {}", &job.title); - let res = jenkins.start_test(&job.job, jenkins_params) + let res = jenkins + .start_test(&job.job, jenkins_params) .unwrap_or_else(|err| panic!("Starting Jenkins test failed: {}", err)); debug!("{:?}", &res); let build_url_real; @@ -145,8 +152,9 @@ fn run_tests(settings: &Config, client: Arc, project: &Project, tag: &st test_result = TestState::Warning; } results.push(TestResult { - description: Some(format!("Test {} on branch {}", job.title, - branch_name.to_string()).to_string()), + description: Some( + format!("Test {} on branch {}", job.title, branch_name.to_string()).to_string(), + ), state: test_result, context: Some(format!("{}-{}", "snowpatch", job.title.replace("/", "_")).to_string()), target_url: Some(jenkins.get_results_url(&build_url_real, &job.parameters)), @@ -155,21 +163,23 @@ fn run_tests(settings: &Config, client: Arc, project: &Project, tag: &st results } -fn test_patch(settings: &Config, client: &Arc, project: &Project, - path: &Path, hefty_tests: bool) -> Vec { +fn test_patch( + settings: &Config, + client: &Arc, + project: &Project, + path: &Path, + hefty_tests: bool, +) -> Vec { let repo = project.get_repo().unwrap(); let mut results: Vec = Vec::new(); if !path.is_file() { return results; } - let tag = utils::sanitise_path( - path.file_name().unwrap().to_str().unwrap().to_string()); + let tag = utils::sanitise_path(path.file_name().unwrap().to_str().unwrap().to_string()); let mut remote = repo.find_remote(&project.remote_name).unwrap(); let mut push_callbacks = RemoteCallbacks::new(); - push_callbacks.credentials(|_, _, _| { - git::cred_from_settings(&settings.git) - }); + push_callbacks.credentials(|_, _, _| git::cred_from_settings(&settings.git)); let mut push_opts = PushOptions::new(); push_opts.remote_callbacks(push_callbacks); @@ -192,7 +202,10 @@ fn test_patch(settings: &Config, client: &Arc, project: &Project, .unwrap_or_else(|err| panic!("Couldn't set HEAD: {}", err)); repo.checkout_head(None) .unwrap_or_else(|err| panic!("Couldn't checkout HEAD: {}", err)); - debug!("Repo is now at head {}", repo.head().unwrap().name().unwrap()); + debug!( + "Repo is now at head {}", + repo.head().unwrap().name().unwrap() + ); let output = git::apply_patch(&repo, path); @@ -211,24 +224,30 @@ fn test_patch(settings: &Config, client: &Arc, project: &Project, successfully_applied = true; results.push(TestResult { state: TestState::Success, - description: Some(format!("{}/{}\n\n{}", - branch_name.to_string(), - "apply_patch".to_string(), - "Successfully applied".to_string()) - .to_string()), - .. Default::default() + description: Some( + format!( + "{}/{}\n\n{}", + branch_name.to_string(), + "apply_patch".to_string(), + "Successfully applied".to_string() + ).to_string(), + ), + ..Default::default() }); - }, + } Err(_) => { // It didn't apply. No need to bother testing. results.push(TestResult { state: TestState::Warning, - description: Some(format!("{}/{}\n\n{}", - branch_name.to_string(), - "apply_patch".to_string(), - "Patch failed to apply".to_string()) - .to_string()), - .. Default::default() + description: Some( + format!( + "{}/{}\n\n{}", + branch_name.to_string(), + "apply_patch".to_string(), + "Patch failed to apply".to_string() + ).to_string(), + ), + ..Default::default() }); continue; } @@ -241,26 +260,37 @@ fn test_patch(settings: &Config, client: &Arc, project: &Project, let test_all_branches = project.test_all_branches.unwrap_or(true); // We've set up a remote branch, time to kick off tests - let test = thread::Builder::new().name(tag.to_string()).spawn(move || { - run_tests(&settings_clone, client, &project, &tag, &branch_name, - hefty_tests) - }).unwrap(); + let test = thread::Builder::new() + .name(tag.to_string()) + .spawn(move || { + run_tests( + &settings_clone, + client, + &project, + &tag, + &branch_name, + hefty_tests, + ) + }) + .unwrap(); results.append(&mut test.join().unwrap()); - if !test_all_branches { break; } + if !test_all_branches { + break; + } } if !successfully_applied { results.push(TestResult { state: TestState::Fail, description: Some("Failed to apply to any branch".to_string()), - .. Default::default() + ..Default::default() }); } results } -#[cfg_attr(feature="cargo-clippy", allow(cyclomatic_complexity))] +#[cfg_attr(feature = "cargo-clippy", allow(cyclomatic_complexity))] fn main() { let mut log_builder = Builder::new(); // By default, log at the "info" level for every module @@ -270,8 +300,11 @@ fn main() { } log_builder.init(); - let version = format!("{} version {}", - env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION")); + let version = format!( + "{} version {}", + env!("CARGO_PKG_NAME"), + env!("CARGO_PKG_VERSION") + ); let args: Args = Docopt::new(USAGE) .and_then(|d| d.version(Some(version)).deserialize()) @@ -293,14 +326,17 @@ fn main() { assert_eq!(proxy.scheme(), "http"); // This should pass even if no trailing slash is in http_proxy assert_eq!(proxy.path(), "/"); - let proxy_config = ProxyConfig::new(proxy.scheme(), - proxy.host_str().unwrap().to_string(), - proxy.port().unwrap_or(80), - connector, ssl); + let proxy_config = ProxyConfig::new( + proxy.scheme(), + proxy.host_str().unwrap().to_string(), + proxy.port().unwrap_or(80), + connector, + ssl, + ); let mut c = Client::with_proxy_config(proxy_config); c.set_redirect_policy(RedirectPolicy::FollowAll); c - }, + } _ => { debug!("snowpatch starting without a HTTP proxy"); let mut c = Client::with_connector(connector); @@ -310,9 +346,11 @@ fn main() { }); let mut patchwork = PatchworkServer::new(&settings.patchwork.url, &client); - patchwork.set_authentication(&settings.patchwork.user, - &settings.patchwork.pass, - &settings.patchwork.token); + patchwork.set_authentication( + &settings.patchwork.user, + &settings.patchwork.pass, + &settings.patchwork.token, + ); let patchwork = patchwork; if args.flag_series > 0 && args.flag_patch > 0 { @@ -354,7 +392,9 @@ fn main() { info!("snowpatch is testing a series from Patchwork."); let series = patchwork.get_series(&(args.flag_series as u64)).unwrap(); // The last patch in the series, so its dependencies are the whole series - let patch = patchwork.get_patch_by_url(&series.patches.last().unwrap().url).unwrap(); + let patch = patchwork + .get_patch_by_url(&series.patches.last().unwrap().url) + .unwrap(); // We have to do it this way since there's no project field on Series let project = patchwork.get_project(&patch.project.name).unwrap(); match settings.projects.get(&project.link_name) { @@ -378,8 +418,9 @@ fn main() { * Spawn tests. */ 'daemon: loop { - let patch_list = patchwork.get_patch_query().unwrap_or_else( - |err| panic!("Failed to obtain patch list: {}", err)); + let patch_list = patchwork + .get_patch_query() + .unwrap_or_else(|err| panic!("Failed to obtain patch list: {}", err)); info!("snowpatch is ready to test new revisions from Patchwork."); for patch in patch_list { // If it's already been tested, we can skip it @@ -396,22 +437,29 @@ fn main() { //let project = patchwork.get_project(&patch.project).unwrap(); // Skip if we're using -p and it's the wrong project if args.flag_project != "" && patch.project.link_name != args.flag_project { - debug!("Skipping patch {} ({}) (wrong project: {})", - patch.name, patch.id, patch.project.link_name); + debug!( + "Skipping patch {} ({}) (wrong project: {})", + patch.name, patch.id, patch.project.link_name + ); continue; } match settings.projects.get(&patch.project.link_name) { None => { - debug!("Project {} not configured for patch {}", - &patch.project.link_name, patch.name); + debug!( + "Project {} not configured for patch {}", + &patch.project.link_name, patch.name + ); continue; - }, + } Some(project) => { // TODO(ajd): Refactor this. let hefty_tests; let mbox = if patch.has_series() { - debug!("Patch {} has a series at {}!", &patch.name, &patch.series[0].url); + debug!( + "Patch {} has a series at {}!", + &patch.name, &patch.series[0].url + ); let series = patchwork.get_series_by_url(&patch.series[0].url); match series { Ok(series) => { @@ -422,8 +470,7 @@ fn main() { let dependencies = patchwork.get_patch_dependencies(&patch); hefty_tests = dependencies.len() == series.patches.len(); patchwork.get_patches_mbox(dependencies) - - }, + } Err(e) => { debug!("Series is not OK: {}", e); hefty_tests = true; @@ -438,8 +485,8 @@ fn main() { let results = test_patch(&settings, &client, project, &mbox, hefty_tests); // Delete the temporary directory with the patch in it - fs::remove_dir_all(mbox.parent().unwrap()).unwrap_or_else( - |err| error!("Couldn't delete temp directory: {}", err)); + fs::remove_dir_all(mbox.parent().unwrap()) + .unwrap_or_else(|err| error!("Couldn't delete temp directory: {}", err)); if project.push_results { for result in results { patchwork.post_test_result(result, &patch.checks).unwrap(); @@ -447,8 +494,7 @@ fn main() { } if args.flag_count > 0 { patch_count += 1; - debug!("Tested {} patches out of {}", - patch_count, args.flag_count); + debug!("Tested {} patches out of {}", patch_count, args.flag_count); if patch_count >= args.flag_count { break 'daemon; } diff --git a/src/patchwork.rs b/src/patchwork.rs index c3c6286..3aecb58 100644 --- a/src/patchwork.rs +++ b/src/patchwork.rs @@ -15,22 +15,21 @@ // use std; -use std::io::{self}; +use std::collections::BTreeMap; +use std::fs::{File, OpenOptions}; +use std::io; use std::option::Option; use std::path::PathBuf; -use std::fs::{File, OpenOptions}; use std::result::Result; -use std::collections::BTreeMap; use tempdir::TempDir; use hyper; -use hyper::Client; -use hyper::header::{Connection, Headers, Accept, ContentType, qitem, - Authorization, Basic}; -use hyper::mime::{Mime, TopLevel, SubLevel, Attr, Value}; -use hyper::status::StatusCode; use hyper::client::response::Response; +use hyper::header::{qitem, Accept, Authorization, Basic, Connection, ContentType, Headers}; +use hyper::mime::{Attr, Mime, SubLevel, TopLevel, Value}; +use hyper::status::StatusCode; +use hyper::Client; use serde::{self, Serializer}; use serde_json; @@ -46,7 +45,7 @@ pub struct SubmitterSummary { pub id: u64, pub url: String, pub name: String, - pub email: String + pub email: String, } #[derive(Deserialize, Clone)] @@ -55,7 +54,7 @@ pub struct DelegateSummary { pub url: String, pub first_name: String, pub last_name: String, - pub email: String + pub email: String, } // /api/1.0/projects/{id} @@ -94,7 +93,7 @@ pub struct Patch { pub series: Vec, pub check: String, // TODO enum of possible states pub checks: String, - pub tags: BTreeMap + pub tags: BTreeMap, } impl Patch { @@ -114,7 +113,7 @@ pub struct PatchSummary { pub mbox: String, pub msgid: String, pub name: String, - pub url: String + pub url: String, } #[derive(Deserialize, Clone)] @@ -123,7 +122,7 @@ pub struct CoverLetter { pub id: u64, pub msgid: String, pub name: String, - pub url: String + pub url: String, } // /api/1.0/series/ @@ -142,7 +141,7 @@ pub struct Series { pub submitter: SubmitterSummary, pub total: u64, pub url: String, - pub version: u64 + pub version: u64, } #[derive(Deserialize, Clone)] @@ -184,15 +183,19 @@ pub struct TestResult { } impl TestResult { - fn serialize_context(context: &Option, ser: S) - -> Result where S: Serializer { + fn serialize_context(context: &Option, ser: S) -> Result + where + S: Serializer, + { if context.is_none() { serde::Serialize::serialize( - &Some(format!("{}-{}", - env!("CARGO_PKG_NAME"), - env!("CARGO_PKG_VERSION")).to_string() - .replace(".", "_")), - ser) + &Some( + format!("{}-{}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION")) + .to_string() + .replace(".", "_"), + ), + ser, + ) } else { serde::Serialize::serialize(context, ser) } @@ -206,17 +209,19 @@ pub struct PatchworkServer { } impl PatchworkServer { - #[cfg_attr(feature="cargo-clippy", allow(ptr_arg))] + #[cfg_attr(feature = "cargo-clippy", allow(ptr_arg))] pub fn new(url: &String, client: &std::sync::Arc) -> PatchworkServer { let mut headers = Headers::new(); - headers.set(Accept(vec![qitem(Mime(TopLevel::Application, - SubLevel::Json, - vec![(Attr::Charset, Value::Utf8)]))]) - ); - headers.set(ContentType(Mime(TopLevel::Application, - SubLevel::Json, - vec![(Attr::Charset, Value::Utf8)])) - ); + headers.set(Accept(vec![qitem(Mime( + TopLevel::Application, + SubLevel::Json, + vec![(Attr::Charset, Value::Utf8)], + ))])); + headers.set(ContentType(Mime( + TopLevel::Application, + SubLevel::Json, + vec![(Attr::Charset, Value::Utf8)], + ))); PatchworkServer { url: url.clone(), client: client.clone(), @@ -224,46 +229,63 @@ impl PatchworkServer { } } - #[cfg_attr(feature="cargo-clippy", allow(ptr_arg))] - pub fn set_authentication(&mut self, username: &Option, - password: &Option, - token: &Option) { + #[cfg_attr(feature = "cargo-clippy", allow(ptr_arg))] + pub fn set_authentication( + &mut self, + username: &Option, + password: &Option, + token: &Option, + ) { match (username, password, token) { (&None, &None, &Some(ref token)) => { - self.headers.set(Authorization( - format!("Token {}", token))); - }, + self.headers.set(Authorization(format!("Token {}", token))); + } (&Some(ref username), &Some(ref password), &None) => { self.headers.set(Authorization(Basic { username: username.clone(), password: Some(password.clone()), })); - }, + } _ => panic!("Invalid patchwork authentication details"), } } - pub fn get_url(&self, url: &str) - -> std::result::Result { - self.client.get(&*url).headers(self.headers.clone()) - .header(Connection::close()).send() + pub fn get_url(&self, url: &str) -> std::result::Result { + self.client + .get(&*url) + .headers(self.headers.clone()) + .header(Connection::close()) + .send() } pub fn get_url_string(&self, url: &str) -> std::result::Result { - let mut resp = try!(self.client.get(&*url).headers(self.headers.clone()) - .header(Connection::close()).send()); + let mut resp = try!( + self.client + .get(&*url) + .headers(self.headers.clone()) + .header(Connection::close()) + .send() + ); let mut body: Vec = vec![]; io::copy(&mut resp, &mut body).unwrap(); Ok(String::from_utf8(body).unwrap()) } - pub fn post_test_result(&self, result: TestResult, checks_url: &str) - -> Result { + pub fn post_test_result( + &self, + result: TestResult, + checks_url: &str, + ) -> Result { let encoded = serde_json::to_string(&result).unwrap(); let headers = self.headers.clone(); debug!("JSON Encoded: {}", encoded); - let mut resp = try!(self.client.post(checks_url) - .headers(headers).body(&encoded).send()); + let mut resp = try!( + self.client + .post(checks_url) + .headers(headers) + .body(&encoded) + .send() + ); let mut body: Vec = vec![]; io::copy(&mut resp, &mut body).unwrap(); trace!("{}", String::from_utf8(body).unwrap()); @@ -276,8 +298,10 @@ impl PatchworkServer { } pub fn get_patch(&self, patch_id: &u64) -> Result { - let url = format!("{}{}/patches/{}{}", &self.url, PATCHWORK_API, - patch_id, PATCHWORK_QUERY); + let url = format!( + "{}{}/patches/{}{}", + &self.url, PATCHWORK_API, patch_id, PATCHWORK_QUERY + ); serde_json::from_str(&self.get_url_string(&url).unwrap()) } @@ -287,13 +311,13 @@ impl PatchworkServer { pub fn get_patch_query(&self) -> Result, serde_json::Error> { let url = format!("{}{}/patches/{}", &self.url, PATCHWORK_API, PATCHWORK_QUERY); - serde_json::from_str(&self.get_url_string(&url).unwrap_or_else( - |err| panic!("Failed to connect to Patchwork: {}", err))) + serde_json::from_str(&self.get_url_string(&url) + .unwrap_or_else(|err| panic!("Failed to connect to Patchwork: {}", err))) } pub fn get_patch_dependencies(&self, patch: &Patch) -> Vec { // We assume the list of patches in a series are in order. - let mut dependencies: Vec = vec!(); + let mut dependencies: Vec = vec![]; let series = self.get_series_by_url(&patch.series[0].url); if series.is_err() { return dependencies; @@ -316,10 +340,10 @@ impl PatchworkServer { let mut mbox_resp = self.get_url(&patch.mbox).unwrap(); debug!("Saving patch to file {}", path.display()); - let mut mbox = File::create(&path).unwrap_or_else( - |err| panic!("Couldn't create mbox file: {}", err)); - io::copy(&mut mbox_resp, &mut mbox).unwrap_or_else( - |err| panic!("Couldn't save mbox from Patchwork: {}", err)); + let mut mbox = + File::create(&path).unwrap_or_else(|err| panic!("Couldn't create mbox file: {}", err)); + io::copy(&mut mbox_resp, &mut mbox) + .unwrap_or_else(|err| panic!("Couldn't save mbox from Patchwork: {}", err)); path } @@ -339,20 +363,21 @@ impl PatchworkServer { for patch in patches { let mut mbox_resp = self.get_url(&patch.mbox).unwrap(); debug!("Appending patch {} to file {}", patch.name, path.display()); - io::copy(&mut mbox_resp, &mut mbox).unwrap_or_else( - |err| panic!("Couldn't save mbox from Patchwork: {}", err)); + io::copy(&mut mbox_resp, &mut mbox) + .unwrap_or_else(|err| panic!("Couldn't save mbox from Patchwork: {}", err)); } path } pub fn get_series(&self, series_id: &u64) -> Result { - let url = format!("{}{}/series/{}{}", &self.url, PATCHWORK_API, - series_id, PATCHWORK_QUERY); + let url = format!( + "{}{}/series/{}{}", + &self.url, PATCHWORK_API, series_id, PATCHWORK_QUERY + ); serde_json::from_str(&self.get_url_string(&url).unwrap()) } pub fn get_series_by_url(&self, url: &str) -> Result { serde_json::from_str(&self.get_url_string(url).unwrap()) } - } diff --git a/src/settings.rs b/src/settings.rs index 0ce7031..2d39354 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -16,14 +16,14 @@ use toml; -use serde::de::{self, Visitor, Deserializer, Deserialize, MapAccess}; +use serde::de::{self, Deserialize, Deserializer, MapAccess, Visitor}; -use git2::{Repository, Error}; +use git2::{Error, Repository}; +use std::collections::BTreeMap; use std::fmt; use std::fs::File; use std::io::Read; -use std::collections::BTreeMap; // TODO: Give more informative error messages when we fail to parse. @@ -32,7 +32,7 @@ pub struct Git { pub user: String, pub public_key: Option, pub private_key: String, - pub passphrase: Option + pub passphrase: Option, } #[derive(Deserialize, Clone)] @@ -53,7 +53,7 @@ pub struct Jenkins { pub port: Option, // TODO: fail if we only get one of username or token pub username: Option, - pub token: Option + pub token: Option, } #[derive(Deserialize, Clone)] @@ -87,7 +87,8 @@ pub struct Job { impl<'de> Deserialize<'de> for Job { fn deserialize(deserializer: D) -> Result - where D: Deserializer<'de> + where + D: Deserializer<'de>, { struct JobVisitor; @@ -99,7 +100,8 @@ impl<'de> Deserialize<'de> for Job { } fn visit_map(self, mut map: A) -> Result - where A: MapAccess<'de> + where + A: MapAccess<'de>, { let mut job = None; let mut title = None; @@ -180,7 +182,7 @@ pub struct Config { pub git: Git, pub patchwork: Patchwork, pub jenkins: Jenkins, - pub projects: BTreeMap + pub projects: BTreeMap, } pub fn parse(path: &str) -> Config { @@ -188,7 +190,7 @@ pub fn parse(path: &str) -> Config { let mut file = match File::open(&path) { Ok(file) => file, - Err(_) => panic!("Couldn't open config file, exiting.") + Err(_) => panic!("Couldn't open config file, exiting."), }; file.read_to_string(&mut toml_config) diff --git a/src/utils.rs b/src/utils.rs index aca373a..10ffd95 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -14,9 +14,18 @@ // pub fn sanitise_path(path: String) -> String { - path.replace("/", "_").replace("\\", "_").replace(".", "_") - .replace("~", "_").replace(" ", "_").replace(":", "") - .replace("[", "_").replace("]", "_").replace("'", "") - .replace("\"", "").replace("(", "_").replace(")", "_") - .replace("*", "_").replace("?", "_") + path.replace("/", "_") + .replace("\\", "_") + .replace(".", "_") + .replace("~", "_") + .replace(" ", "_") + .replace(":", "") + .replace("[", "_") + .replace("]", "_") + .replace("'", "") + .replace("\"", "") + .replace("(", "_") + .replace(")", "_") + .replace("*", "_") + .replace("?", "_") } From patchwork Thu Jul 12 09:49:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell Currey X-Patchwork-Id: 942879 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41RBCm5kB8z9rxs for ; Thu, 12 Jul 2018 19:56:20 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=russell.cc Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="BgusDcOJ"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 41RBCm3jgNzF35c for ; Thu, 12 Jul 2018 19:56:20 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=russell.cc Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="BgusDcOJ"; dkim-atps=neutral X-Original-To: snowpatch@lists.ozlabs.org Delivered-To: snowpatch@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (mailfrom) smtp.mailfrom=russell.cc (client-ip=64.147.123.20; helo=wout4-smtp.messagingengine.com; envelope-from=ruscur@russell.cc; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=russell.cc Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="BgusDcOJ"; dkim-atps=neutral Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 41RBCZ1tQ2zF35Q for ; Thu, 12 Jul 2018 19:56:10 +1000 (AEST) Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 17A50305; Thu, 12 Jul 2018 05:50:12 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Thu, 12 Jul 2018 05:50:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=OD0y0tdwdKzfIRh/oVz8wyu9v5F7yvYWkgLRB0paTg4=; b=BgusDcOJ 8jqZA5sPjxMpNBxX86G9XaMrfgFiJDgcK94iF5B/lh8czcgbCzPw4oevMF4KcKEi jpb6Gl4qQMWLzNaCCceVbw1PvJiP292nZ2cs649+1frKYC9fUPK8u7laFPlSnMkx R+g0nRbVKlDklpmvju/Y9d2rn6bC+DEdoWEJ2qvFGk86A6a8ae6rxcvMqa6N88V0 frmFopTjWzTdgC/rF1okLdomUd9LVl6FIoZTL/CyswRno2USryyhOr5+keiGV1hu fqUyPBV7P8Sov1TJIlJLCQ7Au2UBi/12ojz4IXE5cGjs5iJ3S85phA1PLJDIanfi 3xx4xqoQ35GSrQ== X-ME-Proxy: X-ME-Sender: Received: from snap.au.ibm.com (unknown [122.99.82.10]) by mail.messagingengine.com (Postfix) with ESMTPA id 49AFF10261; Thu, 12 Jul 2018 05:50:10 -0400 (EDT) From: Russell Currey To: snowpatch@lists.ozlabs.org Date: Thu, 12 Jul 2018 19:49:45 +1000 Message-Id: <20180712094945.8368-4-ruscur@russell.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180712094945.8368-1-ruscur@russell.cc> References: <20180712094945.8368-1-ruscur@russell.cc> Subject: [snowpatch] [PATCH 4/4] Add script to set up running rustfmt on commit X-BeenThere: snowpatch@lists.ozlabs.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: Continuous Integration for patch-based workflows List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Russell Currey MIME-Version: 1.0 Errors-To: snowpatch-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "snowpatch" Signed-off-by: Russell Currey --- setup_rustfmt_hook.sh | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100755 setup_rustfmt_hook.sh diff --git a/setup_rustfmt_hook.sh b/setup_rustfmt_hook.sh new file mode 100755 index 0000000..76a8932 --- /dev/null +++ b/setup_rustfmt_hook.sh @@ -0,0 +1,31 @@ +#!/bin/sh +rustup component add rustfmt-preview + +rustfmt_path=`which rustfmt` +echo "#!/bin/bash +declare -a rust_files=() +files=\$(git diff-index --name-only HEAD) +echo 'Formatting source files' +for file in \$files; do + if [ ! -f \"\${file}\" ]; then + continue + fi + if [[ \"\${file}\" == *.rs ]]; then + rust_files+=(\"\${file}\") + fi +done +if [ \${#rust_files[@]} -ne 0 ]; then + $rustfmt_path \${rust_files[@]} & +fi +wait +changed_files=(\"\${rust_files[@]}\" \"\${cpp_files[@]}\") +if [ \${#changed_files[@]} -ne 0 ]; then + git add \${changed_files[@]} + echo \"Formatting done, changed files: \${changed_files[@]}\" +else + echo \"No changes, formatting skipped\" +fi" > .git/hooks/pre-commit + +chmod +x .git/hooks/pre-commit + +echo "Hooks updated"