about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2014-07-24 21:35:42 -0700
committerBrian Anderson <banderson@mozilla.com>2014-07-25 14:17:28 -0700
commit8f692e6ab0962470d12c56564d38a41a0b7c82e9 (patch)
tree4e81e8da1380ffa506a4db9061c8ae38ddf640af
parentb9035c26e2c4368b39c8daa979f669d10d484825 (diff)
downloadrust-8f692e6ab0962470d12c56564d38a41a0b7c82e9.tar.gz
rust-8f692e6ab0962470d12c56564d38a41a0b7c82e9.zip
rustc: Future proof runtime injection
Rename and gensym the runtime on import, so that users
can't refer to the `native` crate.

This is unlikely to break code, but users should import the "native" crate directly.

[breaking-change]
-rw-r--r--src/librustc/front/std_inject.rs10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/librustc/front/std_inject.rs b/src/librustc/front/std_inject.rs
index 940112325fd..5dca09faf34 100644
--- a/src/librustc/front/std_inject.rs
+++ b/src/librustc/front/std_inject.rs
@@ -86,9 +86,15 @@ impl<'a> fold::Folder for StandardLibraryInjector<'a> {
             *ty == config::CrateTypeExecutable
         });
         if use_start(&krate) && any_exe {
+            let visible_rt_name = "rt";
+            let actual_rt_name = "native";
+            // Gensym the ident so it can't be named
+            let visible_rt_name = token::gensym_ident(visible_rt_name);
+            let actual_rt_name = token::intern_and_get_ident(actual_rt_name);
+
             vis.push(ast::ViewItem {
-                node: ast::ViewItemExternCrate(token::str_to_ident("native"),
-                                               None,
+                node: ast::ViewItemExternCrate(visible_rt_name,
+                                               Some((actual_rt_name, ast::CookedStr)),
                                                ast::DUMMY_NODE_ID),
                 attrs: Vec::new(),
                 vis: ast::Inherited,