From 18820202d7e06b48fc45c55f48d2d623ea37fcc5 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Wed, 18 Apr 2018 05:13:33 +0300 Subject: [PATCH] gitlabci: Add needed ENV vars. abc8fb988fe757fae3da83930c6ffa8da321ce81 uses an feature of rayon that's behind a compile time flag. --- .gitlab-ci.yml | 6 +++--- Cargo.lock | 2 +- hammond-data/src/feed.rs | 2 +- scripts/cargo.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a2bb8e4..7e87a3d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,9 +5,9 @@ stages: .cargo_test_template: &cargo_test stage: test - # variables: - # RUSTFLAGS: "-C link-dead-code" - # RUST_BACKTRACE: "FULL" + variables: + RUSTFLAGS: "--cfg rayon_unstable" + RUST_BACKTRACE: "FULL" before_script: - apt-get update -yqq diff --git a/Cargo.lock b/Cargo.lock index cbd2144..66884d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1503,7 +1503,7 @@ dependencies = [ [[package]] name = "rss" version = "1.4.0" -source = "git+https://github.com/alatiera/rss#ca25285cb44d82c8dadfefe05f248ea9a14c996c" +source = "git+https://github.com/alatiera/rss#b4a5ff563bf3ab6f1c83b5c79e625ff0292aa480" dependencies = [ "derive_builder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/hammond-data/src/feed.rs b/hammond-data/src/feed.rs index e1979a4..a05e532 100644 --- a/hammond-data/src/feed.rs +++ b/hammond-data/src/feed.rs @@ -42,7 +42,7 @@ impl Feed { } fn index_channel_items(self, pd: Podcast) -> Box + Send> { - let stream = stream::iter_ok::<_, DataError>(self.channel.items_owened()); + let stream = stream::iter_ok::<_, DataError>(self.channel.items_owned()); let insert = stream .filter_map(move |item| { glue(&item, pd.id()) diff --git a/scripts/cargo.sh b/scripts/cargo.sh index d46e562..e707660 100755 --- a/scripts/cargo.sh +++ b/scripts/cargo.sh @@ -1,6 +1,6 @@ #!/bin/sh export CARGO_HOME=$1/target/cargo-home -export RUSTFLAGS=--cfg rayon_unstable +export RUSTFLAGS="--cfg rayon_unstable" cargo build --release -p hammond-gtk && cp $1/target/release/hammond-gtk $2 \ No newline at end of file