From 5d4908e74a6acbcbf24dacbf19c858a00ebd5176 Mon Sep 17 00:00:00 2001 From: Sergio Benitez Date: Fri, 12 Jan 2018 19:16:54 -0800 Subject: [PATCH] Update minimum nightly to '2018-01-12'. The '2018-01-12' nightly release includes a commit that reverts the change that broke 'ring', un-breaking 'ring', and thus un-breaking Rocket. As a result, the '[patch]' workaround is no longer required. Rocket is back on the latest nightly! --- Cargo.toml | 3 --- lib/build.rs | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6c0f250d..1c1b91df 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,6 +38,3 @@ members = [ "examples/tls", "examples/fairings", ] - -[patch.crates-io] -ring = { git = "https://github.com/SergioBenitez/ring", branch = "v0.12" } diff --git a/lib/build.rs b/lib/build.rs index 86e7ad5a..00110ab5 100644 --- a/lib/build.rs +++ b/lib/build.rs @@ -8,8 +8,8 @@ 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_DATE: &'static str = "2017-11-07"; -const MIN_VERSION: &'static str = "1.23.0-nightly"; +const MIN_DATE: &'static str = "2018-01-12"; +const MIN_VERSION: &'static str = "1.25.0-nightly"; fn main() { let ok_channel = supports_features();