From 9ebc97a4cc432f4b8dcc652db0f2125880433045 Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com>
Date: Mon, 1 Apr 2019 15:13:08 -0400
Subject: [PATCH] Fix tests

---
 src/librustc/session/config.rs | 35 +++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
index 3efb1e8a72300..a36d9839781cf 100644
--- a/src/librustc/session/config.rs
+++ b/src/librustc/session/config.rs
@@ -276,6 +276,15 @@ pub struct ExternEntry {
     pub public: bool
 }
 
+impl ExternEntry {
+    pub fn new_public(location: Option<String>) -> ExternEntry {
+        ExternEntry {
+            location,
+            public: true
+        }
+    }
+}
+
 impl Externs {
     pub fn new(data: BTreeMap<String, BTreeSet<ExternEntry>>) -> Externs {
         Externs(data)
@@ -2677,7 +2686,7 @@ mod tests {
         build_session_options_and_crate_config,
         to_crate_config
     };
-    use crate::session::config::{LtoCli, LinkerPluginLto};
+    use crate::session::config::{LtoCli, LinkerPluginLto, ExternEntry};
     use crate::session::build_session;
     use crate::session::search_paths::SearchPath;
     use std::collections::{BTreeMap, BTreeSet};
@@ -2823,33 +2832,45 @@ mod tests {
         v1.externs = Externs::new(mk_map(vec![
             (
                 String::from("a"),
-                mk_set(vec![Some(String::from("b")), Some(String::from("c"))]),
+                mk_set(vec![ExternEntry::new_public(Some(String::from("b"))),
+                            ExternEntry::new_public(Some(String::from("c")))
+                            ]),
             ),
             (
                 String::from("d"),
-                mk_set(vec![Some(String::from("e")), Some(String::from("f"))]),
+                mk_set(vec![ExternEntry::new_public(Some(String::from("e"))),
+                            ExternEntry::new_public(Some(String::from("f")))
+                            ]),
             ),
         ]));
 
         v2.externs = Externs::new(mk_map(vec![
             (
                 String::from("d"),
-                mk_set(vec![Some(String::from("e")), Some(String::from("f"))]),
+                mk_set(vec![ExternEntry::new_public(Some(String::from("e"))),
+                            ExternEntry::new_public(Some(String::from("f")))
+                            ]),
             ),
             (
                 String::from("a"),
-                mk_set(vec![Some(String::from("b")), Some(String::from("c"))]),
+                mk_set(vec![ExternEntry::new_public(Some(String::from("b"))),
+                            ExternEntry::new_public(Some(String::from("c")))
+                            ]),
             ),
         ]));
 
         v3.externs = Externs::new(mk_map(vec![
             (
                 String::from("a"),
-                mk_set(vec![Some(String::from("b")), Some(String::from("c"))]),
+                mk_set(vec![ExternEntry::new_public(Some(String::from("b"))),
+                            ExternEntry::new_public(Some(String::from("c")))
+                            ]),
             ),
             (
                 String::from("d"),
-                mk_set(vec![Some(String::from("f")), Some(String::from("e"))]),
+                mk_set(vec![ExternEntry::new_public(Some(String::from("f"))),
+                            ExternEntry::new_public(Some(String::from("e")))
+                            ]),
             ),
         ]));