Rollup merge of #69624 - ehuss:toolstate-beta-regress, r=Mark-Simulacrum

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

diff --git a/src/librustc_passes/stability.rs b/src/librustc_passes/stability.rs
index 99fbac4568e4f3414ca12c98679d79f26ea9b61b..f075385ae18b9ac18baf1e8f9cccd58dd3446537 100644 (file)
--- a/src/librustc_passes/stability.rs
+++ b/src/librustc_passes/stability.rs
@@ -9,6 +9,7 @@
 use rustc::session::Session;
 use rustc::ty::query::Providers;
 use rustc::ty::TyCtxt;
+use rustc_ast::ast::Attribute;
 use rustc_attr::{self as attr, ConstStability, Stability};
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_errors::struct_span_err;
@@ -20,7 +21,6 @@
 use rustc_infer::traits::misc::can_type_implement_copy;
 use rustc_span::symbol::{sym, Symbol};
 use rustc_span::Span;
-use syntax::ast::Attribute;
 
 use std::cmp::Ordering;
 use std::mem::replace;
@@ -551,7 +551,7 @@ fn visit_item(&mut self, item: &'tcx hir::Item<'tcx>) {
                     .emit();
                 } else {
                     let param_env = self.tcx.param_env(def_id);
-                    if !can_type_implement_copy(self.tcx, param_env, ty).is_ok() {
+                    if can_type_implement_copy(self.tcx, param_env, ty).is_err() {
                         feature_err(
                             &self.tcx.sess.parse_sess,
                             sym::untagged_unions,