---

yaml
---
r: 12779
b: refs/heads/master
c: ecf290d
h: refs/heads/master
i:
  12777: 14cfa04
  12775: 2f5863b
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a6b9fa0cd1a6eb29a127e05d10910d8b8f194f59
+refs/heads/master: ecf290d448e1b46e073bd8727c04156a06948bf5
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/metadata.rs

@@ -0,0 +1,47 @@
+// Define the rustc API's that the metadata module has access to
+// Over time we will reduce these dependencies and, once metadata has
+// no dependencies on rustc it can move into its own crate.
+
+mod middle {
+    import ast_map = middle_::ast_map;
+    export ast_map;
+    import ty = middle_::ty;
+    export ty;
+    import trans = middle_::trans;
+    export trans;
+    import typeck = middle_::typeck;
+    export typeck;
+    import last_use = middle_::last_use;
+    export last_use;
+    import freevars = middle_::freevars;
+    export freevars;
+    import resolve = middle_::resolve;
+    export resolve;
+}
+
+mod front {
+}
+
+mod back {
+}
+
+mod driver {
+    import session = driver_::session;
+    export session;
+    import diagnostic = rustsyntax::diagnostic;
+    export diagnostic;
+}
+
+mod util {
+    import common = util_::common;
+    export common;
+    import ppaux = util_::ppaux;
+    export ppaux;
+    import filesearch = util_::filesearch;
+    export filesearch;
+}
+
+mod lib {
+    import llvm = lib_::llvm;
+    export llvm;
+}

trunk/src/rustc/rustc.rc

@@ -17,6 +17,18 @@ use rustsyntax(vers = "0.2");
 
 import core::*;
 
+/*
+Alternate names for some modules.
+
+I am using this to help extract metadata into its own crate. In metadata.rs
+it redefines all these modules in order to gate access from metadata to the
+rest of the compiler, then uses these to access the original implementation.
+*/
+import util_ = util;
+import lib_ = lib;
+import driver_ = driver;
+import middle_ = middle;
+
 mod middle {
     mod trans {
         mod common;