about summary refs log tree commit diff
path: root/src/libsyntax_ext
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-03-21 21:07:28 -0700
committerbors <bors@rust-lang.org>2016-03-21 21:07:28 -0700
commit6cc502c986d42da407e26a49d4f09f21d3072fcb (patch)
tree29fd917cf34d4785cf73c9fcc32c140a2c1999d1 /src/libsyntax_ext
parent4621dd21715c2abee70f3057c608d1ee9c3e8b84 (diff)
parent9d0748f7eb75c422b61446f846251177faffeb45 (diff)
downloadrust-6cc502c986d42da407e26a49d4f09f21d3072fcb.tar.gz
rust-6cc502c986d42da407e26a49d4f09f21d3072fcb.zip
Auto merge of #32253 - durka:derive-31886, r=alexcrichton
derive: assume enum repr defaults to isize

derive: assume enum repr defaults to isize

Fixes #31886.

Spawned from #32139.

r? @alexcrichton
Diffstat (limited to 'src/libsyntax_ext')
-rw-r--r--src/libsyntax_ext/deriving/generic/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs
index 6654afd3664..6dac2f5f9e5 100644
--- a/src/libsyntax_ext/deriving/generic/mod.rs
+++ b/src/libsyntax_ext/deriving/generic/mod.rs
@@ -758,7 +758,7 @@ impl<'a> TraitDef<'a> {
 
 fn find_repr_type_name(diagnostic: &Handler,
                        type_attrs: &[ast::Attribute]) -> &'static str {
-    let mut repr_type_name = "i32";
+    let mut repr_type_name = "isize";
     for a in type_attrs {
         for r in &attr::find_repr_attrs(diagnostic, a) {
             repr_type_name = match *r {