From 2eebb7b60588902c51d6d8dd9e695c6babaa8aa2 Mon Sep 17 00:00:00 2001 From: Michael Woerister Date: Fri, 26 Feb 2016 16:25:25 -0500 Subject: Make the compiler emit an error if the crate graph contains two crates with the same crate-name and crate-salt but different SVHs. --- src/librustc_metadata/decoder.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/librustc_metadata/decoder.rs') diff --git a/src/librustc_metadata/decoder.rs b/src/librustc_metadata/decoder.rs index f24c489b7c2..79209a7d26d 100644 --- a/src/librustc_metadata/decoder.rs +++ b/src/librustc_metadata/decoder.rs @@ -1297,8 +1297,8 @@ pub fn maybe_get_crate_name(data: &[u8]) -> Option { pub fn get_crate_disambiguator<'a>(data: &'a [u8]) -> &'a str { let crate_doc = rbml::Doc::new(data); - let salt_doc = reader::get_doc(crate_doc, tag_crate_disambiguator); - let slice: &'a str = salt_doc.as_str_slice(); + let disambiguator_doc = reader::get_doc(crate_doc, tag_crate_disambiguator); + let slice: &'a str = disambiguator_doc.as_str_slice(); slice } -- cgit 1.4.1-3-g733a5