Skip to content

Commit

Permalink
don't crash when there are multiple conflicting implementations of Drop
Browse files Browse the repository at this point in the history
Fixes #28568
  • Loading branch information
arielb1 committed Sep 26, 2015
1 parent f9b703e commit 9a86713
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
1 change: 0 additions & 1 deletion src/librustc/middle/ty/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1695,7 +1695,6 @@ impl<'tcx, 'container> AdtDefData<'tcx, 'container> {
}

pub fn set_destructor(&self, dtor: DefId) {
assert!(self.destructor.get().is_none());
self.destructor.set(Some(dtor));
}

Expand Down
23 changes: 23 additions & 0 deletions src/test/compile-fail/issue-28568.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

struct MyStruct;

impl Drop for MyStruct {
//~^ ERROR conflicting implementations for trait
fn drop(&mut self) { }
}

impl Drop for MyStruct {
//~^ NOTE conflicting implementation here
fn drop(&mut self) { }
}

fn main() {}

0 comments on commit 9a86713

Please sign in to comment.