about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Woerister <michaelwoerister@posteo>2017-11-13 15:48:52 +0100
committerMichael Woerister <michaelwoerister@posteo>2017-11-13 15:48:52 +0100
commit9ac102645fd6413ae460b34ec4c06eec25979355 (patch)
tree52408334d05fcb56c01d04866200e93ebf17e87b
parentbc96d9d8c9d7c476cfbbb758b1fde6826ae65980 (diff)
downloadrust-9ac102645fd6413ae460b34ec4c06eec25979355.tar.gz
rust-9ac102645fd6413ae460b34ec4c06eec25979355.zip
incr.comp.: Properly use ty::codec::decode_cnum() in rustc_metadata::decoder.
-rw-r--r--src/librustc_metadata/decoder.rs7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/librustc_metadata/decoder.rs b/src/librustc_metadata/decoder.rs
index 5fee7173c87..83d0a1fdfdb 100644
--- a/src/librustc_metadata/decoder.rs
+++ b/src/librustc_metadata/decoder.rs
@@ -295,12 +295,7 @@ impl<'a, 'tcx, T> SpecializedDecoder<LazySeq<T>> for DecodeContext<'a, 'tcx> {
 
 impl<'a, 'tcx> SpecializedDecoder<CrateNum> for DecodeContext<'a, 'tcx> {
     fn specialized_decode(&mut self) -> Result<CrateNum, Self::Error> {
-        let cnum = CrateNum::from_u32(u32::decode(self)?);
-        if cnum == LOCAL_CRATE {
-            Ok(self.cdata().cnum)
-        } else {
-            Ok(self.cdata().cnum_map.borrow()[cnum])
-        }
+        ty_codec::decode_cnum(self)
     }
 }