Skip to content

Commit 3ec15d2

Browse files
committed
---
yaml --- r: 138218 b: refs/heads/auto c: 7a4122a h: refs/heads/master v: v3
1 parent df2b17d commit 3ec15d2

File tree

5 files changed

+1
-176
lines changed

5 files changed

+1
-176
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: ce6226e6c97a11933f09a9730458c6984e883bd7
16+
refs/heads/auto: 7a4122ac6798d1db84c3dc76047a1136cd7da258
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libcore/intrinsics.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,6 @@ extern "rust-intrinsic" {
327327
/// Returns `true` if a type is managed (will be allocated on the local heap)
328328
pub fn owns_managed<T>() -> bool;
329329

330-
pub fn visit_tydesc(td: *const TyDesc, tv: &mut TyVisitor);
331-
332330
/// Calculates the offset from a pointer. The offset *must* be in-bounds of
333331
/// the object, or one-byte-past-the-end. An arithmetic overflow is also
334332
/// undefined behaviour.

branches/auto/src/librustc/middle/trans/intrinsic.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -307,13 +307,6 @@ pub fn trans_intrinsic_call<'blk, 'tcx>(mut bcx: Block<'blk, 'tcx>, node: ast::N
307307
let tp_ty = *substs.types.get(FnSpace, 0);
308308
C_bool(ccx, ty::type_contents(ccx.tcx(), tp_ty).owns_managed())
309309
}
310-
(_, "visit_tydesc") => {
311-
let td = *llargs.get(0);
312-
let visitor = *llargs.get(1);
313-
let td = PointerCast(bcx, td, ccx.tydesc_type().ptr_to());
314-
glue::call_visit_glue(bcx, visitor, td);
315-
C_nil(ccx)
316-
}
317310
(_, "offset") => {
318311
let ptr = *llargs.get(0);
319312
let offset = *llargs.get(1);

branches/auto/src/librustc/middle/typeck/check/mod.rs

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5578,25 +5578,6 @@ pub fn check_intrinsic_type(ccx: &CrateCtxt, it: &ast::ForeignItem) {
55785578
}
55795579
}
55805580
},
5581-
"visit_tydesc" => {
5582-
let tydesc_ty = match ty::get_tydesc_ty(ccx.tcx) {
5583-
Ok(t) => t,
5584-
Err(s) => { tcx.sess.span_fatal(it.span, s.as_slice()); }
5585-
};
5586-
let region0 = ty::ReLateBound(it.id, ty::BrAnon(0));
5587-
let region1 = ty::ReLateBound(it.id, ty::BrAnon(1));
5588-
let visitor_object_ty =
5589-
match ty::visitor_object_ty(tcx, region0, region1) {
5590-
Ok((_, vot)) => vot,
5591-
Err(s) => { tcx.sess.span_fatal(it.span, s.as_slice()); }
5592-
};
5593-
5594-
let td_ptr = ty::mk_ptr(ccx.tcx, ty::mt {
5595-
ty: tydesc_ty,
5596-
mutbl: ast::MutImmutable
5597-
});
5598-
(0, vec!( td_ptr, visitor_object_ty ), ty::mk_nil())
5599-
}
56005581
"offset" => {
56015582
(1,
56025583
vec!(

branches/auto/src/test/run-pass/reflect-visit-type.rs

Lines changed: 0 additions & 147 deletions
This file was deleted.

0 commit comments

Comments
 (0)