Updated tests for flatten

test_suite/tests/compile-fail/conflict/collect-into-wrong-type.rs

@@ -1,19 +0,0 @@
-// Copyright 2018 Serde Developers
-//
-// 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.
-
-#[macro_use]
-extern crate serde_derive;
-
-#[derive(Serialize)] //~ ERROR: the trait bound `&std::string::String: std::iter::Iterator` is not satisfied
-#[serde(repr = "map", unknown_fields_into="other")]
-struct X {
-    a: u32,
-    other: String,
-}
-
-fn main() {}

test_suite/tests/compile-fail/conflict/repr-collect-struct.rs

@@ -1,20 +0,0 @@
-// Copyright 2018 Serde Developers
-//
-// 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.
-
-#[macro_use]
-extern crate serde_derive;
-
-#[derive(Serialize)] //~ ERROR: proc-macro derive panicked
-#[serde(repr = "struct", unknown_fields_into="other")]
-//~^^ HELP: #[serde(unknown_fields_into)] requires repr="map"
-struct X {
-    a: u32,
-    other: HashMap<String, String>,
-}
-
-fn main() {}

test_suite/tests/test_annotations.rs

@@ -96,10 +96,11 @@ where
 }
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
-#[serde(repr="map", unknown_fields_into="extra")]
+#[serde(repr="map")]
 struct CollectOther {
     a: u32,
     b: u32,
+    #[serde(flatten)]
     extra: HashMap<String, u32>,
 }