---

yaml
---
r: 180119
b: refs/heads/auto
c: 4ef4ddd757f93fee4e5bf8aafd3e9233ea9df034
h: refs/heads/master
i:
  180117: 4b8c271
  180115: b16dd2d
  180111: c562a1e
v: v3

Author: eddyb

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: fa73d1317ab548315678e0da6df18501829dbb64
+refs/heads/auto: 4ef4ddd757f93fee4e5bf8aafd3e9233ea9df034
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/metadata/common.rs

@@ -12,7 +12,6 @@
 
 pub use self::astencode_tag::*;
 
-use std::mem;
 use back::svh::Svh;
 
 // EBML enum definitions and utils shared by the encoder and decoder
@@ -113,7 +112,7 @@ pub const tag_items_data_item_reexport_def_id: uint = 0x39;
 pub const tag_items_data_item_reexport_name: uint = 0x3a;
 
 // used to encode crate_ctxt side tables
-#[derive(Copy, PartialEq)]
+#[derive(Copy, PartialEq, FromPrimitive)]
 #[repr(uint)]
 pub enum astencode_tag { // Reserves 0x40 -- 0x5f
     tag_ast = 0x40,
@@ -146,17 +145,6 @@ pub enum astencode_tag { // Reserves 0x40 -- 0x5f
     tag_table_object_cast_map = 0x58,
 }
 
-static first_astencode_tag: uint = tag_ast as uint;
-static last_astencode_tag: uint = tag_table_object_cast_map as uint;
-impl astencode_tag {
-    pub fn from_uint(value : uint) -> Option<astencode_tag> {
-        let is_a_tag = first_astencode_tag <= value && value <= last_astencode_tag;
-        if !is_a_tag { None } else {
-            Some(unsafe { mem::transmute::<uint, astencode_tag>(value) })
-        }
-    }
-}
-
 pub const tag_item_trait_item_sort: uint = 0x60;
 
 pub const tag_item_trait_parent_sort: uint = 0x61;

branches/auto/src/librustc/middle/astencode.rs

@@ -38,6 +38,7 @@ use syntax::ptr::P;
 use syntax;
 
 use std::old_io::Seek;
+use std::num::FromPrimitive;
 use std::rc::Rc;
 
 use rbml::io::SeekableMemWriter;
@@ -1847,8 +1848,8 @@ fn decode_side_tables(dcx: &DecodeContext,
         debug!(">> Side table document with tag 0x{:x} \
                 found for id {} (orig {})",
                tag, id, id0);
-
-        match c::astencode_tag::from_uint(tag) {
+        let decoded_tag: Option<c::astencode_tag> = FromPrimitive::from_uint(tag);
+        match decoded_tag {
             None => {
                 dcx.tcx.sess.bug(
                     &format!("unknown tag found in side tables: {:x}",