Skip to content

Commit 8e8dcb3

Browse files
committed
---
yaml --- r: 236380 b: refs/heads/master c: 9a86713 h: refs/heads/master v: v3
1 parent c273f8c commit 8e8dcb3

File tree

3 files changed

+24
-2
lines changed

3 files changed

+24
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: f9b703e7ab10383236ff687870c186220019f442
2+
refs/heads/master: 9a8671316699d21841d26ab37ba0414d35825222
33
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
44
refs/heads/try: ea3892f76a2180dd4ce724f1dafd9186959702d9
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/src/librustc/middle/ty/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1695,7 +1695,6 @@ impl<'tcx, 'container> AdtDefData<'tcx, 'container> {
16951695
}
16961696

16971697
pub fn set_destructor(&self, dtor: DefId) {
1698-
assert!(self.destructor.get().is_none());
16991698
self.destructor.set(Some(dtor));
17001699
}
17011700

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
struct MyStruct;
12+
13+
impl Drop for MyStruct {
14+
//~^ ERROR conflicting implementations for trait
15+
fn drop(&mut self) { }
16+
}
17+
18+
impl Drop for MyStruct {
19+
//~^ NOTE conflicting implementation here
20+
fn drop(&mut self) { }
21+
}
22+
23+
fn main() {}

0 commit comments

Comments
 (0)