---

yaml
---
r: 146502
b: refs/heads/try2
c: 8e1de17
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: dc5d9b908f776bd2a18a8b30f558b6c1cc3f779d
+refs/heads/try2: 8e1de17757a204948b8d0ead4990b2602bc81298
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libextra/getopts.rs

@@ -185,14 +185,18 @@ impl Name {
 }
 
 impl Matches {
-    fn opt_vals(&self, nm: &str) -> ~[Optval] {
+    /// FIXME: #9311 This used to be private, but rustpkg somehow managed to depend on it.
+    /// No idea what this does.
+    pub fn opt_vals(&self, nm: &str) -> ~[Optval] {
         match find_opt(self.opts, Name::from_str(nm)) {
             Some(id) => self.vals[id].clone(),
             None => fail!("No option '{}' defined", nm)
         }
     }
 
-    fn opt_val(&self, nm: &str) -> Option<Optval> {
+    /// FIXME: #9311 This used to be private, but rustpkg somehow managed to depend on it.
+    /// No idea what this does.
+    pub fn opt_val(&self, nm: &str) -> Option<Optval> {
         let vals = self.opt_vals(nm);
         if (vals.is_empty()) {
             None

branches/try2/src/libextra/lib.rs

@@ -21,7 +21,6 @@ Rust extras are part of the standard Rust distribution.
 */
 
 #[link(name = "extra",
-       package_id = "extra",
        vers = "0.9-pre",
        uuid = "122bed0b-c19b-4b82-b0b7-7ae8aead7297",
        url = "https://github.com/mozilla/rust/tree/master/src/libextra")];

branches/try2/src/librustc/back/link.rs

@@ -634,18 +634,6 @@ pub fn build_link_meta(sess: Session,
         }
     }
 
-    fn crate_meta_pkgid(sess: Session, name: @str, opt_pkg_id: Option<@str>)
-        -> @str {
-        match opt_pkg_id {
-            Some(v) if !v.is_empty() => v,
-            _ => {
-                let pkg_id = name.clone();
-                warn_missing(sess, "package_id", pkg_id);
-                pkg_id
-            }
-        }
-    }
-
     let ProvidedMetas {
         name: opt_name,
         vers: opt_vers,
@@ -654,16 +642,15 @@ pub fn build_link_meta(sess: Session,
     } = provided_link_metas(sess, c);
     let name = crate_meta_name(sess, output, opt_name);
     let vers = crate_meta_vers(sess, opt_vers);
-    let pkg_id = crate_meta_pkgid(sess, name, opt_pkg_id);
     let dep_hashes = cstore::get_dep_hashes(sess.cstore);
     let extras_hash =
         crate_meta_extras_hash(symbol_hasher, cmh_items,
-                               dep_hashes, Some(pkg_id));
+                               dep_hashes, opt_pkg_id);
 
     LinkMeta {
         name: name,
         vers: vers,
-        package_id: Some(pkg_id),
+        package_id: opt_pkg_id,
         extras_hash: extras_hash
     }
 }

branches/try2/src/librustc/driver/driver.rs

@@ -239,6 +239,9 @@ pub fn phase_3_run_analysis_passes(sess: Session,
         time(time_passes, "resolution", (), |_|
              middle::resolve::resolve_crate(sess, lang_items, crate));
 
+    let named_region_map = time(time_passes, "lifetime resolution", (),
+                                |_| middle::resolve_lifetime::crate(sess, crate));
+
     time(time_passes, "looking for entry point", (),
          |_| middle::entry::find_entry_point(sess, crate, ast_map));
 
@@ -251,8 +254,8 @@ pub fn phase_3_run_analysis_passes(sess: Session,
     let rp_set = time(time_passes, "region parameterization inference", (), |_|
                       middle::region::determine_rp_in_crate(sess, ast_map, def_map, crate));
 
-    let ty_cx = ty::mk_ctxt(sess, def_map, ast_map, freevars,
-                            region_map, rp_set, lang_items);
+    let ty_cx = ty::mk_ctxt(sess, def_map, named_region_map, ast_map, freevars,
+                            region_map, lang_items);
 
     // passes are timed inside typeck
     let (method_map, vtable_map) = typeck::check_crate(

branches/try2/src/librustc/lib.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 #[link(name = "rustc",
-       package_id = "rustc",
        vers = "0.9-pre",
        uuid = "0ce89b41-2f92-459e-bbc1-8f5fe32f16cf",
        url = "https://github.com/mozilla/rust/tree/master/src/rustc")];

branches/try2/src/librustc/metadata/encoder.rs

@@ -1487,8 +1487,8 @@ fn encode_attributes(ebml_w: &mut writer::Encoder, attrs: &[Attribute]) {
 
 // So there's a special crate attribute called 'link' which defines the
 // metadata that Rust cares about for linking crates. This attribute requires
-// 'name', 'vers' and 'package_id' items, so if the user didn't provide them we
-// will throw them in anyway with default values.
+// 'name' and 'vers' items, so if the user didn't provide them we will throw
+// them in anyway with default values.
 fn synthesize_crate_attrs(ecx: &EncodeContext,
                           crate: &Crate) -> ~[Attribute] {
 
@@ -1505,20 +1505,9 @@ fn synthesize_crate_attrs(ecx: &EncodeContext,
             attr::mk_name_value_item_str(@"vers",
                                          ecx.link_meta.vers);
 
-        let pkgid_item = match ecx.link_meta.package_id {
-                Some(pkg_id) =>  attr::mk_name_value_item_str(@"package_id",
-                                                              pkg_id),
-                // uses package_id equal to name;
-                // this should never happen here but package_id is an Option
-                // FIXME (#10370): change package_id in LinkMeta to @str instead of Option<@str>
-                _ => attr::mk_name_value_item_str(@"package_id",
-                                                  ecx.link_meta.name)
-        };
-
-        let mut meta_items = ~[name_item, vers_item, pkgid_item];
+        let mut meta_items = ~[name_item, vers_item];
 
-        for &mi in items.iter().filter(|mi| "name" != mi.name() && "vers" != mi.name() &&
-                                            "package_id" != mi.name()) {
+        for &mi in items.iter().filter(|mi| "name" != mi.name() && "vers" != mi.name()) {
             meta_items.push(mi);
         }
         let link_item = attr::mk_list_item(@"link", meta_items);