Merge pull request #1498 from dtolnay/primitives

Generate indirect placement for shared structs containing primitives

Author: dtolnay

Diff for: gen/src/mod.rs

@@ -14,7 +14,6 @@ mod names;
 mod namespace;
 mod nested;
 pub(super) mod out;
-mod primitive;
 mod write;
 
 use self::cfg::UnsupportedCfgEvaluator;

Diff for: gen/src/write.rs

@@ -1,11 +1,11 @@
 use crate::gen::block::Block;
 use crate::gen::nested::NamespaceEntries;
 use crate::gen::out::OutFile;
-use crate::gen::primitive::{self, PrimitiveKind};
 use crate::gen::{builtin, include, Opt};
 use crate::syntax::atom::Atom::{self, *};
 use crate::syntax::instantiate::{ImplKey, NamedImplKey};
 use crate::syntax::map::UnorderedMap as Map;
+use crate::syntax::primitive::{self, PrimitiveKind};
 use crate::syntax::set::UnorderedSet;
 use crate::syntax::symbol::{self, Symbol};
 use crate::syntax::trivial::{self, TrivialReason};

Diff for: syntax/mod.rs

@@ -19,6 +19,7 @@ mod names;
 pub(crate) mod namespace;
 mod parse;
 mod pod;
+pub(crate) mod primitive;
 pub(crate) mod qualified;
 pub(crate) mod report;
 pub(crate) mod resolve;

Diff for: syntax/pod.rs

@@ -1,5 +1,5 @@
 use crate::syntax::atom::Atom::{self, *};
-use crate::syntax::{derive, Trait, Type, Types};
+use crate::syntax::{primitive, Type, Types};
 
 impl<'a> Types<'a> {
     pub(crate) fn is_guaranteed_pod(&self, ty: &Type) -> bool {
@@ -13,11 +13,9 @@ impl<'a> Types<'a> {
                         CxxString | RustString => false,
                     }
                 } else if let Some(strct) = self.structs.get(ident) {
-                    derive::contains(&strct.derives, Trait::Copy)
-                        || strct
-                            .fields
-                            .iter()
-                            .all(|field| self.is_guaranteed_pod(&field.ty))
+                    strct.fields.iter().all(|field| {
+                        primitive::kind(&field.ty).is_none() && self.is_guaranteed_pod(&field.ty)
+                    })
                 } else {
                     self.enums.contains_key(ident)
                 }