bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix for rustc 1.17.0-nightly (be760566c 2017-02-28)

Browse source
This commit is contained in:
Enrico Schmitz 2017-03-01 13:24:19 +01:00 • committed by Enrico Schmitz
parent a39b5f95b8
commit f66e0aad84
22 changed files with 47 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

3
clippy_lints/src/regex.rs
View file

@ -2,7 +2,6 @@ use regex_syntax;
use rustc::hir::*;
use rustc::lint::*;
use rustc::middle::const_val::ConstVal;
use rustc_const_eval::EvalHint::ExprTypeChecked;
use rustc_const_eval::ConstContext;
use std::collections::HashSet;
use std::error::Error;
@ -151,7 +150,7 @@ fn str_span(base: Span, s: &str, c: usize) -> Span {
}
fn const_str(cx: &LateContext, e: &Expr) -> Option<InternedString> {
match ConstContext::with_tables(cx.tcx, cx.tables).eval(e, ExprTypeChecked) {
match ConstContext::with_tables(cx.tcx, cx.tables).eval(e) {
Ok(ConstVal::Str(r)) => Some(r),
_ => None,
}