Rollup merge of #68328 - jethrogb:jb/target-llvm-args, r=alexcrichton

[rust.git] / src / librustc_passes / check_const.rs

diff --git a/src/librustc_passes/check_const.rs b/src/librustc_passes/check_const.rs
index a2944918a4748fca3e4a696d34b6cd6e672d48f0..faa85f68fab860f0dbe9809fd4d2e69a28613398 100644 (file)
--- a/src/librustc_passes/check_const.rs
+++ b/src/librustc_passes/check_const.rs
@@ -9,16 +9,15 @@
 
 use rustc::hir::map::Map;
 use rustc::session::config::nightly_options;
+use rustc::session::parse::feature_err;
 use rustc::ty::query::Providers;
 use rustc::ty::TyCtxt;
-use rustc_error_codes::*;
 use rustc_errors::struct_span_err;
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
 use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
 use rustc_span::{sym, Span, Symbol};
 use syntax::ast::Mutability;
-use syntax::feature_gate::feature_err;
 
 use std::fmt;