From 1fbacad8b96df889b08f1c79c04420c6ae8952a6 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Fri, 10 Nov 2017 11:42:11 +0200 Subject: [PATCH] Updated rayon. --- Cargo.lock | 19 ++++++++----------- hammond-data/Cargo.toml | 5 ++--- hammond-downloader/Cargo.toml | 3 --- hammond-downloader/src/downloader.rs | 1 - hammond-downloader/src/lib.rs | 1 - hammond-gtk/Cargo.toml | 2 +- 6 files changed, 11 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 91bf631..d64bf69 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -545,7 +545,7 @@ dependencies = [ "lazy_static 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", - "rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rayon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "rfc822_sanitizer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "rss 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -558,16 +558,13 @@ name = "hammond-downloader" version = "0.1.0" dependencies = [ "diesel 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", - "dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "hammond-data 0.1.0", "hyper 0.11.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 1.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rss 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -586,7 +583,7 @@ dependencies = [ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "loggerv 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "open 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rayon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1021,19 +1018,19 @@ dependencies = [ [[package]] name = "rayon" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rayon-core 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "either 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rayon-core 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rayon-core" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "coco 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1637,8 +1634,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum quick-xml 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "19a3a610544419c527d5f51ae1a6ae3db533e25c117d3eed8fce6434f70c5e95" "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" "checksum rand 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)" = "6475140dfd8655aeb72e1fd4b7a1cc1c202be65d71669476e392fe62532b9edd" -"checksum rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b614fe08b6665cb9a231d07ac1364b0ef3cb3698f1239ee0c4c3a88a524f54c8" -"checksum rayon-core 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7febc28567082c345f10cddc3612c6ea020fc3297a1977d472cf9fdb73e6e493" +"checksum rayon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed02d09394c94ffbdfdc755ad62a132e94c3224a8354e78a1200ced34df12edf" +"checksum rayon-core 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e64b609139d83da75902f88fd6c01820046840a18471e4dfcd5ac7c0f46bea53" "checksum redox_syscall 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "8dde11f18c108289bef24469638a04dce49da56084f2d50618b226e47eb04509" "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" "checksum regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1731164734096285ec2a5ec7fea5248ae2f5485b3feeb0115af4fda2183b2d1b" diff --git a/hammond-data/Cargo.toml b/hammond-data/Cargo.toml index 1cc30cd..7d80a17 100644 --- a/hammond-data/Cargo.toml +++ b/hammond-data/Cargo.toml @@ -6,12 +6,11 @@ workspace = "../" [dependencies] chrono = "0.4" -# diesel wants dotenv with a feature disabled and breaks rss -dotenv = "0.10" +dotenv = "0.10.1" error-chain = "0.11" lazy_static = "0.2" log = "0.3" -rayon = "0.8" +rayon = "0.9" reqwest = "0.8" rfc822_sanitizer = "0.3" rss = "1.1" diff --git a/hammond-downloader/Cargo.toml b/hammond-downloader/Cargo.toml index 36de161..a789a69 100644 --- a/hammond-downloader/Cargo.toml +++ b/hammond-downloader/Cargo.toml @@ -5,15 +5,12 @@ version = "0.1.0" workspace = "../" [dependencies] -dotenv = "*" error-chain = "0.11" hyper = "0.11" log = "0.3" -mime = "0.3" mime_guess = "1.8" rand = "0.3" reqwest = "0.8" -rss = "1.1" tempdir = "0.3" [dependencies.diesel] diff --git a/hammond-downloader/src/downloader.rs b/hammond-downloader/src/downloader.rs index bc54374..c1d8f27 100644 --- a/hammond-downloader/src/downloader.rs +++ b/hammond-downloader/src/downloader.rs @@ -8,7 +8,6 @@ use mime_guess; use std::fs::{rename, DirBuilder, File}; use std::io::{BufWriter, Read, Write}; use std::path::Path; -// use std::str::FromStr; use errors::*; use hammond_data::index_feed::Database; diff --git a/hammond-downloader/src/lib.rs b/hammond-downloader/src/lib.rs index d38d6b8..db2caad 100644 --- a/hammond-downloader/src/lib.rs +++ b/hammond-downloader/src/lib.rs @@ -7,7 +7,6 @@ extern crate hammond_data; extern crate hyper; #[macro_use] extern crate log; -extern crate mime; extern crate mime_guess; extern crate rand; extern crate reqwest; diff --git a/hammond-gtk/Cargo.toml b/hammond-gtk/Cargo.toml index df12565..e84b337 100644 --- a/hammond-gtk/Cargo.toml +++ b/hammond-gtk/Cargo.toml @@ -14,7 +14,7 @@ glib = "0.3" log = "0.3" loggerv = "0.4" open = "1.2" -rayon = "0.8" +rayon = "0.9" [dependencies.gtk] features = ["v3_22"]