---

yaml
---
r: 146302
b: refs/heads/try2
c: 727731f
h: refs/heads/master
v: v3

Author: jld

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 01097cbab00f64b922bcf5b91fb26a68f6d0d9cf
+refs/heads/try2: 727731f89ed5c341237705026f50f5f6a566336d
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libextra/enum_set.rs

@@ -139,7 +139,8 @@ mod test {
 
     use enum_set::*;
 
-    #[deriving(Eq)] #[repr(uint)]
+    #[deriving(Eq)]
+    #[repr(uint)]
     enum Foo {
         A, B, C
     }

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

@@ -111,7 +111,8 @@ pub static tag_items_data_item_reexport_def_id: uint = 0x4e;
 pub static tag_items_data_item_reexport_name: uint = 0x4f;
 
 // used to encode crate_ctxt side tables
-#[deriving(Eq)] #[repr(uint)]
+#[deriving(Eq)]
+#[repr(uint)]
 pub enum astencode_tag { // Reserves 0x50 -- 0x6f
     tag_ast = 0x50,
 

branches/try2/src/librustc/middle/trans/adt.rs

@@ -359,7 +359,7 @@ fn bounds_usable(cx: &mut CrateContext, ity: IntType, bounds: &IntBounds) -> boo
     }
 }
 
-fn ty_of_inttype(ity: IntType) -> ty::t {
+pub fn ty_of_inttype(ity: IntType) -> ty::t {
     match ity {
         attr::SignedInt(t) => ty::mk_mach_int(t),
         attr::UnsignedInt(t) => ty::mk_mach_uint(t)

branches/try2/src/librustc/middle/trans/debuginfo.rs

@@ -109,7 +109,6 @@ use std::libc::{c_uint, c_ulonglong, c_longlong};
 use std::ptr;
 use std::unstable::atomics;
 use std::vec;
-use syntax::attr;
 use syntax::codemap::{Span, Pos};
 use syntax::{ast, codemap, ast_util, ast_map, opt_vec};
 use syntax::parse::token;
@@ -1422,10 +1421,8 @@ fn prepare_enum_metadata(cx: &mut CrateContext,
     let discriminant_type_metadata = |inttype| {
         let discriminant_llvm_type = adt::ll_inttype(cx, inttype);
         let (discriminant_size, discriminant_align) = size_and_align_of(cx, discriminant_llvm_type);
-        let discriminant_base_type_metadata = type_metadata(cx, match inttype {
-            attr::SignedInt(t) => ty::mk_mach_int(t),
-            attr::UnsignedInt(t) => ty::mk_mach_uint(t)
-        }, codemap::dummy_sp());
+        let discriminant_base_type_metadata = type_metadata(cx, adt::ty_of_inttype(inttype),
+                                                            codemap::dummy_sp());
         do enum_name.with_c_str |enum_name| {
             unsafe {
                 llvm::LLVMDIBuilderCreateEnumerationType(

branches/try2/src/librustc/middle/ty.rs

@@ -715,7 +715,8 @@ pub struct ParamBounds {
 
 pub type BuiltinBounds = EnumSet<BuiltinBound>;
 
-#[deriving(Clone, Eq, IterBytes, ToStr)] #[repr(uint)]
+#[deriving(Clone, Eq, IterBytes, ToStr)]
+#[repr(uint)]
 pub enum BuiltinBound {
     BoundStatic,
     BoundSend,

branches/try2/src/libsyntax/attr.rs

@@ -385,8 +385,7 @@ pub fn find_repr_attr(diagnostic: @mut span_handler, attr: @ast::MetaItem, acc:
             for item in items.iter() {
                 match item.node {
                     ast::MetaWord(word) => {
-                        let word: &str = word;
-                        let hint = match word {
+                        let hint = match word.as_slice() {
                             // Can't use "extern" because it's not a lexical identifier.
                             "C" => ReprExtern,
                             _ => match int_type_of_word(word) {

branches/try2/src/test/run-pass/issue-2718.rs

@@ -26,7 +26,8 @@ pub mod pipes {
         payload: Option<T>
     }
 
-    #[deriving(Eq)] #[repr(int)]
+    #[deriving(Eq)]
+    #[repr(int)]
     pub enum state {
         empty,
         full,