From ebb6bb7860502d6d77f61cb2eeffa201bb7b0663 Mon Sep 17 00:00:00 2001 From: Sergio Benitez Date: Sun, 9 Jul 2017 22:16:16 -0700 Subject: [PATCH] Restrict compilation to nightlies >= 2017-07-09. --- codegen/Cargo.toml | 4 ++-- codegen/build.rs | 41 +++++++++++++------------------- lib/Cargo.toml | 4 ++-- lib/build.rs | 58 +++++++++++++++++++++------------------------- 4 files changed, 47 insertions(+), 60 deletions(-) diff --git a/codegen/Cargo.toml b/codegen/Cargo.toml index 835fc177..747a2085 100644 --- a/codegen/Cargo.toml +++ b/codegen/Cargo.toml @@ -22,5 +22,5 @@ log = "^0.3" compiletest_rs = "^0.2" [build-dependencies] -ansi_term = "^0.9" -version_check = "^0.1" +yansi = "0.3" +version_check = "0.1.2" diff --git a/codegen/build.rs b/codegen/build.rs index 2f073e3c..f85b5974 100644 --- a/codegen/build.rs +++ b/codegen/build.rs @@ -1,46 +1,37 @@ //! This tiny build script ensures that rocket_codegen is not compiled with an //! incompatible version of rust. -extern crate ansi_term; +extern crate yansi; extern crate version_check; -use ansi_term::Colour::{Red, Yellow, Blue, White}; -use version_check::{is_nightly, is_min_version, is_min_date}; +use yansi::Color::{Red, Yellow, Blue, White}; +use version_check::{supports_features, is_min_version, is_min_date}; // Specifies the minimum nightly version needed to compile Rocket's codegen. -const MIN_DATE: &'static str = "2017-06-19"; +const MIN_DATE: &'static str = "2017-07-09"; const MIN_VERSION: &'static str = "1.19.0-nightly"; -// Convenience macro for writing to stderr. -macro_rules! printerr { - ($($arg:tt)*) => ({ - use std::io::prelude::*; - write!(&mut ::std::io::stderr(), "{}\n", format_args!($($arg)*)) - .expect("Failed to write to stderr.") - }) -} - fn main() { - let ok_nightly = is_nightly(); + let ok_channel = supports_features(); let ok_version = is_min_version(MIN_VERSION); let ok_date = is_min_date(MIN_DATE); let print_version_err = |version: &str, date: &str| { - printerr!("{} {}. {} {}.", + eprintln!("{} {}. {} {}.", White.paint("Installed version is:"), Yellow.paint(format!("{} ({})", version, date)), White.paint("Minimum required:"), Yellow.paint(format!("{} ({})", MIN_VERSION, MIN_DATE))); }; - match (ok_nightly, ok_version, ok_date) { - (Some(is_nightly), Some((ok_version, version)), Some((ok_date, date))) => { - if !is_nightly { - printerr!("{} {}", - Red.bold().paint("Error:"), - White.paint("Rocket requires a nightly version of Rust.")); + match (ok_channel, ok_version, ok_date) { + (Some(ok_channel), Some((ok_version, version)), Some((ok_date, date))) => { + if !ok_channel { + eprintln!("{} {}", + Red.paint("Error:").bold(), + White.paint("Rocket requires a nightly or dev version of Rust.")); print_version_err(&*version, &*date); - printerr!("{}{}{}", + eprintln!("{}{}{}", Blue.paint("See the getting started guide ("), White.paint("https://rocket.rs/guide/getting-started/"), Blue.paint(") for more information.")); @@ -48,10 +39,10 @@ fn main() { } if !ok_version || !ok_date { - printerr!("{} {}", - Red.bold().paint("Error:"), + eprintln!("{} {}", + Red.paint("Error:").bold(), White.paint("Rocket codegen requires a more recent version of rustc.")); - printerr!("{}{}{}", + eprintln!("{}{}{}", Blue.paint("Use `"), White.paint("rustup update"), Blue.paint("` or your preferred method to update Rust.")); diff --git a/lib/Cargo.toml b/lib/Cargo.toml index ce62be8c..238b04f0 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -35,8 +35,8 @@ lazy_static = "0.2" rocket_codegen = { version = "0.2.8", path = "../codegen" } [build-dependencies] -ansi_term = "^0.9" -version_check = "^0.1" +yansi = "0.3" +version_check = "0.1.2" [features] testing = [] diff --git a/lib/build.rs b/lib/build.rs index 7fa9f524..607350f4 100644 --- a/lib/build.rs +++ b/lib/build.rs @@ -1,56 +1,52 @@ //! This tiny build script ensures that rocket is not compiled with an //! incompatible version of rust. -extern crate ansi_term; +extern crate yansi; extern crate version_check; -use ansi_term::Colour::{Red, Yellow, Blue, White}; -use version_check::{is_nightly, is_min_version}; +use yansi::Color::{Red, Yellow, Blue, White}; +use version_check::{supports_features, is_min_version, is_min_date}; // Specifies the minimum nightly version needed to compile Rocket. -const MIN_VERSION: &'static str = "1.16.0-nightly"; - -// Convenience macro for writing to stderr. -macro_rules! printerr { - ($($arg:tt)*) => ({ - use std::io::prelude::*; - write!(&mut ::std::io::stderr(), "{}\n", format_args!($($arg)*)) - .expect("Failed to write to stderr.") - }) -} +const MIN_DATE: &'static str = "2017-07-09"; +const MIN_VERSION: &'static str = "1.20.0-nightly"; fn main() { - let (ok_nightly, ok_version) = (is_nightly(), is_min_version(MIN_VERSION)); - let print_version_err = |version: &str| { - printerr!("{} {}. {} {}.", + let ok_channel = supports_features(); + let ok_version = is_min_version(MIN_VERSION); + let ok_date = is_min_date(MIN_DATE); + let triple = (ok_channel, ok_version, ok_date); + + let print_version_err = |version: &str, date: &str| { + eprintln!("{} {}. {} {}.", White.paint("Installed version is:"), - Yellow.paint(version), + Yellow.paint(format!("{} ({})", version, date)), White.paint("Minimum required:"), - Yellow.paint(MIN_VERSION)); + Yellow.paint(format!("{} ({})", MIN_VERSION, MIN_DATE))); }; - if let (Some(is_nightly), Some((ok_version, version))) = (ok_nightly, ok_version) { - if !is_nightly { - printerr!("{} {}", - Red.bold().paint("Error:"), - White.paint("Rocket requires a nightly version of Rust.")); - print_version_err(&*version); - printerr!("{}{}{}", + if let (Some(ok_channel), Some((ok_version, version)), Some((ok_date, date))) = triple { + if !ok_channel { + eprintln!("{} {}", + Red.paint("Error:").bold(), + White.paint("Rocket requires a nightly or dev version of Rust.")); + print_version_err(&*version, &*date); + eprintln!("{}{}{}", Blue.paint("See the getting started guide ("), White.paint("https://rocket.rs/guide/getting-started/"), Blue.paint(") for more information.")); panic!("Aborting compilation due to incompatible compiler.") } - if !ok_version { - printerr!("{} {}", - Red.bold().paint("Error:"), - White.paint("Rocket requires a newer version of rustc.")); - printerr!("{}{}{}", + if !ok_version || !ok_date { + eprintln!("{} {}", + Red.paint("Error:").bold(), + White.paint("Rocket requires a more recent version of rustc.")); + eprintln!("{}{}{}", Blue.paint("Use `"), White.paint("rustup update"), Blue.paint("` or your preferred method to update Rust.")); - print_version_err(&*version); + print_version_err(&*version, &*date); panic!("Aborting compilation due to incompatible compiler.") } } else {