Revert "Remove all union stuffs"

This reverts commit 888c34ad70.
This rustups to rustc 1.13.0-nightly (70598e04f 2016-09-03).
This commit is contained in:
mcarton 2016-09-04 17:39:48 +02:00
parent 322c1a07ef
commit b82f43f38e
No known key found for this signature in database
GPG Key ID: 5E427C794CBA45E8
5 changed files with 7 additions and 11 deletions

View File

@ -141,7 +141,7 @@ fn check_copy_clone<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, item: &Item, trait_ref
}
match ty.sty {
//FIXME:unions: TypeVariants::TyUnion(..) => return,
TypeVariants::TyUnion(..) => return,
// Some types are not Clone by default but could be cloned “by hand” if necessary
TypeVariants::TyEnum(def, substs) |

View File

@ -215,8 +215,8 @@ fn has_is_empty_impl(cx: &LateContext, id: &DefId) -> bool {
}
ty::TyProjection(_) => ty.ty_to_def_id().map_or(false, |id| has_is_empty_impl(cx, &id)),
ty::TyEnum(id, _) |
ty::TyStruct(id, _) /*FIXME:unions: |
ty::TyUnion(id, _)*/ => has_is_empty_impl(cx, &id.did),
ty::TyStruct(id, _) |
ty::TyUnion(id, _) => has_is_empty_impl(cx, &id.did),
ty::TyArray(..) | ty::TyStr => true,
_ => false,
}

View File

@ -123,7 +123,7 @@ fn check_item(&mut self, cx: &LateContext, it: &hir::Item) {
hir::ItemStruct(..) => "a struct",
hir::ItemTrait(..) => "a trait",
hir::ItemTy(..) => "a type alias",
//FIXME:unions: hir::ItemUnion(..) => "a union",
hir::ItemUnion(..) => "a union",
hir::ItemDefaultImpl(..) |
hir::ItemExternCrate(..) |
hir::ItemForeignMod(..) |

View File

@ -1,7 +1,7 @@
#![feature(plugin)]
#![plugin(clippy)]
//FIXME:unions: #![feature(untagged_unions)]
#![feature(untagged_unions)]
#![deny(warnings)]
#![allow(dead_code)]
@ -47,7 +47,6 @@ impl Clone for Qux {
fn clone(&self) -> Self { Qux }
}
/* FIXME:unions
// looks like unions don't support deriving Clone for now
#[derive(Copy)]
union Union {
@ -61,7 +60,6 @@ fn clone(&self) -> Self {
}
}
}
*/
// See #666
#[derive(Copy)]

View File

@ -4,7 +4,7 @@
#![deny(no_effect, unnecessary_operation)]
#![allow(dead_code)]
#![allow(path_statements)]
//FIXME:unions #![feature(untagged_unions)]
#![feature(untagged_unions)]
struct Unit;
struct Tuple(i32);
@ -16,12 +16,10 @@ enum Enum {
Struct { field: i32 },
}
/*FIXME:unions:
union Union {
a: u8,
b: f64,
}
*/
fn get_number() -> i32 { 0 }
fn get_struct() -> Struct { Struct { field: 0 } }
@ -38,7 +36,7 @@ fn main() {
Tuple(0); //~ERROR statement with no effect
Struct { field: 0 }; //~ERROR statement with no effect
Struct { ..s }; //~ERROR statement with no effect
//FIXME:unions: Union { a: 0 }; // /**FIXME*~***/ ERROR statement with no effect
Union { a: 0 }; //~ERROR statement with no effect
Enum::Tuple(0); //~ERROR statement with no effect
Enum::Struct { field: 0 }; //~ERROR statement with no effect
5 + 6; //~ERROR statement with no effect