-
Notifications
You must be signed in to change notification settings - Fork 12.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove destructor-related restrictions from unions #38934
Merged
+68
−0
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
// Copyright 2016 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. | ||
|
||
#![feature(core_intrinsics)] | ||
#![feature(untagged_unions)] | ||
|
||
#![allow(unions_with_drop_fields)] | ||
#![allow(dead_code)] | ||
|
||
use std::intrinsics::needs_drop; | ||
|
||
// drop types in destructors should not require | ||
// drop_types_in_const | ||
static X: Option<NoDrop<Box<u8>>> = None; | ||
|
||
// A union that scrubs the drop glue from its inner type | ||
union NoDrop<T> {inner: T} | ||
|
||
// Copy currently can't be implemented on drop-containing unions, | ||
// this may change later | ||
// https://github.com/rust-lang/rust/pull/38934#issuecomment-271219289 | ||
|
||
// // We should be able to implement Copy for NoDrop | ||
// impl<T> Copy for NoDrop<T> {} | ||
// impl<T> Clone for NoDrop<T> {fn clone(&self) -> Self { *self }} | ||
|
||
// // We should be able to implement Copy for things using NoDrop | ||
// #[derive(Copy, Clone)] | ||
struct Foo { | ||
x: NoDrop<Box<u8>> | ||
} | ||
|
||
struct Baz { | ||
x: NoDrop<Box<u8>>, | ||
y: Box<u8>, | ||
} | ||
|
||
union ActuallyDrop<T> {inner: T} | ||
|
||
impl<T> Drop for ActuallyDrop<T> { | ||
fn drop(&mut self) {} | ||
} | ||
|
||
fn main() { | ||
unsafe { | ||
// NoDrop should not make needs_drop true | ||
assert!(!needs_drop::<Foo>()); | ||
assert!(!needs_drop::<NoDrop<u8>>()); | ||
assert!(!needs_drop::<NoDrop<Box<u8>>>()); | ||
// presence of other drop types should still work | ||
assert!(needs_drop::<Baz>()); | ||
// drop impl on union itself should work | ||
assert!(needs_drop::<ActuallyDrop<u8>>()); | ||
assert!(needs_drop::<ActuallyDrop<Box<u8>>>()); | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you add a test checking that
needs_drop
still returnstrue
on unions that implementDrop
themselves?I suspect the condition should be
def.is_union() && !def.has_dtor()
instead of justdef.is_union()
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The destructor is added below IIRC.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nah, that bit gets re-added below.