---

yaml
---
r: 103417
b: refs/heads/auto
c: 311ac8f
h: refs/heads/master
i:
  103415: 162be0a
v: v3

Author: alexcrichton

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 58ea029db2fd9da6eac85456191481b4cbdb9e58
+refs/heads/auto: 311ac8f480917f2dccb98b0dd08342b18208e477
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/mk/clean.mk

@@ -58,7 +58,6 @@ clean-generic-$(2)-$(1):
          -name '*.[odasS]' -o \
          -name '*.so' -o      \
          -name '*.dylib' -o   \
-         -name '*.rlib' -o   \
          -name 'stamp.*' -o   \
          -name '*.lib' -o     \
          -name '*.dll' -o     \

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

@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+
 use back::archive::{Archive, METADATA_FILENAME};
 use back::rpath;
-use back::svh::Svh;
 use driver::driver::{CrateTranslation, OutputFilenames};
 use driver::session::Session;
 use driver::session;
@@ -499,31 +499,28 @@ pub mod write {
  *    system linkers understand.
  */
 
-pub fn find_crate_id(attrs: &[ast::Attribute],
-                     output: &OutputFilenames) -> CrateId {
-    match attr::find_crateid(attrs) {
+pub fn build_link_meta(attrs: &[ast::Attribute],
+                       output: &OutputFilenames,
+                       symbol_hasher: &mut Sha256)
+                       -> LinkMeta {
+    // This calculates CMH as defined above
+    fn crate_hash(symbol_hasher: &mut Sha256, crateid: &CrateId) -> ~str {
+        symbol_hasher.reset();
+        symbol_hasher.input_str(crateid.to_str());
+        truncated_hash_result(symbol_hasher)
+    }
+
+    let crateid = match attr::find_crateid(attrs) {
         None => from_str(output.out_filestem).unwrap(),
         Some(s) => s,
-    }
-}
+    };
 
-pub fn crate_id_hash(crate_id: &CrateId) -> ~str {
-    // This calculates CMH as defined above. Note that we don't use the path of
-    // the crate id in the hash because lookups are only done by (name/vers),
-    // not by path.
-    let mut s = Sha256::new();
-    s.input_str(crate_id.short_name_with_version());
-    truncated_hash_result(&mut s).slice_to(8).to_owned()
-}
+    let hash = crate_hash(symbol_hasher, &crateid);
 
-pub fn build_link_meta(krate: &ast::Crate,
-                       output: &OutputFilenames) -> LinkMeta {
-    let r = LinkMeta {
-        crateid: find_crate_id(krate.attrs, output),
-        crate_hash: Svh::calculate(krate),
-    };
-    info!("{}", r);
-    return r;
+    LinkMeta {
+        crateid: crateid,
+        crate_hash: hash,
+    }
 }
 
 fn truncated_hash_result(symbol_hasher: &mut Sha256) -> ~str {
@@ -542,7 +539,7 @@ fn symbol_hash(tcx: ty::ctxt, symbol_hasher: &mut Sha256,
     symbol_hasher.reset();
     symbol_hasher.input_str(link_meta.crateid.name);
     symbol_hasher.input_str("-");
-    symbol_hasher.input_str(link_meta.crate_hash.as_str());
+    symbol_hasher.input_str(link_meta.crate_hash);
     symbol_hasher.input_str("-");
     symbol_hasher.input_str(encoder::encoded_ty(tcx, t));
     let mut hash = truncated_hash_result(symbol_hasher);
@@ -715,8 +712,11 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> ~str
     mangle(path.chain(Some(gensym_name(flav)).move_iter()), None, None)
 }
 
-pub fn output_lib_filename(id: &CrateId) -> ~str {
-    format!("{}-{}-{}", id.name, crate_id_hash(id), id.version_or_default())
+pub fn output_lib_filename(lm: &LinkMeta) -> ~str {
+    format!("{}-{}-{}",
+            lm.crateid.name,
+            lm.crate_hash.slice_chars(0, 8),
+            lm.crateid.version_or_default())
 }
 
 pub fn get_cc_prog(sess: Session) -> ~str {
@@ -779,11 +779,11 @@ fn remove(sess: Session, path: &Path) {
 pub fn link_binary(sess: Session,
                    trans: &CrateTranslation,
                    outputs: &OutputFilenames,
-                   id: &CrateId) -> ~[Path] {
+                   lm: &LinkMeta) -> ~[Path] {
     let mut out_filenames = ~[];
     let crate_types = sess.crate_types.borrow();
     for &crate_type in crate_types.get().iter() {
-        let out_file = link_binary_output(sess, trans, crate_type, outputs, id);
+        let out_file = link_binary_output(sess, trans, crate_type, outputs, lm);
         out_filenames.push(out_file);
     }
 
@@ -807,8 +807,8 @@ fn is_writeable(p: &Path) -> bool {
 }
 
 pub fn filename_for_input(sess: &Session, crate_type: session::CrateType,
-                          id: &CrateId, out_filename: &Path) -> Path {
-    let libname = output_lib_filename(id);
+                          lm: &LinkMeta, out_filename: &Path) -> Path {
+    let libname = output_lib_filename(lm);
     match crate_type {
         session::CrateTypeRlib => {
             out_filename.with_filename(format!("lib{}.rlib", libname))
@@ -834,13 +834,13 @@ fn link_binary_output(sess: Session,
                       trans: &CrateTranslation,
                       crate_type: session::CrateType,
                       outputs: &OutputFilenames,
-                      id: &CrateId) -> Path {
+                      lm: &LinkMeta) -> Path {
     let obj_filename = outputs.temp_path(OutputTypeObject);
     let out_filename = match outputs.single_output_file {
         Some(ref file) => file.clone(),
         None => {
             let out_filename = outputs.path(OutputTypeExe);
-            filename_for_input(&sess, crate_type, id, &out_filename)
+            filename_for_input(&sess, crate_type, lm, &out_filename)
         }
     };
 

branches/auto/src/librustc/back/svh.rs

@@ -433,7 +433,7 @@ pub fn phase_6_link_output(sess: Session,
          link::link_binary(sess,
                            trans,
                            outputs,
-                           &trans.link.crateid));
+                           &trans.link));
 }
 
 pub fn stop_after_phase_3(sess: Session) -> bool {
@@ -472,7 +472,8 @@ fn write_out_deps(sess: Session,
                   input: &Input,
                   outputs: &OutputFilenames,
                   krate: &ast::Crate) -> io::IoResult<()> {
-    let id = link::find_crate_id(krate.attrs, outputs);
+    let lm = link::build_link_meta(krate.attrs, outputs,
+                                   &mut ::util::sha2::Sha256::new());
 
     let mut out_filenames = ~[];
     for output_type in sess.opts.output_types.iter() {
@@ -481,7 +482,7 @@ fn write_out_deps(sess: Session,
             link::OutputTypeExe => {
                 let crate_types = sess.crate_types.borrow();
                 for output in crate_types.get().iter() {
-                    let p = link::filename_for_input(&sess, *output, &id, &file);
+                    let p = link::filename_for_input(&sess, *output, &lm, &file);
                     out_filenames.push(p);
                 }
             }

branches/auto/src/librustc/driver/driver.rs

@@ -55,6 +55,7 @@ use std::str;
 use std::task;
 use std::vec;
 use syntax::ast;
+use syntax::attr;
 use syntax::diagnostic::Emitter;
 use syntax::diagnostic;
 use syntax::parse;
@@ -103,17 +104,16 @@ pub mod front {
 }
 
 pub mod back {
-    pub mod abi;
     pub mod archive;
-    pub mod arm;
     pub mod link;
-    pub mod lto;
+    pub mod abi;
+    pub mod arm;
     pub mod mips;
-    pub mod rpath;
-    pub mod svh;
-    pub mod target_strs;
     pub mod x86;
     pub mod x86_64;
+    pub mod rpath;
+    pub mod target_strs;
+    pub mod lto;
 }
 
 pub mod metadata;
@@ -312,18 +312,28 @@ pub fn run_compiler(args: &[~str]) {
         let attrs = parse_crate_attrs(sess, &input);
         let t_outputs = d::build_output_filenames(&input, &odir, &ofile,
                                                   attrs, sess);
-        let id = link::find_crate_id(attrs, &t_outputs);
-
-        if crate_id {
-            println!("{}", id.to_str());
-        }
-        if crate_name {
-            println!("{}", id.name);
+        if crate_id || crate_name {
+            let crateid = match attr::find_crateid(attrs) {
+                Some(crateid) => crateid,
+                None => {
+                    sess.fatal("No crate_id and --crate-id or \
+                                --crate-name requested")
+                }
+            };
+            if crate_id {
+                println!("{}", crateid.to_str());
+            }
+            if crate_name {
+                println!("{}", crateid.name);
+            }
         }
+
         if crate_file_name {
+            let lm = link::build_link_meta(attrs, &t_outputs,
+                                           &mut ::util::sha2::Sha256::new());
             let crate_types = session::collect_crate_types(&sess, attrs);
             for &style in crate_types.iter() {
-                let fname = link::filename_for_input(&sess, style, &id,
+                let fname = link::filename_for_input(&sess, style, &lm,
                                                      &t_outputs.with_extension(""));
                 println!("{}", fname.filename_display());
             }

branches/auto/src/librustc/lib.rs

@@ -12,7 +12,6 @@
 
 use std::cast;
 use syntax::crateid::CrateId;
-use back::svh::Svh;
 
 // EBML enum definitions and utils shared by the encoder and decoder
 
@@ -71,12 +70,12 @@ pub static tag_crate_deps: uint = 0x18;
 pub static tag_crate_dep: uint = 0x19;
 
 pub static tag_crate_hash: uint = 0x1a;
-pub static tag_crate_crateid: uint = 0x1b;
 
-pub static tag_parent_item: uint = 0x1c;
+pub static tag_parent_item: uint = 0x1b;
 
-pub static tag_crate_dep_crateid: uint = 0x1d;
-pub static tag_crate_dep_hash: uint = 0x1e;
+pub static tag_crate_dep_name: uint = 0x1c;
+pub static tag_crate_dep_hash: uint = 0x1d;
+pub static tag_crate_dep_vers: uint = 0x1e;
 
 pub static tag_mod_impl: uint = 0x1f;
 
@@ -208,8 +207,8 @@ pub static tag_macro_registrar_fn: uint = 0x63;
 pub static tag_exported_macros: uint = 0x64;
 pub static tag_macro_def: uint = 0x65;
 
-#[deriving(Clone, Show)]
+#[deriving(Clone)]
 pub struct LinkMeta {
     crateid: CrateId,
-    crate_hash: Svh,
+    crate_hash: ~str,
 }