From 6050eb51697e0ab083bbfc93f1877586f05165cc Mon Sep 17 00:00:00 2001 From: Sergio Benitez Date: Sun, 9 Jul 2017 22:00:01 -0700 Subject: [PATCH] Update for 2017-07-09. 'associated_consts' is stable. --- codegen/src/lints/utils.rs | 4 ++-- contrib/src/lib.rs | 1 - lib/Cargo.toml | 4 ++-- lib/src/lib.rs | 1 - 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/codegen/src/lints/utils.rs b/codegen/src/lints/utils.rs index 464961a0..7531f001 100644 --- a/codegen/src/lints/utils.rs +++ b/codegen/src/lints/utils.rs @@ -69,8 +69,8 @@ pub fn rocket_method_call<'e>(method: &str, cx: &LateContext, expr: &'e Expr) -> (Option<(Option<&'e Expr>, &'e [Expr])>) { - if let ExprMethodCall(ref name, _, ref exprs) = expr.node { - if &*name.node.as_str() == method && is_impl_method(cx, expr, ROCKET_TYPE) { + if let ExprMethodCall(ref seg, _, ref exprs) = expr.node { + if seg.name.as_str() == method && is_impl_method(cx, expr, ROCKET_TYPE) { let receiver = find_initial_receiver(cx, &exprs[0]); return Some((receiver, &exprs[1..])); } diff --git a/contrib/src/lib.rs b/contrib/src/lib.rs index 5c3d3ec6..060373bb 100644 --- a/contrib/src/lib.rs +++ b/contrib/src/lib.rs @@ -1,6 +1,5 @@ #![feature(drop_types_in_const, macro_reexport)] #![cfg_attr(feature = "templates", feature(conservative_impl_trait))] -#![cfg_attr(feature = "templates", feature(associated_consts))] // TODO: Version URLs. #![doc(html_root_url = "https://api.rocket.rs/rocket_contrib/")] diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 0acb11bd..d3257ad9 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -28,8 +28,8 @@ time = "0.1" memchr = "1" base64 = "0.6" smallvec = "0.4" -pear = "0.0.8" -pear_codegen = "0.0.8" +pear = "0.0.9" +pear_codegen = "0.0.9" rustls = { version = "0.9.0", optional = true } cookie = { version = "0.9.1", features = ["percent-encode", "secure"] } hyper = { version = "0.10.11", default-features = false } diff --git a/lib/src/lib.rs b/lib/src/lib.rs index fa76c7ee..c72e5a36 100644 --- a/lib/src/lib.rs +++ b/lib/src/lib.rs @@ -1,7 +1,6 @@ #![feature(specialization)] #![feature(conservative_impl_trait)] #![feature(drop_types_in_const)] -#![feature(associated_consts)] #![feature(const_fn)] #![feature(lookup_host)] #![feature(plugin)]