From db7cc35e5c7cfed07cd6ef70e7eac4dc49d37f33 Mon Sep 17 00:00:00 2001 From: Tom Parker Date: Sun, 12 Mar 2017 16:00:10 +0000 Subject: [PATCH 1/5] Remove warnings about unused items --- saphyr/src/emitter.rs | 2 +- saphyr/src/yaml.rs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/saphyr/src/emitter.rs b/saphyr/src/emitter.rs index e56fc14..9cd6a2d 100644 --- a/saphyr/src/emitter.rs +++ b/saphyr/src/emitter.rs @@ -1,6 +1,6 @@ use std::fmt; use std::convert::From; -use yaml::*; +use yaml::Yaml; #[derive(Copy, Clone, Debug)] pub enum EmitError { diff --git a/saphyr/src/yaml.rs b/saphyr/src/yaml.rs index d9f63d4..cd8ebb1 100644 --- a/saphyr/src/yaml.rs +++ b/saphyr/src/yaml.rs @@ -2,7 +2,6 @@ use std::collections::BTreeMap; use std::ops::Index; use std::string; use std::i64; -use std::str::FromStr; use std::mem; use std::vec; use parser::*; From 5bd0dd33e57e53e576f86e42da523589faf623d4 Mon Sep 17 00:00:00 2001 From: Tom Parker Date: Sat, 18 Mar 2017 14:14:01 +0000 Subject: [PATCH 2/5] Upgrade Rust versions in Travis to working ones... --- saphyr/.travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/saphyr/.travis.yml b/saphyr/.travis.yml index f3e89e1..ce92e56 100644 --- a/saphyr/.travis.yml +++ b/saphyr/.travis.yml @@ -1,8 +1,7 @@ language: rust rust: - - 1.0.0 - - 1.1.0 - - 1.5.0 + - 1.8.0 + - 1.16.0 - nightly env: global: From 72040d25de5d224786733a6d19715291a138d15e Mon Sep 17 00:00:00 2001 From: Tom Parker Date: Sat, 18 Mar 2017 14:19:04 +0000 Subject: [PATCH 3/5] Nightly sometimes is completely broken, but not our fault --- saphyr/.travis.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/saphyr/.travis.yml b/saphyr/.travis.yml index ce92e56..89e430a 100644 --- a/saphyr/.travis.yml +++ b/saphyr/.travis.yml @@ -1,8 +1,12 @@ language: rust rust: - - 1.8.0 - - 1.16.0 - - nightly + - 1.8.0 + - 1.16.0 + - beta + - nightly +matrix: + allow_failures: + - rust: nightly env: global: - secure: ZUcdcbS8xbpdII9FSPx7VtoVhEkJhWL2Hb75tDlKDHNhfXqmt1NyB9q/2qXJ5Ulp4MnYXwsI8LsDloR6gvdB4xElay3smuF/neGvMjrqcB15/2p0MSQ+kZjMsNB6mlb5kAlm8ahduXIscppmw/V+m5hn3Vo+RQz/Ng+pzv0nc8KEXPMYrfRFg+a7FaeIbRbb8ir9EfflUSqArLq2hbi2WdhM3hFMcCIAUt6DD4x5ubjEg60OnIof5FDu0mXMXzQvUfHWOeYnsNcD/DLyDnm6FuQEzk37M4EB8op2SdBUeQMQ5abR3i2rd//DZpbTTEjud0PseWohGAwTwL2aoFrqs7uYQMx+vcGlOzAyDUm4VemVUa3F2BECdzU5BiujcKOITJEVUYWongld93arQq34FuXG/TO/T1XrerxfG6LTkTkKS5Vz7W8z6Rloa99WrQLJg1ZJP6itEU7G7KsDFVgRhsg7rz4/dV/2+cV4UvIwd4HlGXKCFlH0SClqvM3/7i/qqCD0689SJW6Zip+ly38MXlGy2s/AmReEasXvFer9JkOEIuPa8QTBNAjDlw7bWXi6neQWBIZU1VhZcSssnrVmEFN8fNklShzpw5DyKCv8jPTx2O6Dw8B/LgIK8uo+eaTXiO6zz/T1c/qEdsYslvxPA2D3F+ONpPU7238ykT4eRog= From 66cf3d23896ee4221087e3be836d2ceb338aa536 Mon Sep 17 00:00:00 2001 From: Tom Parker Date: Sat, 18 Mar 2017 14:25:24 +0000 Subject: [PATCH 4/5] Switch Appveyor to using Rust 1.16 --- saphyr/appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/saphyr/appveyor.yml b/saphyr/appveyor.yml index fc72b1e..e7c3127 100644 --- a/saphyr/appveyor.yml +++ b/saphyr/appveyor.yml @@ -1,5 +1,5 @@ install: - - ps: Start-FileDownload 'https://static.rust-lang.org/dist/rust-nightly-i686-pc-windows-gnu.exe' + - ps: Start-FileDownload 'https://static.rust-lang.org/dist/rust-1.16.0-i686-pc-windows-gnu.exe' - rust-nightly-i686-pc-windows-gnu.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust" - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin - SET PATH=%PATH%;C:\MinGW\bin From e2781dca23af22e8debf2c5e3d28a3fb70a58a0d Mon Sep 17 00:00:00 2001 From: Tom Parker Date: Sat, 18 Mar 2017 14:26:27 +0000 Subject: [PATCH 5/5] Actually fix Rust command line for AppVeyor --- saphyr/appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/saphyr/appveyor.yml b/saphyr/appveyor.yml index e7c3127..5ee211c 100644 --- a/saphyr/appveyor.yml +++ b/saphyr/appveyor.yml @@ -1,6 +1,6 @@ install: - ps: Start-FileDownload 'https://static.rust-lang.org/dist/rust-1.16.0-i686-pc-windows-gnu.exe' - - rust-nightly-i686-pc-windows-gnu.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust" + - rust-1.16.0-i686-pc-windows-gnu.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust" - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin - SET PATH=%PATH%;C:\MinGW\bin - rustc -V