-use rustc::hir;
-use rustc::hir::def_id::DefId;
-use rustc::hir::itemlikevisit::ItemLikeVisitor;
-use rustc::hir::ItemKind;
use rustc::ty::layout::HasDataLayout;
+use rustc::ty::layout::HasParamEnv;
use rustc::ty::layout::HasTyCtxt;
use rustc::ty::layout::LayoutOf;
use rustc::ty::layout::TargetDataLayout;
use rustc::ty::layout::TyLayout;
-use rustc::ty::layout::HasParamEnv;
use rustc::ty::ParamEnv;
use rustc::ty::Ty;
use rustc::ty::TyCtxt;
+use rustc_hir as hir;
+use rustc_hir::def_id::DefId;
+use rustc_hir::itemlikevisit::ItemLikeVisitor;
+use rustc_hir::ItemKind;
+use rustc_span::symbol::sym;
use syntax::ast::Attribute;
-use syntax::symbol::sym;
pub fn test_layout(tcx: TyCtxt<'_>) {
if tcx.features().rustc_attrs {
// if the `rustc_attrs` feature is not enabled, don't bother testing layout
- tcx.hir()
- .krate()
- .visit_all_item_likes(&mut VarianceTest { tcx });
+ tcx.hir().krate().visit_all_item_likes(&mut VarianceTest { tcx });
}
}
for meta_item in meta_items {
match meta_item.name_or_empty() {
sym::abi => {
- self.tcx
- .sess
- .span_err(item.span, &format!("abi: {:?}", ty_layout.abi));
+ self.tcx.sess.span_err(item.span, &format!("abi: {:?}", ty_layout.abi));
}
sym::align => {
}
Err(layout_error) => {
- self.tcx
- .sess
- .span_err(item.span, &format!("layout error: {:?}", layout_error));
+ self.tcx.sess.span_err(item.span, &format!("layout error: {:?}", layout_error));
}
}
}