Pipeline: Remove dependancy on rayon_futures
This requires a RUSTFLAG to be set before hand for rayon to build. This brakes a lot of tools like rls and clippy by default and require special configs for itnegration. Additionally, rayon_futures is still 0.1 and not much work seem to have gone into it. Ideally it should be replased with the tokio runtime/threadpool.
This commit is contained in:
parent
8a05597e52
commit
a7c95d5718
@ -32,7 +32,6 @@ flatpak:
|
|||||||
--env=APP_ID="org.gnome.PodcastsDevel" \
|
--env=APP_ID="org.gnome.PodcastsDevel" \
|
||||||
--env=LOCALEDIR="./podcasts-gtk/po" \
|
--env=LOCALEDIR="./podcasts-gtk/po" \
|
||||||
--env=VERSION="0.0.0" \
|
--env=VERSION="0.0.0" \
|
||||||
--env=RUSTFLAGS="--cfg rayon_unstable" \
|
|
||||||
--env=CARGO_HOME="target/cargo-home" \
|
--env=CARGO_HOME="target/cargo-home" \
|
||||||
--env=CARGO_TARGET_DIR="target_test/" \
|
--env=CARGO_TARGET_DIR="target_test/" \
|
||||||
app ${MANIFEST_PATH} \
|
app ${MANIFEST_PATH} \
|
||||||
|
|||||||
11
Cargo.lock
generated
11
Cargo.lock
generated
@ -1501,7 +1501,6 @@ dependencies = [
|
|||||||
"pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
"rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"rayon 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
"rayon 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"rayon-futures 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
||||||
"rfc822_sanitizer 0.3.3 (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.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"rss 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
"tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
@ -1692,15 +1691,6 @@ dependencies = [
|
|||||||
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "rayon-futures"
|
|
||||||
version = "0.1.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
dependencies = [
|
|
||||||
"futures 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
||||||
"rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "redox_syscall"
|
name = "redox_syscall"
|
||||||
version = "0.1.40"
|
version = "0.1.40"
|
||||||
@ -2671,7 +2661,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
"checksum rand_core 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "edecf0f94da5551fc9b492093e30b041a891657db7940ee221f9d2f66e82eef2"
|
"checksum rand_core 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "edecf0f94da5551fc9b492093e30b041a891657db7940ee221f9d2f66e82eef2"
|
||||||
"checksum rayon 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "df7a791f788cb4c516f0e091301a29c2b71ef680db5e644a7d68835c8ae6dbfa"
|
"checksum rayon 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "df7a791f788cb4c516f0e091301a29c2b71ef680db5e644a7d68835c8ae6dbfa"
|
||||||
"checksum rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b055d1e92aba6877574d8fe604a63c8b5df60f60e5982bf7ccbb1338ea527356"
|
"checksum rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b055d1e92aba6877574d8fe604a63c8b5df60f60e5982bf7ccbb1338ea527356"
|
||||||
"checksum rayon-futures 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea70dae42033c388536c7e9bdca084a14d75659c12e25fc105e7552464a87c4a"
|
|
||||||
"checksum redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c214e91d3ecf43e9a4e41e578973adeb14b474f2bee858742d127af75a0112b1"
|
"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 redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
|
||||||
"checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384"
|
"checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384"
|
||||||
|
|||||||
@ -11,7 +11,6 @@ derive_builder = "0.5.1"
|
|||||||
lazy_static = "1.1.0"
|
lazy_static = "1.1.0"
|
||||||
log = "0.4.4"
|
log = "0.4.4"
|
||||||
rayon = "1.0.2"
|
rayon = "1.0.2"
|
||||||
rayon-futures = "0.1.0"
|
|
||||||
rfc822_sanitizer = "0.3.3"
|
rfc822_sanitizer = "0.3.3"
|
||||||
rss = "1.5.0"
|
rss = "1.5.0"
|
||||||
url = "1.7.1"
|
url = "1.7.1"
|
||||||
|
|||||||
@ -80,7 +80,6 @@ extern crate hyper_tls;
|
|||||||
extern crate native_tls;
|
extern crate native_tls;
|
||||||
extern crate num_cpus;
|
extern crate num_cpus;
|
||||||
extern crate rayon;
|
extern crate rayon;
|
||||||
extern crate rayon_futures;
|
|
||||||
extern crate rfc822_sanitizer;
|
extern crate rfc822_sanitizer;
|
||||||
extern crate rss;
|
extern crate rss;
|
||||||
extern crate tokio_core;
|
extern crate tokio_core;
|
||||||
|
|||||||
@ -11,8 +11,6 @@ use hyper_tls::HttpsConnector;
|
|||||||
use tokio_core::reactor::Core;
|
use tokio_core::reactor::Core;
|
||||||
|
|
||||||
use num_cpus;
|
use num_cpus;
|
||||||
use rayon;
|
|
||||||
use rayon_futures::ScopeFutureExt;
|
|
||||||
|
|
||||||
use errors::DataError;
|
use errors::DataError;
|
||||||
use Source;
|
use Source;
|
||||||
@ -55,7 +53,7 @@ where
|
|||||||
{
|
{
|
||||||
sources
|
sources
|
||||||
.and_then(clone!(client => move |s| s.into_feed(client.clone())))
|
.and_then(clone!(client => move |s| s.into_feed(client.clone())))
|
||||||
.and_then(|feed| rayon::scope(|s| s.spawn_future(feed.index())))
|
.and_then(|feed| feed.index())
|
||||||
// the stream will stop at the first error so
|
// the stream will stop at the first error so
|
||||||
// we ensure that everything will succeded regardless.
|
// we ensure that everything will succeded regardless.
|
||||||
.map_err(|err| error!("Error: {}", err))
|
.map_err(|err| error!("Error: {}", err))
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
export CARGO_HOME=$1/target/cargo-home
|
export CARGO_HOME=$1/target/cargo-home
|
||||||
export RUSTFLAGS="--cfg rayon_unstable"
|
|
||||||
export LOCALEDIR="$3"
|
export LOCALEDIR="$3"
|
||||||
export APP_ID="$4"
|
export APP_ID="$4"
|
||||||
export VERSION="$5"
|
export VERSION="$5"
|
||||||
|
|||||||
@ -26,7 +26,6 @@ xvfb-run -a -s "-screen 0 1024x768x24" \
|
|||||||
--env=APP_ID="org.gnome.PodcastsDevel" \
|
--env=APP_ID="org.gnome.PodcastsDevel" \
|
||||||
--env=LOCALEDIR="./podcasts-gtk/po" \
|
--env=LOCALEDIR="./podcasts-gtk/po" \
|
||||||
--env=VERSION="0.0.0" \
|
--env=VERSION="0.0.0" \
|
||||||
--env=RUSTFLAGS="--cfg rayon_unstable" \
|
|
||||||
--env=CARGO_HOME="target/cargo-home" \
|
--env=CARGO_HOME="target/cargo-home" \
|
||||||
--env=CARGO_TARGET_DIR="target_test/" \
|
--env=CARGO_TARGET_DIR="target_test/" \
|
||||||
app ${MANIFEST_PATH} \
|
app ${MANIFEST_PATH} \
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user