Skip to content

Commit

Permalink
E0493: showing a label where the destructor is defined.
Browse files Browse the repository at this point in the history
  • Loading branch information
razielgn committed Sep 2, 2016
1 parent 638b7c8 commit ed5e5df
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 0 deletions.
29 changes: 29 additions & 0 deletions src/librustc_mir/transform/qualify_consts.rs
Expand Up @@ -18,6 +18,7 @@ use rustc_data_structures::bitvec::BitVector;
use rustc_data_structures::indexed_vec::{IndexVec, Idx};
use rustc::dep_graph::DepNode;
use rustc::hir;
use rustc::hir::map as hir_map;
use rustc::hir::def_id::DefId;
use rustc::hir::intravisit::FnKind;
use rustc::hir::map::blocks::FnLikeNode;
Expand Down Expand Up @@ -258,12 +259,40 @@ impl<'a, 'tcx> Qualifier<'a, 'tcx, 'tcx> {
"in Nightly builds, add `#![feature(drop_types_in_const)]` \
to the crate attributes to enable");
} else {
self.find_drop_implementation_method_span()
.map(|span| err.span_label(span, &format!("destructor defined here")));

err.span_label(self.span, &format!("constants cannot have destructors"));
}

err.emit();
}

fn find_drop_implementation_method_span(&self) -> Option<Span> {
self.tcx.lang_items
.drop_trait()
.and_then(|drop_trait_id| {
let mut span = None;

self.tcx
.lookup_trait_def(drop_trait_id)
.for_each_relevant_impl(self.tcx, self.mir.return_ty, |impl_did| {
self.tcx.map
.as_local_node_id(impl_did)
.and_then(|impl_node_id| self.tcx.map.find(impl_node_id))
.map(|node| {
if let hir_map::NodeItem(item) = node {
if let hir::ItemImpl(_, _, _, _, _, ref methods) = item.node {
span = methods.first().map(|method| method.span);
}
}
});
});

span
})
}

/// Check if an Lvalue with the current qualifications could
/// be consumed, by either an operand or a Deref projection.
fn try_consume(&mut self) -> bool {
Expand Down
9 changes: 9 additions & 0 deletions src/test/compile-fail/E0493.rs
Expand Up @@ -14,6 +14,15 @@ struct Foo {

impl Drop for Foo {
fn drop(&mut self) {}
//~^ NOTE destructor defined here
}

struct Bar {
a: u32
}

impl Drop for Bar {
fn drop(&mut self) {}
}

const F : Foo = Foo { a : 0 };
Expand Down

0 comments on commit ed5e5df

Please sign in to comment.