From cc1f0027c73f2728fa20867a4dfdbdcfad77847f Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Mon, 2 Sep 2013 01:15:03 -0400 Subject: [PATCH] repr: add support for trait objects Closes #8916 --- src/librustc/middle/trans/reflect.rs | 12 +++++++----- src/libstd/reflect.rs | 4 ++-- src/libstd/repr.rs | 7 ++++++- src/libstd/unstable/intrinsics.rs | 2 +- src/test/run-pass/reflect-visit-data.rs | 6 +++--- src/test/run-pass/reflect-visit-type.rs | 2 +- 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/librustc/middle/trans/reflect.rs b/src/librustc/middle/trans/reflect.rs index b6cb47efc767..e57b845567a4 100644 --- a/src/librustc/middle/trans/reflect.rs +++ b/src/librustc/middle/trans/reflect.rs @@ -146,6 +146,7 @@ impl Reflector { // Entrypoint pub fn visit_ty(&mut self, t: ty::t) { let bcx = self.bcx; + let tcx = bcx.ccx().tcx; debug!("reflect::visit_ty %s", ty_to_str(bcx.ccx().tcx, t)); match ty::get(t).sty { @@ -248,8 +249,6 @@ impl Reflector { } ty::ty_struct(did, ref substs) => { - let bcx = self.bcx; - let tcx = bcx.ccx().tcx; let fields = ty::struct_fields(tcx, did, substs); let extra = ~[self.c_slice(ty_to_str(tcx, t).to_managed()), @@ -270,7 +269,6 @@ impl Reflector { // let the visitor tell us if it wants to visit only a particular // variant? ty::ty_enum(did, ref substs) => { - let bcx = self.bcx; let ccx = bcx.ccx(); let repr = adt::represent_type(bcx.ccx(), t); let variants = ty::substd_enum_variants(ccx.tcx, did, substs); @@ -336,8 +334,12 @@ impl Reflector { } } - // Miscallaneous extra types - ty::ty_trait(_, _, _, _, _) => self.leaf("trait"), + ty::ty_trait(_, _, _, _, _) => { + let extra = [self.c_slice(ty_to_str(tcx, t).to_managed())]; + self.visit("trait", extra); + } + + // Miscellaneous extra types ty::ty_infer(_) => self.leaf("infer"), ty::ty_err => self.leaf("err"), ty::ty_param(ref p) => { diff --git a/src/libstd/reflect.rs b/src/libstd/reflect.rs index 7b352e7806e6..6bef4402bf16 100644 --- a/src/libstd/reflect.rs +++ b/src/libstd/reflect.rs @@ -450,9 +450,9 @@ impl TyVisitor for MovePtrAdaptor { true } - fn visit_trait(&mut self) -> bool { + fn visit_trait(&mut self, name: &str) -> bool { self.align_to::<@TyVisitor>(); - if ! self.inner.visit_trait() { return false; } + if ! self.inner.visit_trait(name) { return false; } self.bump_past::<@TyVisitor>(); true } diff --git a/src/libstd/repr.rs b/src/libstd/repr.rs index 381cd449695f..63a1416e48ab 100644 --- a/src/libstd/repr.rs +++ b/src/libstd/repr.rs @@ -571,7 +571,11 @@ impl<'self> TyVisitor for ReprVisitor<'self> { _n_inputs: uint, _retstyle: uint) -> bool { true } - fn visit_trait(&mut self) -> bool { true } + fn visit_trait(&mut self, name: &str) -> bool { + self.writer.write(name.as_bytes()); + true + } + fn visit_param(&mut self, _i: uint) -> bool { true } fn visit_self(&mut self) -> bool { true } fn visit_type(&mut self) -> bool { true } @@ -661,6 +665,7 @@ fn test_repr() { "(10u64, ~\"hello\")"); exact_test(&(&println), "&fn()"); + exact_test(&(~5 as ~ToStr), "~to_str::ToStr:Send"); struct Foo; exact_test(&(~[Foo, Foo]), "~[repr::test_repr::Foo, repr::test_repr::Foo]"); diff --git a/src/libstd/unstable/intrinsics.rs b/src/libstd/unstable/intrinsics.rs index 8e0f6255e097..1726d144df16 100644 --- a/src/libstd/unstable/intrinsics.rs +++ b/src/libstd/unstable/intrinsics.rs @@ -256,7 +256,7 @@ pub trait TyVisitor { fn visit_leave_fn(&mut self, purity: uint, proto: uint, n_inputs: uint, retstyle: uint) -> bool; - fn visit_trait(&mut self) -> bool; + fn visit_trait(&mut self, name: &str) -> bool; fn visit_param(&mut self, i: uint) -> bool; fn visit_self(&mut self) -> bool; fn visit_type(&mut self) -> bool; diff --git a/src/test/run-pass/reflect-visit-data.rs b/src/test/run-pass/reflect-visit-data.rs index 317fdb634bc0..e088cb1b45da 100644 --- a/src/test/run-pass/reflect-visit-data.rs +++ b/src/test/run-pass/reflect-visit-data.rs @@ -428,9 +428,9 @@ impl TyVisitor for ptr_visit_adaptor { true } - fn visit_trait(&mut self) -> bool { + fn visit_trait(&mut self, name: &str) -> bool { self.align_to::<@TyVisitor>(); - if ! self.inner.visit_trait() { return false; } + if ! self.inner.visit_trait(name) { return false; } self.bump_past::<@TyVisitor>(); true } @@ -616,7 +616,7 @@ impl TyVisitor for my_visitor { _n_inputs: uint, _retstyle: uint) -> bool { true } - fn visit_trait(&mut self) -> bool { true } + fn visit_trait(&mut self, _name: &str) -> bool { true } fn visit_param(&mut self, _i: uint) -> bool { true } fn visit_self(&mut self) -> bool { true } fn visit_type(&mut self) -> bool { true } diff --git a/src/test/run-pass/reflect-visit-type.rs b/src/test/run-pass/reflect-visit-type.rs index 32df43769836..53aef472aaf7 100644 --- a/src/test/run-pass/reflect-visit-type.rs +++ b/src/test/run-pass/reflect-visit-type.rs @@ -139,7 +139,7 @@ impl TyVisitor for MyVisitor { _n_inputs: uint, _retstyle: uint) -> bool { true } - fn visit_trait(&mut self) -> bool { true } + fn visit_trait(&mut self, _name: &str) -> bool { true } fn visit_param(&mut self, _i: uint) -> bool { true } fn visit_self(&mut self) -> bool { true } fn visit_type(&mut self) -> bool { true }