diff options
| author | Michael Woerister <michaelwoerister@posteo.net> | 2016-02-26 16:25:25 -0500 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2016-03-25 14:07:18 -0400 |
| commit | 2eebb7b60588902c51d6d8dd9e695c6babaa8aa2 (patch) | |
| tree | 560ad9f8aaef9fed7162961441e0ff7cdfe50197 /src/librustc_metadata/decoder.rs | |
| parent | fafdfa8bdc2cf762d84ca2e18215d3e11caf3af5 (diff) | |
| download | rust-2eebb7b60588902c51d6d8dd9e695c6babaa8aa2.tar.gz rust-2eebb7b60588902c51d6d8dd9e695c6babaa8aa2.zip | |
Make the compiler emit an error if the crate graph contains two crates with the same crate-name and crate-salt but different SVHs.
Diffstat (limited to 'src/librustc_metadata/decoder.rs')
| -rw-r--r-- | src/librustc_metadata/decoder.rs | 4 |
1 files changed, 2 insertions, 2 deletions
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<String> { 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 } |