let def = match tcx.def_map.borrow().get(&ast_ty.id) {
None => {
tcx.sess.span_bug(ast_ty.span,
- &format!("unbound path {}", path.repr(tcx)))
+ &format!("unbound path {}", path.repr()))
}
Some(d) => d.full_def()
};
c::tag_table_node_type => {
let ty = val_dsr.read_ty(dcx);
debug!("inserting ty for node {}: {}",
- id, ty.repr(dcx.tcx));
+ id, ty.repr());
dcx.tcx.node_type_insert(id, ty);
}
c::tag_table_item_subst => {
impl<'a, 'tcx, 'v> Visitor<'v> for CheckCrateVisitor<'a, 'tcx> {
fn visit_item(&mut self, i: &ast::Item) {
- debug!("visit_item(item={})", i.repr(self.tcx));
+ debug!("visit_item(item={})", i.repr());
match i.node {
ast::ItemStatic(_, ast::MutImmutable, ref expr) => {
self.check_static_type(&**expr);
// We know the type is inhabited, so this must be wrong
span_err!(cx.tcx.sess, ex.span, E0002,
"non-exhaustive patterns: type {} is non-empty",
- pat_ty.user_string(cx.tcx));
+ pat_ty.user_string());
}
// If the type *is* empty, it's vacuously exhaustive
return;
span_warn!(cx.tcx.sess, p.span, E0170,
"pattern binding `{}` is named the same as one \
of the variants of the type `{}`",
- &token::get_ident(ident.node), pat_ty.user_string(cx.tcx));
+ &token::get_ident(ident.node), pat_ty.user_string());
fileline_help!(cx.tcx.sess, p.span,
"if you meant to match on a variant, \
consider making the path in the pattern qualified: `{}::{}`",
- pat_ty.user_string(cx.tcx), &token::get_ident(ident.node));
+ pat_ty.user_string(), &token::get_ident(ident.node));
}
}
}
span: Span,
cmt: mc::cmt<'tcx>,
_: euv::ConsumeMode) {
- debug!("consume; cmt: {:?}; type: {}", *cmt, cmt.ty.repr(self.tcx));
+ debug!("consume; cmt: {:?}; type: {}", *cmt, cmt.ty.repr());
if !ty::type_is_sized(Some(self.param_env), self.tcx, span, cmt.ty) {
span_err!(self.tcx.sess, span, E0161,
"cannot move a value of type {0}: the size of {0} cannot be statically determined",
- cmt.ty.user_string(self.tcx));
+ cmt.ty.user_string());
}
}
Vec::new()));
let trait_substs = tcx.mk_substs(trait_substs);
debug!("resolve_trait_associated_const: trait_substs={}",
- trait_substs.repr(tcx));
+ trait_substs.repr());
let trait_ref = ty::Binder(ty::TraitRef { def_id: trait_id,
substs: trait_substs });
&format!("Encountered error `{}` when trying \
to select an implementation for \
constant trait item reference.",
- e.repr(tcx)))
+ e.repr()))
}
};
_ => return
};
debug!("effect: checking index with base type {}",
- base_type.repr(self.tcx));
+ base_type.repr());
match base_type.sty {
ty::TyBox(ty) | ty::TyRef(_, ty::mt{ty, ..}) => if ty::TyStr == ty.sty {
span_err!(self.tcx.sess, e.span, E0134,
let method_call = MethodCall::expr(expr.id);
let base_type = self.tcx.method_map.borrow().get(&method_call).unwrap().ty;
debug!("effect: method call case, base type is {}",
- base_type.repr(self.tcx));
+ base_type.repr());
if type_is_unsafe_function(base_type) {
self.require_unsafe(expr.span,
"invocation of unsafe method")
ast::ExprCall(ref base, _) => {
let base_type = ty::node_id_to_type(self.tcx, base.id);
debug!("effect: call case, base type is {}",
- base_type.repr(self.tcx));
+ base_type.repr());
if type_is_unsafe_function(base_type) {
self.require_unsafe(expr.span, "call to unsafe function")
}
ast::ExprUnary(ast::UnDeref, ref base) => {
let base_type = ty::node_id_to_type(self.tcx, base.id);
debug!("effect: unary case, base type is {}",
- base_type.repr(self.tcx));
+ base_type.repr());
if let ty::TyRawPtr(_) = base_type.sty {
self.require_unsafe(expr.span, "dereference of raw pointer")
}
consume_span: Span,
cmt: mc::cmt<'tcx>) {
debug!("delegate_consume(consume_id={}, cmt={})",
- consume_id, cmt.repr(self.tcx()));
+ consume_id, cmt.repr());
let mode = copy_or_move(self.typer, &cmt, DirectRefMove);
self.delegate.consume(consume_id, consume_span, cmt, mode);
}
pub fn consume_expr(&mut self, expr: &ast::Expr) {
- debug!("consume_expr(expr={})", expr.repr(self.tcx()));
+ debug!("consume_expr(expr={})", expr.repr());
let cmt = return_if_err!(self.mc.cat_expr(expr));
self.delegate_consume(expr.id, expr.span, cmt);
bk: ty::BorrowKind,
cause: LoanCause) {
debug!("borrow_expr(expr={}, r={}, bk={})",
- expr.repr(self.tcx()), r.repr(self.tcx()), bk.repr(self.tcx()));
+ expr.repr(), r.repr(), bk.repr());
let cmt = return_if_err!(self.mc.cat_expr(expr));
self.delegate.borrow(expr.id, expr.span, cmt, r, bk, cause);
}
pub fn walk_expr(&mut self, expr: &ast::Expr) {
- debug!("walk_expr(expr={})", expr.repr(self.tcx()));
+ debug!("walk_expr(expr={})", expr.repr());
self.walk_adjustment(expr);
fn walk_callee(&mut self, call: &ast::Expr, callee: &ast::Expr) {
let callee_ty = return_if_err!(self.typer.expr_ty_adjusted(callee));
debug!("walk_callee: callee={} callee_ty={}",
- callee.repr(self.tcx()), callee_ty.repr(self.tcx()));
+ callee.repr(), callee_ty.repr());
let call_scope = region::CodeExtent::from_node_id(call.id);
match callee_ty.sty {
ty::TyBareFn(..) => {
None => {
self.tcx().sess.span_bug(
callee.span,
- &format!("unexpected callee type {}", callee_ty.repr(self.tcx())))
+ &format!("unexpected callee type {}", callee_ty.repr()))
}
};
match overloaded_call_type {
fn walk_autoderefs(&mut self,
expr: &ast::Expr,
autoderefs: usize) {
- debug!("walk_autoderefs expr={} autoderefs={}", expr.repr(self.tcx()), autoderefs);
+ debug!("walk_autoderefs expr={} autoderefs={}", expr.repr(), autoderefs);
for i in 0..autoderefs {
let deref_id = ty::MethodCall::autoderef(expr.id, i as u32);
ty::TyRef(r, ref m) => (m.mutbl, r),
_ => self.tcx().sess.span_bug(expr.span,
&format!("bad overloaded deref type {}",
- method_ty.repr(self.tcx())))
+ method_ty.repr()))
};
let bk = ty::BorrowKind::from_mutbl(m);
self.delegate.borrow(expr.id, expr.span, cmt,
expr: &ast::Expr,
adj: &ty::AutoDerefRef<'tcx>) {
debug!("walk_autoderefref expr={} adj={}",
- expr.repr(self.tcx()),
- adj.repr(self.tcx()));
+ expr.repr(),
+ adj.repr());
self.walk_autoderefs(expr, adj.autoderefs);
{
debug!("walk_autoref(expr.id={} cmt_derefd={} opt_autoref={:?})",
expr.id,
- cmt_base.repr(self.tcx()),
+ cmt_base.repr(),
opt_autoref);
let cmt_base_ty = cmt_base.ty;
ty::AutoUnsafe(m) => {
debug!("walk_autoref: expr.id={} cmt_base={}",
expr.id,
- cmt_base.repr(self.tcx()));
+ cmt_base.repr());
// Converting from a &T to *T (or &mut T to *mut T) is
// treated as borrowing it for the enclosing temporary
cmt_discr: mc::cmt<'tcx>,
pat: &ast::Pat,
mode: &mut TrackMatchMode) {
- debug!("determine_pat_move_mode cmt_discr={} pat={}", cmt_discr.repr(self.tcx()),
- pat.repr(self.tcx()));
+ debug!("determine_pat_move_mode cmt_discr={} pat={}", cmt_discr.repr(),
+ pat.repr());
return_if_err!(self.mc.cat_pattern(cmt_discr, pat, |_mc, cmt_pat, pat| {
let tcx = self.tcx();
let def_map = &self.tcx().def_map;
cmt_discr: mc::cmt<'tcx>,
pat: &ast::Pat,
match_mode: MatchMode) {
- debug!("walk_pat cmt_discr={} pat={}", cmt_discr.repr(self.tcx()),
- pat.repr(self.tcx()));
+ debug!("walk_pat cmt_discr={} pat={}", cmt_discr.repr(),
+ pat.repr());
let mc = &self.mc;
let typer = self.typer;
let tcx = typer.tcx();
debug!("binding cmt_pat={} pat={} match_mode={:?}",
- cmt_pat.repr(tcx),
- pat.repr(tcx),
+ cmt_pat.repr(),
+ pat.repr(),
match_mode);
// pat_ty: the type of the binding being produced.
};
debug!("variant downcast_cmt={} pat={}",
- downcast_cmt.repr(tcx),
- pat.repr(tcx));
+ downcast_cmt.repr(),
+ pat.repr());
delegate.matched_pat(pat, downcast_cmt, match_mode);
}
// e.g. patterns for unit structs).
debug!("struct cmt_pat={} pat={}",
- cmt_pat.repr(tcx),
- pat.repr(tcx));
+ cmt_pat.repr(),
+ pat.repr());
delegate.matched_pat(pat, cmt_pat, match_mode);
}
if !tcx.sess.has_errors() {
let msg = format!("Pattern has unexpected type: {:?} and type {}",
def,
- cmt_pat.ty.repr(tcx));
+ cmt_pat.ty.repr());
tcx.sess.span_bug(pat.span, &msg)
}
}
if !tcx.sess.has_errors() {
let msg = format!("Pattern has unexpected def: {:?} and type {}",
def,
- cmt_pat.ty.repr(tcx));
+ cmt_pat.ty.repr());
tcx.sess.span_bug(pat.span, &msg[..])
}
}
}
fn walk_captures(&mut self, closure_expr: &ast::Expr) {
- debug!("walk_captures({})", closure_expr.repr(self.tcx()));
+ debug!("walk_captures({})", closure_expr.repr());
ty::with_freevars(self.tcx(), closure_expr.id, |freevars| {
for freevar in freevars {
implications: &[Implication<'tcx>])
{
for implication in implications {
- debug!("implication: {}", implication.repr(tcx));
+ debug!("implication: {}", implication.repr());
match *implication {
Implication::RegionSubRegion(_, ty::ReFree(free_a), ty::ReFree(free_b)) => {
self.relate_free_regions(free_a, free_b);
pub fn relate_free_regions_from_predicates<'tcx>(&mut self,
tcx: &ty::ctxt<'tcx>,
predicates: &[ty::Predicate<'tcx>]) {
- debug!("relate_free_regions_from_predicates(predicates={})", predicates.repr(tcx));
+ debug!("relate_free_regions_from_predicates(predicates={})", predicates.repr());
for predicate in predicates {
match *predicate {
ty::Predicate::Projection(..) |
// All named regions are instantiated with free regions.
tcx.sess.bug(
&format!("record_region_bounds: non free region: {} / {}",
- r_a.repr(tcx),
- r_b.repr(tcx)));
+ r_a.repr(),
+ r_b.repr()));
}
}
}
{
debug!("implications(body_id={}, ty={}, outer_region={})",
body_id,
- ty.repr(closure_typer.tcx()),
- outer_region.repr(closure_typer.tcx()));
+ ty.repr(),
+ outer_region.repr());
let mut stack = Vec::new();
stack.push((outer_region, None));
out: Vec::new(),
visited: FnvHashSet() };
wf.accumulate_from_ty(ty);
- debug!("implications: out={}", wf.out.repr(closure_typer.tcx()));
+ debug!("implications: out={}", wf.out.repr());
wf.out
}
fn accumulate_from_ty(&mut self, ty: Ty<'tcx>) {
debug!("accumulate_from_ty(ty={})",
- ty.repr(self.tcx()));
+ ty.repr());
// When expanding out associated types, we can visit a cyclic
// set of types. Issue #23003.
data: &ty::PolyTraitPredicate<'tcx>)
{
debug!("accumulate_from_assoc_types_transitive({})",
- data.repr(self.tcx()));
+ data.repr());
for poly_trait_ref in traits::supertraits(self.tcx(), data.to_poly_trait_ref()) {
match ty::no_late_bound_regions(self.tcx(), &poly_trait_ref) {
trait_ref: ty::TraitRef<'tcx>)
{
debug!("accumulate_from_assoc_types({})",
- trait_ref.repr(self.tcx()));
+ trait_ref.repr());
let trait_def_id = trait_ref.def_id;
let trait_def = ty::lookup_trait_def(self.tcx(), trait_def_id);
.map(|&name| ty::mk_projection(self.tcx(), trait_ref.clone(), name))
.collect();
debug!("accumulate_from_assoc_types: assoc_type_projections={}",
- assoc_type_projections.repr(self.tcx()));
+ assoc_type_projections.repr());
let tys = match self.fully_normalize(&assoc_type_projections) {
Ok(tys) => { tys }
Err(ErrorReported) => { return; }
}
fn fully_normalize<T>(&self, value: &T) -> Result<T,ErrorReported>
- where T : TypeFoldable<'tcx> + ty::HasProjectionTypes + Clone + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + ty::HasProjectionTypes + Clone + Repr
{
let value =
traits::fully_normalize(self.infcx,
ty::required_region_bounds(tcx, open_ty, predicates)
}
-impl<'tcx> Repr<'tcx> for Implication<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for Implication<'tcx> {
+ fn repr(&self) -> String {
match *self {
Implication::RegionSubRegion(_, ref r_a, ref r_b) => {
format!("RegionSubRegion({}, {})",
- r_a.repr(tcx),
- r_b.repr(tcx))
+ r_a.repr(),
+ r_b.repr())
}
Implication::RegionSubGeneric(_, ref r, ref p) => {
format!("RegionSubGeneric({}, {})",
- r.repr(tcx),
- p.repr(tcx))
+ r.repr(),
+ p.repr())
}
Implication::RegionSubClosure(_, ref a, ref b, ref c) => {
format!("RegionSubClosure({}, {}, {})",
- a.repr(tcx),
- b.repr(tcx),
- c.repr(tcx))
+ a.repr(),
+ b.repr(),
+ c.repr())
}
Implication::Predicate(ref def_id, ref p) => {
format!("Predicate({}, {})",
- def_id.repr(tcx),
- p.repr(tcx))
+ def_id.repr(),
+ p.repr())
}
}
}
fn tys(&mut self, a: Ty<'tcx>, b: Ty<'tcx>) -> RelateResult<'tcx, Ty<'tcx>> {
debug!("{}.tys({}, {})", self.tag(),
- a.repr(self.fields.infcx.tcx), b.repr(self.fields.infcx.tcx));
+ a.repr(), b.repr());
if a == b { return Ok(a); }
let infcx = self.fields.infcx;
};
debug!("instantiate(a_ty={} dir={:?} b_vid={})",
- a_ty.repr(tcx),
+ a_ty.repr(),
dir,
- b_vid.repr(tcx));
+ b_vid.repr());
// Check whether `vid` has been instantiated yet. If not,
// make a generalized form of `ty` and instantiate with
});
debug!("instantiate(a_ty={}, dir={:?}, \
b_vid={}, generalized_ty={})",
- a_ty.repr(tcx), dir, b_vid.repr(tcx),
- generalized_ty.repr(tcx));
+ a_ty.repr(), dir, b_vid.repr(),
+ generalized_ty.repr());
self.infcx.type_variables
.borrow_mut()
.instantiate_and_push(
self.tcx().sess.span_bug(
self.span,
&format!("Encountered early bound region when generalizing: {}",
- r.repr(self.tcx())));
+ r.repr()));
}
// Always make a fresh region variable for skolemized regions;
fn tys(&mut self, a: Ty<'tcx>, b: Ty<'tcx>) -> RelateResult<'tcx, Ty<'tcx>> {
debug!("{}.tys({}, {})", self.tag(),
- a.repr(self.fields.infcx.tcx), b.repr(self.fields.infcx.tcx));
+ a.repr(), b.repr());
if a == b { return Ok(a); }
let infcx = self.fields.infcx;
fn regions(&mut self, a: ty::Region, b: ty::Region) -> RelateResult<'tcx, ty::Region> {
debug!("{}.regions({}, {})",
self.tag(),
- a.repr(self.fields.infcx.tcx),
- b.repr(self.fields.infcx.tcx));
+ a.repr(),
+ b.repr());
let origin = Subtype(self.fields.trace.clone());
self.fields.infcx.region_vars.make_eqregion(origin, a, b);
Ok(a)
ty::BrFresh(_) => "an anonymous lifetime defined on".to_owned(),
_ => {
format!("the lifetime {} as defined on",
- fr.bound_region.user_string(tcx))
+ fr.bound_region.user_string())
}
};
fn values_str(&self, values: &ValuePairs<'tcx>) -> Option<String>;
- fn expected_found_str<T: UserString<'tcx> + Resolvable<'tcx>>(
+ fn expected_found_str<T: UserString + Resolvable<'tcx>>(
&self,
exp_found: &ty::expected_found<T>)
-> Option<String>;
}
}
- fn expected_found_str<T: UserString<'tcx> + Resolvable<'tcx>>(
+ fn expected_found_str<T: UserString + Resolvable<'tcx>>(
&self,
exp_found: &ty::expected_found<T>)
-> Option<String>
}
Some(format!("expected `{}`, found `{}`",
- expected.user_string(self.tcx),
- found.user_string(self.tcx)))
+ expected.user_string(),
+ found.user_string()))
}
fn report_generic_bound_failure(&self,
let labeled_user_string = match bound_kind {
GenericKind::Param(ref p) =>
- format!("the parameter type `{}`", p.user_string(self.tcx)),
+ format!("the parameter type `{}`", p.user_string()),
GenericKind::Projection(ref p) =>
- format!("the associated type `{}`", p.user_string(self.tcx)),
+ format!("the associated type `{}`", p.user_string()),
};
match sub {
origin.span(),
&format!(
"consider adding an explicit lifetime bound `{}: {}`...",
- bound_kind.user_string(self.tcx),
- sub.user_string(self.tcx)));
+ bound_kind.user_string(),
+ sub.user_string()));
}
ty::ReStatic => {
origin.span(),
&format!(
"consider adding an explicit lifetime bound `{}: 'static`...",
- bound_kind.user_string(self.tcx)));
+ bound_kind.user_string()));
}
_ => {
origin.span(),
&format!(
"consider adding an explicit lifetime bound for `{}`",
- bound_kind.user_string(self.tcx)));
+ bound_kind.user_string()));
note_and_explain_region(
self.tcx,
&format!("{} must be valid for ", labeled_user_string),
fn report_inference_failure(&self,
var_origin: RegionVariableOrigin) {
let br_string = |br: ty::BoundRegion| {
- let mut s = br.user_string(self.tcx);
+ let mut s = br.user_string();
if !s.is_empty() {
s.push_str(" ");
}
fn regions(&mut self, a: ty::Region, b: ty::Region) -> RelateResult<'tcx, ty::Region> {
debug!("{}.regions({}, {})",
self.tag(),
- a.repr(self.fields.infcx.tcx),
- b.repr(self.fields.infcx.tcx));
+ a.repr(),
+ b.repr());
let origin = Subtype(self.fields.trace.clone());
Ok(self.fields.infcx.region_vars.glb_regions(origin, a, b))
let tcx = self.infcx.tcx;
debug!("higher_ranked_sub(a={}, b={})",
- a.repr(tcx), b.repr(tcx));
+ a.repr(), b.repr());
// Rather than checking the subtype relationship between `a` and `b`
// as-is, we need to do some extra work here in order to make sure
let (b_prime, skol_map) =
self.infcx.skolemize_late_bound_regions(b, snapshot);
- debug!("a_prime={}", a_prime.repr(tcx));
- debug!("b_prime={}", b_prime.repr(tcx));
+ debug!("a_prime={}", a_prime.repr());
+ debug!("b_prime={}", b_prime.repr());
// Compare types now that bound regions have been replaced.
let result = try!(self.sub().relate(&a_prime, &b_prime));
}
debug!("higher_ranked_sub: OK result={}",
- result.repr(tcx));
+ result.repr());
Ok(ty::Binder(result))
});
try!(self.lub().relate(&a_with_fresh, &b_with_fresh));
let result0 =
self.infcx.resolve_type_vars_if_possible(&result0);
- debug!("lub result0 = {}", result0.repr(self.tcx()));
+ debug!("lub result0 = {}", result0.repr());
// Generalize the regions appearing in result0 if possible
let new_vars = self.infcx.region_vars_confined_to_snapshot(snapshot);
&new_vars, &a_map, r));
debug!("lub({},{}) = {}",
- a.repr(self.tcx()),
- b.repr(self.tcx()),
- result1.repr(self.tcx()));
+ a.repr(),
+ b.repr(),
+ result1.repr());
Ok(ty::Binder(result1))
});
where T: Relate<'a,'tcx>
{
debug!("higher_ranked_glb({}, {})",
- a.repr(self.tcx()), b.repr(self.tcx()));
+ a.repr(), b.repr());
// Make a snapshot so we can examine "all bindings that were
// created as part of this type comparison".
try!(self.glb().relate(&a_with_fresh, &b_with_fresh));
let result0 =
self.infcx.resolve_type_vars_if_possible(&result0);
- debug!("glb result0 = {}", result0.repr(self.tcx()));
+ debug!("glb result0 = {}", result0.repr());
// Generalize the regions appearing in result0 if possible
let new_vars = self.infcx.region_vars_confined_to_snapshot(snapshot);
r));
debug!("glb({},{}) = {}",
- a.repr(self.tcx()),
- b.repr(self.tcx()),
- result1.repr(self.tcx()));
+ a.repr(),
+ b.repr(),
+ result1.repr());
Ok(ty::Binder(result1))
});
});
debug!("region_vars_confined_to_snapshot: region_vars={} escaping_types={}",
- region_vars.repr(self.tcx),
- escaping_types.repr(self.tcx));
+ region_vars.repr(),
+ escaping_types.repr());
region_vars
}
binder: &ty::Binder<T>,
snapshot: &CombinedSnapshot)
-> (T, SkolemizationMap)
- where T : TypeFoldable<'tcx> + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + Repr
{
/*!
* Replace all regions bound by `binder` with skolemized regions and
});
debug!("skolemize_bound_regions(binder={}, result={}, map={})",
- binder.repr(infcx.tcx),
- result.repr(infcx.tcx),
- map.repr(infcx.tcx));
+ binder.repr(),
+ result.repr(),
+ map.repr());
(result, map)
}
*/
debug!("leak_check: skol_map={}",
- skol_map.repr(infcx.tcx));
+ skol_map.repr());
let new_vars = infcx.region_vars_confined_to_snapshot(snapshot);
for (&skol_br, &skol) in skol_map {
};
debug!("{} (which replaced {}) is tainted by {}",
- skol.repr(infcx.tcx),
- skol_br.repr(infcx.tcx),
- tainted_region.repr(infcx.tcx));
+ skol.repr(),
+ skol_br.repr(),
+ tainted_region.repr());
// A is not as polymorphic as B:
return Err((skol_br, tainted_region));
snapshot: &CombinedSnapshot,
value: &T)
-> T
- where T : TypeFoldable<'tcx> + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + Repr
{
debug_assert!(leak_check(infcx, &skol_map, snapshot).is_ok());
debug!("plug_leaks(skol_map={}, value={})",
- skol_map.repr(infcx.tcx),
- value.repr(infcx.tcx));
+ skol_map.repr(),
+ value.repr());
// Compute a mapping from the "taint set" of each skolemized
// region back to the `ty::BoundRegion` that it originally
.collect();
debug!("plug_leaks: inv_skol_map={}",
- inv_skol_map.repr(infcx.tcx));
+ inv_skol_map.repr());
// Remove any instantiated type variables from `value`; those can hide
// references to regions from the `fold_regions` code below.
});
debug!("plug_leaks: result={}",
- result.repr(infcx.tcx));
+ result.repr());
result
}
{
debug!("{}.lattice_tys({}, {})",
this.tag(),
- a.repr(this.tcx()),
- b.repr(this.tcx()));
+ a.repr(),
+ b.repr());
if a == b {
return Ok(a);
fn regions(&mut self, a: ty::Region, b: ty::Region) -> RelateResult<'tcx, ty::Region> {
debug!("{}.regions({}, {})",
self.tag(),
- a.repr(self.tcx()),
- b.repr(self.tcx()));
+ a.repr(),
+ b.repr());
let origin = Subtype(self.fields.trace.clone());
Ok(self.fields.infcx.region_vars.lub_regions(origin, a, b))
-> Ty<'tcx>
{
debug!("common_supertype({}, {})",
- a.repr(cx.tcx), b.repr(cx.tcx));
+ a.repr(), b.repr());
let trace = TypeTrace {
origin: origin,
b: Ty<'tcx>)
-> UnitResult<'tcx>
{
- debug!("mk_subty({} <: {})", a.repr(cx.tcx), b.repr(cx.tcx));
+ debug!("mk_subty({} <: {})", a.repr(), b.repr());
cx.sub_types(a_is_expected, origin, a, b)
}
a: Ty<'tcx>,
b: Ty<'tcx>)
-> UnitResult<'tcx> {
- debug!("can_mk_subty({} <: {})", a.repr(cx.tcx), b.repr(cx.tcx));
+ debug!("can_mk_subty({} <: {})", a.repr(), b.repr());
cx.probe(|_| {
let trace = TypeTrace {
origin: Misc(codemap::DUMMY_SP),
origin: SubregionOrigin<'tcx>,
a: ty::Region,
b: ty::Region) {
- debug!("mk_subr({} <: {})", a.repr(cx.tcx), b.repr(cx.tcx));
+ debug!("mk_subr({} <: {})", a.repr(), b.repr());
let snapshot = cx.region_vars.start_snapshot();
cx.region_vars.make_subregion(origin, a, b);
cx.region_vars.commit(snapshot);
b: Ty<'tcx>)
-> UnitResult<'tcx>
{
- debug!("mk_eqty({} <: {})", a.repr(cx.tcx), b.repr(cx.tcx));
+ debug!("mk_eqty({} <: {})", a.repr(), b.repr());
cx.commit_if_ok(|_| cx.eq_types(a_is_expected, origin, a, b))
}
-> UnitResult<'tcx>
{
debug!("mk_sub_trait_refs({} <: {})",
- a.repr(cx.tcx), b.repr(cx.tcx));
+ a.repr(), b.repr());
cx.commit_if_ok(|_| cx.sub_poly_trait_refs(a_is_expected, origin, a.clone(), b.clone()))
}
b: Ty<'tcx>)
-> UnitResult<'tcx>
{
- debug!("sub_types({} <: {})", a.repr(self.tcx), b.repr(self.tcx));
+ debug!("sub_types({} <: {})", a.repr(), b.repr());
self.commit_if_ok(|_| {
let trace = TypeTrace::types(origin, a_is_expected, a, b);
self.sub(a_is_expected, trace).relate(&a, &b).map(|_| ())
-> UnitResult<'tcx>
{
debug!("sub_trait_refs({} <: {})",
- a.repr(self.tcx),
- b.repr(self.tcx));
+ a.repr(),
+ b.repr());
self.commit_if_ok(|_| {
let trace = TypeTrace {
origin: origin,
-> UnitResult<'tcx>
{
debug!("sub_poly_trait_refs({} <: {})",
- a.repr(self.tcx),
- b.repr(self.tcx));
+ a.repr(),
+ b.repr());
self.commit_if_ok(|_| {
let trace = TypeTrace {
origin: origin,
value: &ty::Binder<T>,
snapshot: &CombinedSnapshot)
-> (T, SkolemizationMap)
- where T : TypeFoldable<'tcx> + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + Repr
{
/*! See `higher_ranked::skolemize_late_bound_regions` */
snapshot: &CombinedSnapshot,
value: &T)
-> T
- where T : TypeFoldable<'tcx> + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + Repr
{
/*! See `higher_ranked::plug_leaks` */
}
pub fn ty_to_string(&self, t: Ty<'tcx>) -> String {
- self.resolve_type_vars_if_possible(&t).user_string(self.tcx)
+ self.resolve_type_vars_if_possible(&t).user_string()
}
pub fn tys_to_string(&self, ts: &[Ty<'tcx>]) -> String {
pub fn trait_ref_to_string(&self, t: &ty::TraitRef<'tcx>) -> String {
let t = self.resolve_type_vars_if_possible(t);
- t.user_string(self.tcx)
+ t.user_string()
}
pub fn shallow_resolve(&self, typ: Ty<'tcx>) -> Ty<'tcx> {
lbrct: LateBoundRegionConversionTime,
value: &ty::Binder<T>)
-> (T, FnvHashMap<ty::BoundRegion,ty::Region>)
- where T : TypeFoldable<'tcx> + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + Repr
{
ty_fold::replace_late_bound_regions(
self.tcx,
a: ty::Region,
bs: Vec<ty::Region>) {
debug!("verify_generic_bound({}, {} <: {})",
- kind.repr(self.tcx),
- a.repr(self.tcx),
- bs.repr(self.tcx));
+ kind.repr(),
+ a.repr(),
+ bs.repr());
self.region_vars.verify_generic_bound(origin, kind, a, bs);
}
pub fn can_equate<'b,T>(&'b self, a: &T, b: &T) -> UnitResult<'tcx>
- where T: Relate<'b,'tcx> + Repr<'tcx>
+ where T: Relate<'b,'tcx> + Repr
{
- debug!("can_equate({}, {})", a.repr(self.tcx), b.repr(self.tcx));
+ debug!("can_equate({}, {})", a.repr(), b.repr());
self.probe(|_| {
// Gin up a dummy trace, since this won't be committed
// anyhow. We should make this typetrace stuff more
}
}
-impl<'tcx> Repr<'tcx> for TypeTrace<'tcx> {
- fn repr(&self, tcx: &ty::ctxt) -> String {
- format!("TypeTrace({})", self.origin.repr(tcx))
+impl<'tcx> Repr for TypeTrace<'tcx> {
+ fn repr(&self) -> String {
+ format!("TypeTrace({})", self.origin.repr())
}
}
}
}
-impl<'tcx> Repr<'tcx> for TypeOrigin {
- fn repr(&self, tcx: &ty::ctxt) -> String {
+impl<'tcx> Repr for TypeOrigin {
+ fn repr(&self) -> String {
match *self {
MethodCompatCheck(a) => {
- format!("MethodCompatCheck({})", a.repr(tcx))
+ format!("MethodCompatCheck({})", a.repr())
}
ExprAssignable(a) => {
- format!("ExprAssignable({})", a.repr(tcx))
+ format!("ExprAssignable({})", a.repr())
}
- Misc(a) => format!("Misc({})", a.repr(tcx)),
+ Misc(a) => format!("Misc({})", a.repr()),
RelateTraitRefs(a) => {
- format!("RelateTraitRefs({})", a.repr(tcx))
+ format!("RelateTraitRefs({})", a.repr())
}
RelateSelfType(a) => {
- format!("RelateSelfType({})", a.repr(tcx))
+ format!("RelateSelfType({})", a.repr())
}
RelateOutputImplTypes(a) => {
- format!("RelateOutputImplTypes({})", a.repr(tcx))
+ format!("RelateOutputImplTypes({})", a.repr())
}
MatchExpressionArm(a, b) => {
- format!("MatchExpressionArm({}, {})", a.repr(tcx), b.repr(tcx))
+ format!("MatchExpressionArm({}, {})", a.repr(), b.repr())
}
IfExpression(a) => {
- format!("IfExpression({})", a.repr(tcx))
+ format!("IfExpression({})", a.repr())
}
IfExpressionWithNoElse(a) => {
- format!("IfExpressionWithNoElse({})", a.repr(tcx))
+ format!("IfExpressionWithNoElse({})", a.repr())
}
RangeExpression(a) => {
- format!("RangeExpression({})", a.repr(tcx))
+ format!("RangeExpression({})", a.repr())
}
EquatePredicate(a) => {
- format!("EquatePredicate({})", a.repr(tcx))
+ format!("EquatePredicate({})", a.repr())
}
}
}
}
}
-impl<'tcx> Repr<'tcx> for SubregionOrigin<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for SubregionOrigin<'tcx> {
+ fn repr(&self) -> String {
match *self {
Subtype(ref a) => {
- format!("Subtype({})", a.repr(tcx))
+ format!("Subtype({})", a.repr())
}
InfStackClosure(a) => {
- format!("InfStackClosure({})", a.repr(tcx))
+ format!("InfStackClosure({})", a.repr())
}
InvokeClosure(a) => {
- format!("InvokeClosure({})", a.repr(tcx))
+ format!("InvokeClosure({})", a.repr())
}
DerefPointer(a) => {
- format!("DerefPointer({})", a.repr(tcx))
+ format!("DerefPointer({})", a.repr())
}
FreeVariable(a, b) => {
- format!("FreeVariable({}, {})", a.repr(tcx), b)
+ format!("FreeVariable({}, {})", a.repr(), b)
}
IndexSlice(a) => {
- format!("IndexSlice({})", a.repr(tcx))
+ format!("IndexSlice({})", a.repr())
}
RelateObjectBound(a) => {
- format!("RelateObjectBound({})", a.repr(tcx))
+ format!("RelateObjectBound({})", a.repr())
}
RelateParamBound(a, b) => {
format!("RelateParamBound({},{})",
- a.repr(tcx),
- b.repr(tcx))
+ a.repr(),
+ b.repr())
}
RelateRegionParamBound(a) => {
format!("RelateRegionParamBound({})",
- a.repr(tcx))
+ a.repr())
}
RelateDefaultParamBound(a, b) => {
format!("RelateDefaultParamBound({},{})",
- a.repr(tcx),
- b.repr(tcx))
+ a.repr(),
+ b.repr())
}
- Reborrow(a) => format!("Reborrow({})", a.repr(tcx)),
+ Reborrow(a) => format!("Reborrow({})", a.repr()),
ReborrowUpvar(a, b) => {
- format!("ReborrowUpvar({},{:?})", a.repr(tcx), b)
+ format!("ReborrowUpvar({},{:?})", a.repr(), b)
}
ReferenceOutlivesReferent(_, a) => {
- format!("ReferenceOutlivesReferent({})", a.repr(tcx))
+ format!("ReferenceOutlivesReferent({})", a.repr())
}
ExprTypeIsNotInScope(a, b) => {
format!("ExprTypeIsNotInScope({}, {})",
- a.repr(tcx),
- b.repr(tcx))
+ a.repr(),
+ b.repr())
}
BindingTypeIsNotValidAtDecl(a) => {
- format!("BindingTypeIsNotValidAtDecl({})", a.repr(tcx))
+ format!("BindingTypeIsNotValidAtDecl({})", a.repr())
}
- CallRcvr(a) => format!("CallRcvr({})", a.repr(tcx)),
- CallArg(a) => format!("CallArg({})", a.repr(tcx)),
- CallReturn(a) => format!("CallReturn({})", a.repr(tcx)),
- Operand(a) => format!("Operand({})", a.repr(tcx)),
- AddrOf(a) => format!("AddrOf({})", a.repr(tcx)),
- AutoBorrow(a) => format!("AutoBorrow({})", a.repr(tcx)),
- SafeDestructor(a) => format!("SafeDestructor({})", a.repr(tcx)),
+ CallRcvr(a) => format!("CallRcvr({})", a.repr()),
+ CallArg(a) => format!("CallArg({})", a.repr()),
+ CallReturn(a) => format!("CallReturn({})", a.repr()),
+ Operand(a) => format!("Operand({})", a.repr()),
+ AddrOf(a) => format!("AddrOf({})", a.repr()),
+ AutoBorrow(a) => format!("AutoBorrow({})", a.repr()),
+ SafeDestructor(a) => format!("SafeDestructor({})", a.repr()),
}
}
}
}
}
-impl<'tcx> Repr<'tcx> for RegionVariableOrigin {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for RegionVariableOrigin {
+ fn repr(&self) -> String {
match *self {
MiscVariable(a) => {
- format!("MiscVariable({})", a.repr(tcx))
+ format!("MiscVariable({})", a.repr())
}
PatternRegion(a) => {
- format!("PatternRegion({})", a.repr(tcx))
+ format!("PatternRegion({})", a.repr())
}
AddrOfRegion(a) => {
- format!("AddrOfRegion({})", a.repr(tcx))
+ format!("AddrOfRegion({})", a.repr())
}
- Autoref(a) => format!("Autoref({})", a.repr(tcx)),
- Coercion(a) => format!("Coercion({})", a.repr(tcx)),
+ Autoref(a) => format!("Autoref({})", a.repr()),
+ Coercion(a) => format!("Coercion({})", a.repr()),
EarlyBoundRegion(a, b) => {
- format!("EarlyBoundRegion({},{})", a.repr(tcx), b.repr(tcx))
+ format!("EarlyBoundRegion({},{})", a.repr(), b.repr())
}
LateBoundRegion(a, b, c) => {
- format!("LateBoundRegion({},{},{:?})", a.repr(tcx), b.repr(tcx), c)
+ format!("LateBoundRegion({},{},{:?})", a.repr(), b.repr(), c)
}
BoundRegionInCoherence(a) => {
- format!("bound_regionInCoherence({})", a.repr(tcx))
+ format!("bound_regionInCoherence({})", a.repr())
}
UpvarRegion(a, b) => {
- format!("UpvarRegion({}, {})", a.repr(tcx), b.repr(tcx))
+ format!("UpvarRegion({}, {})", a.repr(), b.repr())
}
}
}
Node::RegionVid(n_vid) =>
dot::LabelText::label(format!("{:?}", n_vid)),
Node::Region(n_rgn) =>
- dot::LabelText::label(format!("{}", n_rgn.repr(self.tcx))),
+ dot::LabelText::label(format!("{}", n_rgn.repr())),
}
}
fn edge_label(&self, e: &Edge) -> dot::LabelText {
match *e {
Edge::Constraint(ref c) =>
- dot::LabelText::label(format!("{}", self.map.get(c).unwrap().repr(self.tcx))),
+ dot::LabelText::label(format!("{}", self.map.get(c).unwrap().repr())),
Edge::EnclScope(..) =>
dot::LabelText::label(format!("(enclosed)")),
}
self.undo_log.borrow_mut().push(AddVar(vid));
}
debug!("created new region variable {:?} with origin {}",
- vid, origin.repr(self.tcx));
+ vid, origin.repr());
return vid;
}
assert!(self.values_are_none());
debug!("RegionVarBindings: add_constraint({})",
- constraint.repr(self.tcx));
+ constraint.repr());
if self.constraints.borrow_mut().insert(constraint, origin).is_none() {
if self.in_snapshot() {
assert!(self.values_are_none());
debug!("RegionVarBindings: add_verify({})",
- verify.repr(self.tcx));
+ verify.repr());
let mut verifys = self.verifys.borrow_mut();
let index = verifys.len();
let mut givens = self.givens.borrow_mut();
if givens.insert((sub, sup)) {
debug!("add_given({} <= {:?})",
- sub.repr(self.tcx),
+ sub.repr(),
sup);
self.undo_log.borrow_mut().push(AddGiven(sub, sup));
assert!(self.values_are_none());
debug!("RegionVarBindings: make_subregion({}, {}) due to {}",
- sub.repr(self.tcx),
- sup.repr(self.tcx),
- origin.repr(self.tcx));
+ sub.repr(),
+ sup.repr(),
+ origin.repr());
match (sub, sup) {
(ReEarlyBound(..), ReEarlyBound(..)) => {
self.tcx.sess.span_bug(
origin.span(),
&format!("cannot relate bound region: {} <= {}",
- sub.repr(self.tcx),
- sup.repr(self.tcx)));
+ sub.repr(),
+ sup.repr()));
}
(_, ReStatic) => {
// all regions are subregions of static, so we can ignore this
assert!(self.values_are_none());
debug!("RegionVarBindings: lub_regions({}, {})",
- a.repr(self.tcx),
- b.repr(self.tcx));
+ a.repr(),
+ b.repr());
match (a, b) {
(ReStatic, _) | (_, ReStatic) => {
ReStatic // nothing lives longer than static
assert!(self.values_are_none());
debug!("RegionVarBindings: glb_regions({}, {})",
- a.repr(self.tcx),
- b.repr(self.tcx));
+ a.repr(),
+ b.repr());
match (a, b) {
(ReStatic, r) | (r, ReStatic) => {
// static lives longer than everything else
}
Some(ref values) => {
let r = lookup(values, rid);
- debug!("resolve_var({:?}) = {}", rid, r.repr(self.tcx));
+ debug!("resolve_var({:?}) = {}", rid, r.repr());
r
}
}
/// made---`r0` itself will be the first entry. This is used when checking whether skolemized
/// regions are being improperly related to other regions.
pub fn tainted(&self, mark: &RegionSnapshot, r0: Region) -> Vec<Region> {
- debug!("tainted(mark={:?}, r0={})", mark, r0.repr(self.tcx));
+ debug!("tainted(mark={:?}, r0={})", mark, r0.repr());
let _indenter = indenter();
// `result_set` acts as a worklist: we explore all outgoing
(_, ReEarlyBound(..)) => {
self.tcx.sess.bug(
&format!("cannot relate bound region: LUB({}, {})",
- a.repr(self.tcx),
- b.repr(self.tcx)));
+ a.repr(),
+ b.repr()));
}
(ReStatic, _) | (_, ReStatic) => {
(_, ReEarlyBound(..)) => {
self.tcx.sess.bug(
&format!("cannot relate bound region: GLB({}, {})",
- a.repr(self.tcx),
- b.repr(self.tcx)));
+ a.repr(),
+ b.repr()));
}
(ReStatic, r) | (r, ReStatic) => {
fn dump_constraints(&self) {
debug!("----() Start constraint listing ()----");
for (idx, (constraint, _)) in self.constraints.borrow().iter().enumerate() {
- debug!("Constraint {} => {}", idx, constraint.repr(self.tcx));
+ debug!("Constraint {} => {}", idx, constraint.repr());
}
}
fn expansion(&self, free_regions: &FreeRegionMap, var_data: &mut [VarData]) {
self.iterate_until_fixed_point("Expansion", |constraint| {
debug!("expansion: constraint={} origin={}",
- constraint.repr(self.tcx),
+ constraint.repr(),
self.constraints.borrow()
.get(constraint)
.unwrap()
- .repr(self.tcx));
+ .repr());
match *constraint {
ConstrainRegSubVar(a_region, b_vid) => {
let b_data = &mut var_data[b_vid.index as usize];
-> bool
{
debug!("expand_node({}, {:?} == {})",
- a_region.repr(self.tcx),
+ a_region.repr(),
b_vid,
- b_data.value.repr(self.tcx));
+ b_data.value.repr());
// Check if this relationship is implied by a given.
match a_region {
match b_data.value {
NoValue => {
debug!("Setting initial value of {:?} to {}",
- b_vid, a_region.repr(self.tcx));
+ b_vid, a_region.repr());
b_data.value = Value(a_region);
return true;
debug!("Expanding value of {:?} from {} to {}",
b_vid,
- cur_region.repr(self.tcx),
- lub.repr(self.tcx));
+ cur_region.repr(),
+ lub.repr());
b_data.value = Value(lub);
return true;
var_data: &mut [VarData]) {
self.iterate_until_fixed_point("Contraction", |constraint| {
debug!("contraction: constraint={} origin={}",
- constraint.repr(self.tcx),
+ constraint.repr(),
self.constraints.borrow()
.get(constraint)
.unwrap()
- .repr(self.tcx));
+ .repr());
match *constraint {
ConstrainRegSubVar(..) => {
// This is an expansion constraint. Ignore.
b_region: Region)
-> bool {
debug!("contract_node({:?} == {}/{:?}, {})",
- a_vid, a_data.value.repr(self.tcx),
- a_data.classification, b_region.repr(self.tcx));
+ a_vid, a_data.value.repr(),
+ a_data.classification, b_region.repr());
return match a_data.value {
NoValue => {
if !free_regions.is_subregion_of(this.tcx, a_region, b_region) {
debug!("Setting {:?} to ErrorValue: {} not subregion of {}",
a_vid,
- a_region.repr(this.tcx),
- b_region.repr(this.tcx));
+ a_region.repr(),
+ b_region.repr());
a_data.value = ErrorValue;
}
false
} else {
debug!("Contracting value of {:?} from {} to {}",
a_vid,
- a_region.repr(this.tcx),
- glb.repr(this.tcx));
+ a_region.repr(),
+ glb.repr());
a_data.value = Value(glb);
true
}
Err(_) => {
debug!("Setting {:?} to ErrorValue: no glb of {}, {}",
a_vid,
- a_region.repr(this.tcx),
- b_region.repr(this.tcx));
+ a_region.repr(),
+ b_region.repr());
a_data.value = ErrorValue;
false
}
}
debug!("ConcreteFailure: !(sub <= sup): sub={}, sup={}",
- sub.repr(self.tcx),
- sup.repr(self.tcx));
+ sub.repr(),
+ sup.repr());
errors.push(ConcreteFailure((*origin).clone(), sub, sup));
}
&format!("collect_error_for_expanding_node() could not find error \
for var {:?}, lower_bounds={}, upper_bounds={}",
node_idx,
- lower_bounds.repr(self.tcx),
- upper_bounds.repr(self.tcx)));
+ lower_bounds.repr(),
+ upper_bounds.repr()));
}
fn collect_error_for_contracting_node(
&format!("collect_error_for_contracting_node() could not find error \
for var {:?}, upper_bounds={}",
node_idx,
- upper_bounds.repr(self.tcx)));
+ upper_bounds.repr()));
}
fn collect_concrete_regions(&self,
let edge_changed = body(constraint);
if edge_changed {
debug!("Updated due to constraint {}",
- constraint.repr(self.tcx));
+ constraint.repr());
changed = true;
}
}
}
-impl<'tcx> Repr<'tcx> for Constraint {
- fn repr(&self, tcx: &ty::ctxt) -> String {
+impl Repr for Constraint {
+ fn repr(&self) -> String {
match *self {
ConstrainVarSubVar(a, b) => {
- format!("ConstrainVarSubVar({}, {})", a.repr(tcx), b.repr(tcx))
+ format!("ConstrainVarSubVar({}, {})", a.repr(), b.repr())
}
ConstrainRegSubVar(a, b) => {
- format!("ConstrainRegSubVar({}, {})", a.repr(tcx), b.repr(tcx))
+ format!("ConstrainRegSubVar({}, {})", a.repr(), b.repr())
}
ConstrainVarSubReg(a, b) => {
- format!("ConstrainVarSubReg({}, {})", a.repr(tcx), b.repr(tcx))
+ format!("ConstrainVarSubReg({}, {})", a.repr(), b.repr())
}
}
}
}
-impl<'tcx> Repr<'tcx> for Verify<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for Verify<'tcx> {
+ fn repr(&self) -> String {
match *self {
VerifyRegSubReg(_, ref a, ref b) => {
- format!("VerifyRegSubReg({}, {})", a.repr(tcx), b.repr(tcx))
+ format!("VerifyRegSubReg({}, {})", a.repr(), b.repr())
}
VerifyGenericBound(_, ref p, ref a, ref bs) => {
format!("VerifyGenericBound({}, {}, {})",
- p.repr(tcx), a.repr(tcx), bs.repr(tcx))
+ p.repr(), a.repr(), bs.repr())
}
}
}
}
}
-impl<'tcx> Repr<'tcx> for VarValue {
- fn repr(&self, tcx: &ty::ctxt) -> String {
+impl Repr for VarValue {
+ fn repr(&self) -> String {
match *self {
NoValue => format!("NoValue"),
- Value(r) => format!("Value({})", r.repr(tcx)),
+ Value(r) => format!("Value({})", r.repr()),
ErrorValue => format!("ErrorValue"),
}
}
}
-impl<'tcx> Repr<'tcx> for RegionAndOrigin<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for RegionAndOrigin<'tcx> {
+ fn repr(&self) -> String {
format!("RegionAndOrigin({},{})",
- self.region.repr(tcx),
- self.origin.repr(tcx))
+ self.region.repr(),
+ self.origin.repr())
}
}
-impl<'tcx> Repr<'tcx> for GenericKind<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for GenericKind<'tcx> {
+ fn repr(&self) -> String {
match *self {
- GenericKind::Param(ref p) => p.repr(tcx),
- GenericKind::Projection(ref p) => p.repr(tcx),
+ GenericKind::Param(ref p) => p.repr(),
+ GenericKind::Projection(ref p) => p.repr(),
}
}
}
-impl<'tcx> UserString<'tcx> for GenericKind<'tcx> {
- fn user_string(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> UserString for GenericKind<'tcx> {
+ fn user_string(&self) -> String {
match *self {
- GenericKind::Param(ref p) => p.user_string(tcx),
- GenericKind::Projection(ref p) => p.user_string(tcx),
+ GenericKind::Param(ref p) => p.user_string(),
+ GenericKind::Projection(ref p) => p.user_string(),
}
}
}
ty::TyInfer(_) => {
self.infcx.tcx.sess.bug(
&format!("Unexpected type in full type resolver: {}",
- t.repr(self.infcx.tcx)));
+ t.repr()));
}
_ => {
ty_fold::super_fold_ty(self, t)
}
fn tys(&mut self, a: Ty<'tcx>, b: Ty<'tcx>) -> RelateResult<'tcx, Ty<'tcx>> {
- debug!("{}.tys({}, {})", self.tag(), a.repr(self.tcx()), b.repr(self.tcx()));
+ debug!("{}.tys({}, {})", self.tag(), a.repr(), b.repr());
if a == b { return Ok(a); }
fn regions(&mut self, a: ty::Region, b: ty::Region) -> RelateResult<'tcx, ty::Region> {
debug!("{}.regions({}, {})",
self.tag(),
- a.repr(self.tcx()),
- b.repr(self.tcx()));
+ a.repr(),
+ b.repr());
let origin = Subtype(self.fields.trace.clone());
self.fields.infcx.region_vars.make_subregion(origin, a, b);
Ok(a)
match types_in_scope.next() {
None => {
debug!("with_each_combination(substs={})",
- substs.repr(self.tcx));
+ substs.repr());
callback(substs);
}
Some((space, index, ¶m_ty)) => {
debug!("with_each_combination: space={:?}, index={}, param_ty={}",
- space, index, param_ty.repr(self.tcx));
+ space, index, param_ty.repr());
if !ty::type_is_sized(Some(param_env), self.tcx, span, param_ty) {
debug!("with_each_combination: param_ty is not known to be sized");
}
fn push_transmute_restriction(&self, restriction: TransmuteRestriction<'tcx>) {
- debug!("Pushing transmute restriction: {}", restriction.repr(self.tcx));
+ debug!("Pushing transmute restriction: {}", restriction.repr());
self.tcx.transmute_restrictions.borrow_mut().push(restriction);
}
}
}
}
-impl<'tcx> Repr<'tcx> for TransmuteRestriction<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for TransmuteRestriction<'tcx> {
+ fn repr(&self) -> String {
format!("TransmuteRestriction(id={}, original=({},{}), substituted=({},{}))",
self.id,
- self.original_from.repr(tcx),
- self.original_to.repr(tcx),
- self.substituted_from.repr(tcx),
- self.substituted_to.repr(tcx))
+ self.original_from.repr(),
+ self.original_to.repr(),
+ self.substituted_from.repr(),
+ self.substituted_to.repr())
}
}
_ => base_ty,
};
debug!("pat_ty(pat={}) base_ty={} ret_ty={}",
- pat.repr(tcx), base_ty.repr(tcx), ret_ty.repr(tcx));
+ pat.repr(), base_ty.repr(), ret_ty.repr());
Ok(ret_ty)
}
ty::AdjustUnsafeFnPointer |
ty::AdjustDerefRef(_) => {
debug!("cat_expr({}): {}",
- adjustment.repr(self.tcx()),
- expr.repr(self.tcx()));
+ adjustment.repr(),
+ expr.repr());
// Result is an rvalue.
let expr_ty = try!(self.expr_ty_adjusted(expr));
Ok(self.cat_rvalue_node(expr.id(), expr.span(), expr_ty))
let mut cmt = try!(self.cat_expr_unadjusted(expr));
debug!("cat_expr_autoderefd: autoderefs={}, cmt={}",
autoderefs,
- cmt.repr(self.tcx()));
+ cmt.repr());
for deref in 1..autoderefs + 1 {
cmt = try!(self.cat_deref(expr, cmt, deref, None));
}
}
pub fn cat_expr_unadjusted(&self, expr: &ast::Expr) -> McResult<cmt<'tcx>> {
- debug!("cat_expr: id={} expr={}", expr.id, expr.repr(self.tcx()));
+ debug!("cat_expr: id={} expr={}", expr.id, expr.repr());
let expr_ty = try!(self.expr_ty(expr));
match expr.node {
let base_cmt = try!(self.cat_expr(&**base));
debug!("cat_expr(cat_field): id={} expr={} base={}",
expr.id,
- expr.repr(self.tcx()),
- base_cmt.repr(self.tcx()));
+ expr.repr(),
+ base_cmt.repr());
Ok(self.cat_field(expr, base_cmt, f_name.node.name, expr_ty))
}
ty::TyRef(_, mt) => mt.ty,
_ => {
debug!("cat_expr_unadjusted: return type of overloaded index is {}?",
- ret_ty.repr(self.tcx()));
+ ret_ty.repr());
return Err(());
}
};
def: def::Def)
-> McResult<cmt<'tcx>> {
debug!("cat_def: id={} expr={} def={:?}",
- id, expr_ty.repr(self.tcx()), def);
+ id, expr_ty.repr(), def);
match def {
def::DefStruct(..) | def::DefVariant(..) | def::DefConst(..) |
span,
&format!("Upvar of non-closure {} - {}",
fn_node_id,
- ty.repr(self.tcx())));
+ ty.repr()));
}
}
}
};
let ret = Rc::new(cmt_result);
- debug!("cat_upvar ret={}", ret.repr(self.tcx()));
+ debug!("cat_upvar ret={}", ret.repr());
Ok(ret)
}
note: NoteClosureEnv(upvar_id)
};
- debug!("env_deref ret {}", ret.repr(self.tcx()));
+ debug!("env_deref ret {}", ret.repr());
ret
}
ty::ReStatic
};
let ret = self.cat_rvalue(id, span, re, expr_ty);
- debug!("cat_rvalue_node ret {}", ret.repr(self.tcx()));
+ debug!("cat_rvalue_node ret {}", ret.repr());
ret
}
ty:expr_ty,
note: NoteNone
});
- debug!("cat_rvalue ret {}", ret.repr(self.tcx()));
+ debug!("cat_rvalue ret {}", ret.repr());
ret
}
ty: f_ty,
note: NoteNone
});
- debug!("cat_field ret {}", ret.repr(self.tcx()));
+ debug!("cat_field ret {}", ret.repr());
ret
}
ty: f_ty,
note: NoteNone
});
- debug!("cat_tup_field ret {}", ret.repr(self.tcx()));
+ debug!("cat_tup_field ret {}", ret.repr());
ret
}
let method_ty = self.typer.node_method_ty(method_call);
debug!("cat_deref: method_call={:?} method_ty={:?}",
- method_call, method_ty.map(|ty| ty.repr(self.tcx())));
+ method_call, method_ty.map(|ty| ty.repr()));
let base_cmt = match method_ty {
Some(method_ty) => {
mt.ty,
deref_context,
/* implicit: */ false);
- debug!("cat_deref ret {}", ret.repr(self.tcx()));
+ debug!("cat_deref ret {}", ret.repr());
ret
}
None => {
debug!("Explicit deref of non-derefable type: {}",
- base_cmt_ty.repr(self.tcx()));
+ base_cmt_ty.repr());
return Err(());
}
}
ty: deref_ty,
note: NoteNone
});
- debug!("cat_deref_common ret {}", ret.repr(self.tcx()));
+ debug!("cat_deref_common ret {}", ret.repr());
Ok(ret)
}
let m = base_cmt.mutbl.inherit();
let ret = interior(elt, base_cmt.clone(), base_cmt.ty,
m, context, element_ty);
- debug!("cat_index ret {}", ret.repr(self.tcx()));
+ debug!("cat_index ret {}", ret.repr());
return Ok(ret);
fn interior<'tcx, N: ast_node>(elt: &N,
base_cmt
}
};
- debug!("deref_vec ret {}", ret.repr(self.tcx()));
+ debug!("deref_vec ret {}", ret.repr());
Ok(ret)
}
ty: interior_ty,
note: NoteNone
});
- debug!("cat_imm_interior ret={}", ret.repr(self.tcx()));
+ debug!("cat_imm_interior ret={}", ret.repr());
ret
}
ty: downcast_ty,
note: NoteNone
});
- debug!("cat_downcast ret={}", ret.repr(self.tcx()));
+ debug!("cat_downcast ret={}", ret.repr());
ret
}
debug!("cat_pattern: id={} pat={} cmt={}",
pat.id, pprust::pat_to_string(pat),
- cmt.repr(self.tcx()));
+ cmt.repr());
(*op)(self, cmt.clone(), pat);
let upvar = self.upvar();
match upvar.as_ref().map(|i| &i.cat) {
Some(&cat_upvar(ref var)) => {
- var.user_string(tcx)
+ var.user_string()
}
Some(_) => unreachable!(),
None => {
"pattern-bound indexed content".to_string()
}
cat_upvar(ref var) => {
- var.user_string(tcx)
+ var.user_string()
}
cat_downcast(ref cmt, _) => {
cmt.descriptive_string(tcx)
}
}
-impl<'tcx> Repr<'tcx> for cmt_<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for cmt_<'tcx> {
+ fn repr(&self) -> String {
format!("{{{} id:{} m:{:?} ty:{}}}",
- self.cat.repr(tcx),
+ self.cat.repr(),
self.id,
self.mutbl,
- self.ty.repr(tcx))
+ self.ty.repr())
}
}
-impl<'tcx> Repr<'tcx> for categorization<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for categorization<'tcx> {
+ fn repr(&self) -> String {
match *self {
cat_static_item |
cat_rvalue(..) |
format!("{:?}", *self)
}
cat_deref(ref cmt, derefs, ptr) => {
- format!("{}-{}{}->", cmt.cat.repr(tcx), ptr.repr(tcx), derefs)
+ format!("{}-{}{}->", cmt.cat.repr(), ptr.repr(), derefs)
}
cat_interior(ref cmt, interior) => {
- format!("{}.{}", cmt.cat.repr(tcx), interior.repr(tcx))
+ format!("{}.{}", cmt.cat.repr(), interior.repr())
}
cat_downcast(ref cmt, _) => {
- format!("{}->(enum)", cmt.cat.repr(tcx))
+ format!("{}->(enum)", cmt.cat.repr())
}
}
}
}
}
-impl<'tcx> Repr<'tcx> for PointerKind {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl Repr for PointerKind {
+ fn repr(&self) -> String {
match *self {
Unique => {
format!("Box")
}
BorrowedPtr(ty::ImmBorrow, ref r) |
Implicit(ty::ImmBorrow, ref r) => {
- format!("&{}", r.repr(tcx))
+ format!("&{}", r.repr())
}
BorrowedPtr(ty::MutBorrow, ref r) |
Implicit(ty::MutBorrow, ref r) => {
- format!("&{} mut", r.repr(tcx))
+ format!("&{} mut", r.repr())
}
BorrowedPtr(ty::UniqueImmBorrow, ref r) |
Implicit(ty::UniqueImmBorrow, ref r) => {
- format!("&{} uniq", r.repr(tcx))
+ format!("&{} uniq", r.repr())
}
UnsafePtr(_) => {
format!("*")
}
}
-impl<'tcx> Repr<'tcx> for InteriorKind {
- fn repr(&self, _tcx: &ty::ctxt) -> String {
+impl Repr for InteriorKind {
+ fn repr(&self) -> String {
match *self {
InteriorField(NamedField(fld)) => {
token::get_name(fld).to_string()
}
}
-impl<'tcx> Repr<'tcx> for ty::ClosureKind {
- fn repr(&self, _: &ty::ctxt) -> String {
+impl Repr for ty::ClosureKind {
+ fn repr(&self) -> String {
format!("Upvar({:?})", self)
}
}
-impl<'tcx> Repr<'tcx> for Upvar {
- fn repr(&self, tcx: &ty::ctxt) -> String {
- format!("Upvar({})", self.kind.repr(tcx))
+impl Repr for Upvar {
+ fn repr(&self) -> String {
+ format!("Upvar({})", self.kind.repr())
}
}
-impl<'tcx> UserString<'tcx> for Upvar {
- fn user_string(&self, _: &ty::ctxt) -> String {
+impl UserString for Upvar {
+ fn user_string(&self) -> String {
let kind = match self.kind {
ty::FnClosureKind => "Fn",
ty::FnMutClosureKind => "FnMut",
tcx.sess.span_bug(e.span,
&format!("stability::check_expr: struct construction \
of non-struct, type {:?}",
- type_.repr(tcx)));
+ type_.repr()));
}
}
}
}
fn lookup_uncached<'tcx>(tcx: &ty::ctxt<'tcx>, id: DefId) -> Option<&'tcx Stability> {
- debug!("lookup(id={})", id.repr(tcx));
+ debug!("lookup(id={})", id.repr());
// is this definition the implementation of a trait method?
match ty::trait_item_of_item(tcx, id) {
when substituting in region {} (root type={}) \
(space={:?}, index={})",
data.name.as_str(),
- self.root_ty.repr(self.tcx()),
+ self.root_ty.repr(),
data.space,
data.index));
}
span,
&format!("Type parameter `{}` ({}/{:?}/{}) out of range \
when substituting (root type={}) substs={}",
- p.repr(self.tcx()),
- source_ty.repr(self.tcx()),
+ p.repr(),
+ source_ty.repr(),
p.space,
p.idx,
- self.root_ty.repr(self.tcx()),
- self.substs.repr(self.tcx())));
+ self.root_ty.repr(),
+ self.substs.repr()));
}
};
/// is that only in the second case have we passed through a fn binder.
fn shift_regions_through_binders(&self, ty: Ty<'tcx>) -> Ty<'tcx> {
debug!("shift_regions(ty={:?}, region_binders_passed={:?}, type_has_escaping_regions={:?})",
- ty.repr(self.tcx()), self.region_binders_passed, ty::type_has_escaping_regions(ty));
+ ty.repr(), self.region_binders_passed, ty::type_has_escaping_regions(ty));
if self.region_binders_passed == 0 || !ty::type_has_escaping_regions(ty) {
return ty;
}
let result = ty_fold::shift_regions(self.tcx(), self.region_binders_passed, &ty);
- debug!("shift_regions: shifted result = {:?}", result.repr(self.tcx()));
+ debug!("shift_regions: shifted result = {:?}", result.repr());
result
}
debug!("impl_can_satisfy(\
impl1_def_id={}, \
impl2_def_id={})",
- impl1_def_id.repr(infcx.tcx),
- impl2_def_id.repr(infcx.tcx));
+ impl1_def_id.repr(),
+ impl2_def_id.repr());
let param_env = &ty::empty_parameter_environment(infcx.tcx);
let selcx = &mut SelectionContext::intercrate(infcx, param_env);
-> bool
{
debug!("overlap(a_def_id={}, b_def_id={})",
- a_def_id.repr(selcx.tcx()),
- b_def_id.repr(selcx.tcx()));
+ a_def_id.repr(),
+ b_def_id.repr());
let (a_trait_ref, a_obligations) = impl_trait_ref_and_oblig(selcx,
a_def_id,
b_def_id,
util::fresh_type_vars_for_impl);
- debug!("overlap: a_trait_ref={}", a_trait_ref.repr(selcx.tcx()));
+ debug!("overlap: a_trait_ref={}", a_trait_ref.repr());
- debug!("overlap: b_trait_ref={}", b_trait_ref.repr(selcx.tcx()));
+ debug!("overlap: b_trait_ref={}", b_trait_ref.repr());
// Does `a <: b` hold? If not, no overlap.
if let Err(_) = infer::mk_sub_poly_trait_refs(selcx.infcx(),
.find(|o| !selcx.evaluate_obligation(o));
if let Some(failing_obligation) = opt_failing_obligation {
- debug!("overlap: obligation unsatisfiable {}", failing_obligation.repr(tcx));
+ debug!("overlap: obligation unsatisfiable {}", failing_obligation.repr());
return false
}
pub fn trait_ref_is_knowable<'tcx>(tcx: &ty::ctxt<'tcx>, trait_ref: &ty::TraitRef<'tcx>) -> bool
{
- debug!("trait_ref_is_knowable(trait_ref={})", trait_ref.repr(tcx));
+ debug!("trait_ref_is_knowable(trait_ref={})", trait_ref.repr());
// if the orphan rules pass, that means that no ancestor crate can
// impl this, so it's up to us.
impl_def_id: ast::DefId)
-> Result<(), OrphanCheckErr<'tcx>>
{
- debug!("orphan_check({})", impl_def_id.repr(tcx));
+ debug!("orphan_check({})", impl_def_id.repr());
// We only except this routine to be invoked on implementations
// of a trait, not inherent implementations.
let trait_ref = ty::impl_trait_ref(tcx, impl_def_id).unwrap();
- debug!("orphan_check: trait_ref={}", trait_ref.repr(tcx));
+ debug!("orphan_check: trait_ref={}", trait_ref.repr());
// If the *trait* is local to the crate, ok.
if trait_ref.def_id.krate == ast::LOCAL_CRATE {
debug!("trait {} is local to current crate",
- trait_ref.def_id.repr(tcx));
+ trait_ref.def_id.repr());
return Ok(());
}
-> Result<(), OrphanCheckErr<'tcx>>
{
debug!("orphan_check_trait_ref(trait_ref={}, infer_is_local={})",
- trait_ref.repr(tcx), infer_is_local.0);
+ trait_ref.repr(), infer_is_local.0);
// First, create an ordered iterator over all the type parameters to the trait, with the self
// type appearing first.
// some local type.
for input_ty in input_tys {
if ty_is_local(tcx, input_ty, infer_is_local) {
- debug!("orphan_check_trait_ref: ty_is_local `{}`", input_ty.repr(tcx));
+ debug!("orphan_check_trait_ref: ty_is_local `{}`", input_ty.repr());
// First local input type. Check that there are no
// uncovered type parameters.
let uncovered_tys = uncovered_tys(tcx, input_ty, infer_is_local);
for uncovered_ty in uncovered_tys {
if let Some(param) = uncovered_ty.walk().find(|t| is_type_parameter(t)) {
- debug!("orphan_check_trait_ref: uncovered type `{}`", param.repr(tcx));
+ debug!("orphan_check_trait_ref: uncovered type `{}`", param.repr());
return Err(OrphanCheckErr::UncoveredTy(param));
}
}
// parameters reachable.
if !infer_is_local.0 {
if let Some(param) = input_ty.walk().find(|t| is_type_parameter(t)) {
- debug!("orphan_check_trait_ref: uncovered type `{}`", param.repr(tcx));
+ debug!("orphan_check_trait_ref: uncovered type `{}`", param.repr());
return Err(OrphanCheckErr::UncoveredTy(param));
}
}
infer_is_local: InferIsLocal)
-> bool
{
- debug!("ty_is_local_constructor({})", ty.repr(tcx));
+ debug!("ty_is_local_constructor({})", ty.repr());
match ty.sty {
ty::TyBool |
ty::TyError => {
tcx.sess.bug(
&format!("ty_is_local invoked on unexpected type: {}",
- ty.repr(tcx)))
+ ty.repr()))
}
}
}
if !infcx.tcx.sess.has_errors() || !predicate.references_error() {
span_err!(infcx.tcx.sess, obligation.cause.span, E0271,
"type mismatch resolving `{}`: {}",
- predicate.user_string(infcx.tcx),
+ predicate.user_string(),
ty::type_err_to_str(infcx.tcx, &error.err));
note_obligation_cause(infcx, obligation);
}
item.meta().span
};
let def = ty::lookup_trait_def(infcx.tcx, def_id);
- let trait_str = def.trait_ref.user_string(infcx.tcx);
+ let trait_str = def.trait_ref.user_string();
if let Some(ref istring) = item.value_str() {
let mut generic_map = def.generics.types.iter_enumerated()
.map(|(param, i, gen)| {
(gen.name.as_str().to_string(),
trait_ref.substs.types.get(param, i)
- .user_string(infcx.tcx))
+ .user_string())
}).collect::<HashMap<String, String>>();
generic_map.insert("Self".to_string(),
- trait_ref.self_ty().user_string(infcx.tcx));
+ trait_ref.self_ty().user_string());
let parser = Parser::new(&istring);
let mut errored = false;
let err: String = parser.filter_map(|p| {
pub fn report_overflow_error<'a, 'tcx, T>(infcx: &InferCtxt<'a, 'tcx>,
obligation: &Obligation<'tcx, T>)
-> !
- where T: UserString<'tcx> + TypeFoldable<'tcx>
+ where T: UserString + TypeFoldable<'tcx>
{
let predicate =
infcx.resolve_type_vars_if_possible(&obligation.predicate);
span_err!(infcx.tcx.sess, obligation.cause.span, E0275,
"overflow evaluating the requirement `{}`",
- predicate.user_string(infcx.tcx));
+ predicate.user_string());
suggest_new_overflow_limit(infcx.tcx, obligation.cause.span);
span_err!(infcx.tcx.sess, obligation.cause.span, E0276,
"the requirement `{}` appears on the impl \
method but not on the corresponding trait method",
- obligation.predicate.user_string(infcx.tcx));;
+ obligation.predicate.user_string());;
}
_ => {
match obligation.predicate {
let trait_ref = trait_predicate.to_poly_trait_ref();
span_err!(infcx.tcx.sess, obligation.cause.span, E0277,
"the trait `{}` is not implemented for the type `{}`",
- trait_ref.user_string(infcx.tcx),
- trait_ref.self_ty().user_string(infcx.tcx));
+ trait_ref.user_string(),
+ trait_ref.self_ty().user_string());
// Check if it has a custom "#[rustc_on_unimplemented]"
// error message, report with that message if it does
let custom_note = report_on_unimplemented(infcx, &trait_ref.0,
&predicate).err().unwrap();
span_err!(infcx.tcx.sess, obligation.cause.span, E0278,
"the requirement `{}` is not satisfied (`{}`)",
- predicate.user_string(infcx.tcx),
+ predicate.user_string(),
ty::type_err_to_str(infcx.tcx, &err));
}
&predicate).err().unwrap();
span_err!(infcx.tcx.sess, obligation.cause.span, E0279,
"the requirement `{}` is not satisfied (`{}`)",
- predicate.user_string(infcx.tcx),
+ predicate.user_string(),
ty::type_err_to_str(infcx.tcx, &err));
}
infcx.resolve_type_vars_if_possible(&obligation.predicate);
span_err!(infcx.tcx.sess, obligation.cause.span, E0280,
"the requirement `{}` is not satisfied",
- predicate.user_string(infcx.tcx));
+ predicate.user_string());
}
}
}
span_err!(infcx.tcx.sess, obligation.cause.span, E0281,
"type mismatch: the type `{}` implements the trait `{}`, \
but the trait `{}` is required ({})",
- expected_trait_ref.self_ty().user_string(infcx.tcx),
- expected_trait_ref.user_string(infcx.tcx),
- actual_trait_ref.user_string(infcx.tcx),
+ expected_trait_ref.self_ty().user_string(),
+ expected_trait_ref.user_string(),
+ actual_trait_ref.user_string(),
ty::type_err_to_str(infcx.tcx, e));
note_obligation_cause(infcx, obligation);
}
infcx.tcx.sess.span_note(
obligation.cause.span,
&format!("method `{}` has no receiver",
- method.name.user_string(infcx.tcx)));
+ method.name.user_string()));
}
ObjectSafetyViolation::Method(method,
obligation.cause.span,
&format!("method `{}` references the `Self` type \
in its arguments or return type",
- method.name.user_string(infcx.tcx)));
+ method.name.user_string()));
}
ObjectSafetyViolation::Method(method,
infcx.tcx.sess.span_note(
obligation.cause.span,
&format!("method `{}` has generic type parameters",
- method.name.user_string(infcx.tcx)));
+ method.name.user_string()));
}
}
}
let predicate = infcx.resolve_type_vars_if_possible(&obligation.predicate);
debug!("maybe_report_ambiguity(predicate={}, obligation={})",
- predicate.repr(infcx.tcx),
- obligation.repr(infcx.tcx));
+ predicate.repr(),
+ obligation.repr());
match predicate {
ty::Predicate::Trait(ref data) => {
span_err!(infcx.tcx.sess, obligation.cause.span, E0282,
"unable to infer enough type information about `{}`; \
type annotations or generic parameter binding required",
- self_ty.user_string(infcx.tcx));
+ self_ty.user_string());
} else {
span_err!(infcx.tcx.sess, obligation.cause.span, E0283,
"type annotations required: cannot resolve `{}`",
- predicate.user_string(infcx.tcx));;
+ predicate.user_string());;
note_obligation_cause(infcx, obligation);
}
}
"coherence failed to report ambiguity: \
cannot locate the impl of the trait `{}` for \
the type `{}`",
- trait_ref.user_string(infcx.tcx),
- self_ty.user_string(infcx.tcx)));
+ trait_ref.user_string(),
+ self_ty.user_string()));
}
}
if !infcx.tcx.sess.has_errors() {
span_err!(infcx.tcx.sess, obligation.cause.span, E0284,
"type annotations required: cannot resolve `{}`",
- predicate.user_string(infcx.tcx));;
+ predicate.user_string());;
note_obligation_cause(infcx, obligation);
}
}
fn note_obligation_cause<'a, 'tcx, T>(infcx: &InferCtxt<'a, 'tcx>,
obligation: &Obligation<'tcx, T>)
- where T: UserString<'tcx>
+ where T: UserString
{
note_obligation_cause_code(infcx,
&obligation.predicate,
predicate: &T,
cause_span: Span,
cause_code: &ObligationCauseCode<'tcx>)
- where T: UserString<'tcx>
+ where T: UserString
{
let tcx = infcx.tcx;
match *cause_code {
let parent_trait_ref = infcx.resolve_type_vars_if_possible(&data.parent_trait_ref);
span_note!(tcx.sess, cause_span,
"required because it appears within the type `{}`",
- parent_trait_ref.0.self_ty().user_string(infcx.tcx));
+ parent_trait_ref.0.self_ty().user_string());
let parent_predicate = parent_trait_ref.as_predicate();
note_obligation_cause_code(infcx, &parent_predicate, cause_span, &*data.parent_code);
}
let parent_trait_ref = infcx.resolve_type_vars_if_possible(&data.parent_trait_ref);
span_note!(tcx.sess, cause_span,
"required because of the requirements on the impl of `{}` for `{}`",
- parent_trait_ref.user_string(infcx.tcx),
- parent_trait_ref.0.self_ty().user_string(infcx.tcx));
+ parent_trait_ref.user_string(),
+ parent_trait_ref.0.self_ty().user_string());
let parent_predicate = parent_trait_ref.as_predicate();
note_obligation_cause_code(infcx, &parent_predicate, cause_span, &*data.parent_code);
}
span_note!(tcx.sess, cause_span,
"the requirement `{}` appears on the impl method \
but not on the corresponding trait method",
- predicate.user_string(infcx.tcx));
+ predicate.user_string());
}
}
}
-> Ty<'tcx>
{
debug!("normalize_associated_type(projection_ty={})",
- projection_ty.repr(infcx.tcx));
+ projection_ty.repr());
assert!(!projection_ty.has_escaping_regions());
self.register_predicate_obligation(infcx, obligation);
}
- debug!("normalize_associated_type: result={}", normalized.value.repr(infcx.tcx));
+ debug!("normalize_associated_type: result={}", normalized.value.repr());
normalized.value
}
assert!(!obligation.has_escaping_regions());
if self.is_duplicate_or_add(infcx.tcx, &obligation.predicate) {
- debug!("register_predicate({}) -- already seen, skip", obligation.repr(infcx.tcx));
+ debug!("register_predicate({}) -- already seen, skip", obligation.repr());
return;
}
- debug!("register_predicate({})", obligation.repr(infcx.tcx));
+ debug!("register_predicate({})", obligation.repr());
self.predicates.push(obligation);
}
}
Err(selection_err) => {
debug!("predicate: {} error: {}",
- obligation.repr(tcx),
- selection_err.repr(tcx));
+ obligation.repr(),
+ selection_err.repr());
errors.push(
FulfillmentError::new(
obligation.clone(),
let project_obligation = obligation.with(data.clone());
let result = project::poly_project_and_unify_type(selcx, &project_obligation);
debug!("process_predicate: poly_project_and_unify_type({}) returned {}",
- project_obligation.repr(tcx),
- result.repr(tcx));
+ project_obligation.repr(),
+ result.repr());
match result {
Ok(Some(obligations)) => {
new_obligations.extend(obligations);
}
}
-impl<'tcx> Repr<'tcx> for RegionObligation<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for RegionObligation<'tcx> {
+ fn repr(&self) -> String {
format!("RegionObligation(sub_region={}, sup_type={})",
- self.sub_region.repr(tcx),
- self.sup_type.repr(tcx))
+ self.sub_region.repr(),
+ self.sup_type.repr())
}
}
cause: cause };
debug!("register_region_obligation({})",
- region_obligation.repr(tcx));
+ region_obligation.repr());
region_obligations.entry(region_obligation.cause.body_id).or_insert(vec![])
.push(region_obligation);
-> bool
{
debug!("type_known_to_meet_builtin_bound(ty={}, bound={:?})",
- ty.repr(infcx.tcx),
+ ty.repr(),
bound);
let mut fulfill_cx = FulfillmentContext::new(false);
match fulfill_cx.select_all_or_error(infcx, typer) {
Ok(()) => {
debug!("type_known_to_meet_builtin_bound: ty={} bound={:?} success",
- ty.repr(infcx.tcx),
+ ty.repr(),
bound);
true
}
Err(e) => {
debug!("type_known_to_meet_builtin_bound: ty={} bound={:?} errors={}",
- ty.repr(infcx.tcx),
+ ty.repr(),
bound,
- e.repr(infcx.tcx));
+ e.repr());
false
}
}
let body_id = cause.body_id;
debug!("normalize_param_env_or_error(unnormalized_env={})",
- unnormalized_env.repr(tcx));
+ unnormalized_env.repr());
let predicates: Vec<_> =
util::elaborate_predicates(tcx, unnormalized_env.caller_bounds.clone())
// -nmatsakis
debug!("normalize_param_env_or_error: elaborated-predicates={}",
- predicates.repr(tcx));
+ predicates.repr());
let elaborated_env = unnormalized_env.with_caller_bounds(predicates);
cause: ObligationCause<'tcx>,
value: &T)
-> Result<T, Vec<FulfillmentError<'tcx>>>
- where T : TypeFoldable<'tcx> + HasProjectionTypes + Clone + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + HasProjectionTypes + Clone + Repr
{
let tcx = closure_typer.tcx();
- debug!("normalize_param_env(value={})", value.repr(tcx));
+ debug!("normalize_param_env(value={})", value.repr());
let mut selcx = &mut SelectionContext::new(infcx, closure_typer);
let mut fulfill_cx = FulfillmentContext::new(false);
let Normalized { value: normalized_value, obligations } =
project::normalize(selcx, cause, value);
debug!("normalize_param_env: normalized_value={} obligations={}",
- normalized_value.repr(tcx),
- obligations.repr(tcx));
+ normalized_value.repr(),
+ obligations.repr());
for obligation in obligations {
fulfill_cx.register_predicate_obligation(selcx.infcx(), obligation);
}
try!(fulfill_cx.select_all_or_error(infcx, closure_typer));
let resolved_value = infcx.resolve_type_vars_if_possible(&normalized_value);
- debug!("normalize_param_env: resolved_value={}", resolved_value.repr(tcx));
+ debug!("normalize_param_env: resolved_value={}", resolved_value.repr());
Ok(resolved_value)
}
result
});
- debug!("is_object_safe({}) = {}", trait_def_id.repr(tcx), result);
+ debug!("is_object_safe({}) = {}", trait_def_id.repr(), result);
result
}
}
debug!("object_safety_violations_for_trait(trait_def_id={}) = {}",
- trait_def_id.repr(tcx),
- violations.repr(tcx));
+ trait_def_id.repr(),
+ violations.repr());
violations
}
error
}
-impl<'tcx> Repr<'tcx> for ObjectSafetyViolation<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ObjectSafetyViolation<'tcx> {
+ fn repr(&self) -> String {
match *self {
ObjectSafetyViolation::SizedSelf =>
format!("SizedSelf"),
ObjectSafetyViolation::SupertraitSelf =>
format!("SupertraitSelf"),
ObjectSafetyViolation::Method(ref m, code) =>
- format!("Method({},{:?})", m.repr(tcx), code),
+ format!("Method({},{:?})", m.repr(), code),
}
}
}
-> Result<Option<Vec<PredicateObligation<'tcx>>>, MismatchedProjectionTypes<'tcx>>
{
debug!("poly_project_and_unify_type(obligation={})",
- obligation.repr(selcx.tcx()));
+ obligation.repr());
let infcx = selcx.infcx();
infcx.commit_if_ok(|snapshot| {
-> Result<Option<Vec<PredicateObligation<'tcx>>>, MismatchedProjectionTypes<'tcx>>
{
debug!("project_and_unify_type(obligation={})",
- obligation.repr(selcx.tcx()));
+ obligation.repr());
let Normalized { value: normalized_ty, obligations } =
match opt_normalize_projection_type(selcx,
};
debug!("project_and_unify_type: normalized_ty={} obligations={}",
- normalized_ty.repr(selcx.tcx()),
- obligations.repr(selcx.tcx()));
+ normalized_ty.repr(),
+ obligations.repr());
let infcx = selcx.infcx();
let origin = infer::RelateOutputImplTypes(obligation.cause.span);
fn consider_unification_despite_ambiguity<'cx,'tcx>(selcx: &mut SelectionContext<'cx,'tcx>,
obligation: &ProjectionObligation<'tcx>) {
debug!("consider_unification_despite_ambiguity(obligation={})",
- obligation.repr(selcx.tcx()));
+ obligation.repr());
let def_id = obligation.predicate.projection_ty.trait_ref.def_id;
match selcx.tcx().lang_items.fn_trait_kind(def_id) {
&ty::Binder(ret_type));
debug!("consider_unification_despite_ambiguity: ret_type={:?}",
- ret_type.repr(selcx.tcx()));
+ ret_type.repr());
let origin = infer::RelateOutputImplTypes(obligation.cause.span);
let obligation_ty = obligation.predicate.ty;
match infer::mk_eqty(infcx, true, origin, obligation_ty, ret_type) {
cause: ObligationCause<'tcx>,
value: &T)
-> Normalized<'tcx, T>
- where T : TypeFoldable<'tcx> + HasProjectionTypes + Clone + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + HasProjectionTypes + Clone + Repr
{
normalize_with_depth(selcx, cause, 0, value)
}
depth: usize,
value: &T)
-> Normalized<'tcx, T>
- where T : TypeFoldable<'tcx> + HasProjectionTypes + Clone + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + HasProjectionTypes + Clone + Repr
{
let mut normalizer = AssociatedTypeNormalizer::new(selcx, cause, depth);
let result = normalizer.fold(value);
debug!("normalize_projection_type(\
projection_ty={}, \
depth={})",
- projection_ty.repr(selcx.tcx()),
+ projection_ty.repr(),
depth);
let obligation = Obligation::with_depth(cause.clone(), depth, projection_ty.clone());
// re-normalize it
debug!("normalize_projection_type: projected_ty={} depth={} obligations={}",
- projected_ty.repr(selcx.tcx()),
+ projected_ty.repr(),
depth,
- obligations.repr(selcx.tcx()));
+ obligations.repr());
if ty::type_has_projection(projected_ty) {
let tcx = selcx.tcx();
let normalized_ty = normalizer.fold(&projected_ty);
debug!("normalize_projection_type: normalized_ty={} depth={}",
- normalized_ty.repr(tcx),
+ normalized_ty.repr(),
depth);
obligations.extend(normalizer.obligations);
}
Ok(ProjectedTy::NoProgress(projected_ty)) => {
debug!("normalize_projection_type: projected_ty={} no progress",
- projected_ty.repr(selcx.tcx()));
+ projected_ty.repr());
Some(Normalized {
value: projected_ty,
obligations: vec!()
-> Result<ProjectedTy<'tcx>, ProjectionTyError<'tcx>>
{
debug!("project(obligation={})",
- obligation.repr(selcx.tcx()));
+ obligation.repr());
let recursion_limit = selcx.tcx().sess.recursion_limit.get();
if obligation.recursion_depth >= recursion_limit {
let obligation_trait_ref =
selcx.infcx().resolve_type_vars_if_possible(&obligation.predicate.trait_ref);
- debug!("project: obligation_trait_ref={}", obligation_trait_ref.repr(selcx.tcx()));
+ debug!("project: obligation_trait_ref={}", obligation_trait_ref.repr());
if obligation_trait_ref.references_error() {
return Ok(ProjectedTy::Progress(selcx.tcx().types.err, vec!()));
where I: Iterator<Item=ty::Predicate<'tcx>>
{
debug!("assemble_candidates_from_predicates(obligation={})",
- obligation.repr(selcx.tcx()));
+ obligation.repr());
let infcx = selcx.infcx();
for predicate in env_predicates {
debug!("assemble_candidates_from_predicates: predicate={}",
- predicate.repr(selcx.tcx()));
+ predicate.repr());
match predicate {
ty::Predicate::Projection(ref data) => {
let same_name = data.item_name() == obligation.predicate.item_name;
});
debug!("assemble_candidates_from_predicates: candidate {} is_match {} same_name {}",
- data.repr(selcx.tcx()),
+ data.repr(),
is_match,
same_name);
{
let infcx = selcx.infcx();
debug!("assemble_candidates_from_object_type(object_ty={})",
- object_ty.repr(infcx.tcx));
+ object_ty.repr());
let data = match object_ty.sty {
ty::TyTrait(ref data) => data,
_ => {
selcx.tcx().sess.span_bug(
obligation.cause.span,
&format!("assemble_candidates_from_object_type called with non-object: {}",
- object_ty.repr(selcx.tcx())));
+ object_ty.repr()));
}
};
let projection_bounds = data.projection_bounds_with_self_ty(selcx.tcx(), object_ty);
}
Err(e) => {
debug!("assemble_candidates_from_impls: selection error {}",
- e.repr(selcx.tcx()));
+ e.repr());
return Err(e);
}
};
match vtable {
super::VtableImpl(data) => {
debug!("assemble_candidates_from_impls: impl candidate {}",
- data.repr(selcx.tcx()));
+ data.repr());
candidate_set.vec.push(
ProjectionTyCandidate::Impl(data));
selcx.tcx().sess.span_bug(
obligation.cause.span,
&format!("Cannot project an associated type from `{}`",
- vtable.repr(selcx.tcx())));
+ vtable.repr()));
}
}
let infcx = selcx.infcx();
debug!("confirm_candidate(candidate={}, obligation={})",
- candidate.repr(infcx.tcx),
- obligation.repr(infcx.tcx));
+ candidate.repr(),
+ obligation.repr());
match candidate {
ProjectionTyCandidate::ParamEnv(poly_projection) => {
let tcx = selcx.tcx();
debug!("confirm_callable_candidate({},{})",
- obligation.repr(tcx),
- fn_sig.repr(tcx));
+ obligation.repr(),
+ fn_sig.repr());
// the `Output` associated type is declared on `FnOnce`
let fn_once_def_id = tcx.lang_items.fn_once_trait().unwrap();
selcx.tcx().sess.span_bug(
obligation.cause.span,
&format!("Failed to unify `{}` and `{}` in projection: {}",
- obligation.repr(selcx.tcx()),
- projection.repr(selcx.tcx()),
+ obligation.repr(),
+ projection.repr(),
ty::type_err_to_str(selcx.tcx(), &e)));
}
}
selcx.tcx().sess.span_bug(obligation.cause.span,
&format!("No associated type for {}",
- trait_ref.repr(selcx.tcx())));
+ trait_ref.repr()));
}
-impl<'tcx> Repr<'tcx> for ProjectionTyError<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ProjectionTyError<'tcx> {
+ fn repr(&self) -> String {
match *self {
ProjectionTyError::TooManyCandidates =>
format!("NoCandidate"),
ProjectionTyError::TraitSelectionError(ref e) =>
- format!("TraitSelectionError({})", e.repr(tcx)),
+ format!("TraitSelectionError({})", e.repr()),
}
}
}
-impl<'tcx> Repr<'tcx> for ProjectionTyCandidate<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ProjectionTyCandidate<'tcx> {
+ fn repr(&self) -> String {
match *self {
ProjectionTyCandidate::ParamEnv(ref data) =>
- format!("ParamEnv({})", data.repr(tcx)),
+ format!("ParamEnv({})", data.repr()),
ProjectionTyCandidate::Impl(ref data) =>
- format!("Impl({})", data.repr(tcx)),
+ format!("Impl({})", data.repr()),
ProjectionTyCandidate::Closure(ref data) =>
- format!("Closure({})", data.repr(tcx)),
+ format!("Closure({})", data.repr()),
ProjectionTyCandidate::FnPointer(a) =>
- format!("FnPointer(({}))", a.repr(tcx)),
+ format!("FnPointer(({}))", a.repr()),
}
}
}
}
}
-impl<'tcx, T:Repr<'tcx>> Repr<'tcx> for Normalized<'tcx, T> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx, T:Repr> Repr for Normalized<'tcx, T> {
+ fn repr(&self) -> String {
format!("Normalized({},{})",
- self.value.repr(tcx),
- self.obligations.repr(tcx))
+ self.value.repr(),
+ self.obligations.repr())
}
}
/// type environment by performing unification.
pub fn select(&mut self, obligation: &TraitObligation<'tcx>)
-> SelectionResult<'tcx, Selection<'tcx>> {
- debug!("select({})", obligation.repr(self.tcx()));
+ debug!("select({})", obligation.repr());
assert!(!obligation.predicate.has_escaping_regions());
let stack = self.push_stack(TraitObligationStackList::empty(), obligation);
-> bool
{
debug!("evaluate_obligation({})",
- obligation.repr(self.tcx()));
+ obligation.repr());
self.evaluate_predicate_recursively(TraitObligationStackList::empty(), obligation)
.may_apply()
-> EvaluationResult<'tcx>
{
debug!("evaluate_predicate_recursively({})",
- obligation.repr(self.tcx()));
+ obligation.repr());
// Check the cache from the tcx of predicates that we know
// have been proven elsewhere. This cache only contains
-> EvaluationResult<'tcx>
{
debug!("evaluate_obligation_recursively({})",
- obligation.repr(self.tcx()));
+ obligation.repr());
let stack = self.push_stack(previous_stack, obligation);
&prev.fresh_trait_ref)))
{
debug!("evaluate_stack({}) --> unbound argument, recursion --> ambiguous",
- stack.fresh_trait_ref.repr(self.tcx()));
+ stack.fresh_trait_ref.repr());
return EvaluatedToAmbig;
}
.any(|prev| stack.fresh_trait_ref == prev.fresh_trait_ref)
{
debug!("evaluate_stack({}) --> recursive",
- stack.fresh_trait_ref.repr(self.tcx()));
+ stack.fresh_trait_ref.repr());
return EvaluatedToOk;
}
-> bool
{
debug!("evaluate_impl(impl_def_id={}, obligation={})",
- impl_def_id.repr(self.tcx()),
- obligation.repr(self.tcx()));
+ impl_def_id.repr(),
+ obligation.repr());
self.infcx.probe(|snapshot| {
match self.match_impl(impl_def_id, obligation, snapshot) {
let cache_fresh_trait_pred =
self.infcx.freshen(stack.obligation.predicate.clone());
debug!("candidate_from_obligation(cache_fresh_trait_pred={}, obligation={})",
- cache_fresh_trait_pred.repr(self.tcx()),
- stack.repr(self.tcx()));
+ cache_fresh_trait_pred.repr(),
+ stack.repr());
assert!(!stack.obligation.predicate.has_escaping_regions());
match self.check_candidate_cache(&cache_fresh_trait_pred) {
Some(c) => {
debug!("CACHE HIT: cache_fresh_trait_pred={}, candidate={}",
- cache_fresh_trait_pred.repr(self.tcx()),
- c.repr(self.tcx()));
+ cache_fresh_trait_pred.repr(),
+ c.repr());
return c;
}
None => { }
if self.should_update_candidate_cache(&cache_fresh_trait_pred, &candidate) {
debug!("CACHE MISS: cache_fresh_trait_pred={}, candidate={}",
- cache_fresh_trait_pred.repr(self.tcx()), candidate.repr(self.tcx()));
+ cache_fresh_trait_pred.repr(), candidate.repr());
self.insert_candidate_cache(cache_fresh_trait_pred, candidate.clone());
}
debug!("assembled {} candidates for {}: {}",
candidates.len(),
- stack.repr(self.tcx()),
- candidates.repr(self.tcx()));
+ stack.repr(),
+ candidates.repr());
// At this point, we know that each of the entries in the
// candidate set is *individually* applicable. Now we have to
&candidates[j]));
if is_dup {
debug!("Dropping candidate #{}/{}: {}",
- i, candidates.len(), candidates[i].repr(self.tcx()));
+ i, candidates.len(), candidates[i].repr());
candidates.swap_remove(i);
} else {
debug!("Retaining candidate #{}/{}: {}",
- i, candidates.len(), candidates[i].repr(self.tcx()));
+ i, candidates.len(), candidates[i].repr());
i += 1;
}
}
match self.tcx().lang_items.to_builtin_kind(obligation.predicate.def_id()) {
Some(ty::BoundCopy) => {
debug!("obligation self ty is {}",
- obligation.predicate.0.self_ty().repr(self.tcx()));
+ obligation.predicate.0.self_ty().repr());
// User-defined copy impls are permitted, but only for
// structs and enums.
self.infcx().resolve_type_vars_if_possible(&obligation.predicate);
debug!("assemble_candidates_for_projected_tys({},{})",
- obligation.repr(self.tcx()),
- poly_trait_predicate.repr(self.tcx()));
+ obligation.repr(),
+ poly_trait_predicate.repr());
// FIXME(#20297) -- just examining the self-type is very simplistic
};
debug!("assemble_candidates_for_projected_tys: trait_def_id={}",
- trait_def_id.repr(self.tcx()));
+ trait_def_id.repr());
let result = self.infcx.probe(|snapshot| {
self.match_projection_obligation_against_bounds_from_trait(obligation,
self.infcx().skolemize_late_bound_regions(&poly_trait_predicate, snapshot);
debug!("match_projection_obligation_against_bounds_from_trait: \
skol_trait_predicate={} skol_map={}",
- skol_trait_predicate.repr(self.tcx()),
- skol_map.repr(self.tcx()));
+ skol_trait_predicate.repr(),
+ skol_map.repr());
let projection_trait_ref = match skol_trait_predicate.trait_ref.self_ty().sty {
ty::TyProjection(ref data) => &data.trait_ref,
obligation.cause.span,
&format!("match_projection_obligation_against_bounds_from_trait() called \
but self-ty not a projection: {}",
- skol_trait_predicate.trait_ref.self_ty().repr(self.tcx())));
+ skol_trait_predicate.trait_ref.self_ty().repr()));
}
};
debug!("match_projection_obligation_against_bounds_from_trait: \
projection_trait_ref={}",
- projection_trait_ref.repr(self.tcx()));
+ projection_trait_ref.repr());
let trait_predicates = ty::lookup_predicates(self.tcx(), projection_trait_ref.def_id);
let bounds = trait_predicates.instantiate(self.tcx(), projection_trait_ref.substs);
debug!("match_projection_obligation_against_bounds_from_trait: \
bounds={}",
- bounds.repr(self.tcx()));
+ bounds.repr());
let matching_bound =
util::elaborate_predicates(self.tcx(), bounds.predicates.into_vec())
debug!("match_projection_obligation_against_bounds_from_trait: \
matching_bound={}",
- matching_bound.repr(self.tcx()));
+ matching_bound.repr());
match matching_bound {
None => false,
Some(bound) => {
-> Result<(),SelectionError<'tcx>>
{
debug!("assemble_candidates_from_caller_bounds({})",
- stack.obligation.repr(self.tcx()));
+ stack.obligation.repr());
let all_bounds =
self.param_env().caller_bounds
};
debug!("assemble_unboxed_candidates: self_ty={} kind={:?} obligation={}",
- self_ty.repr(self.tcx()),
+ self_ty.repr(),
kind,
- obligation.repr(self.tcx()));
+ obligation.repr());
match self.closure_typer.closure_kind(closure_def_id) {
Some(closure_kind) => {
candidates: &mut SelectionCandidateSet<'tcx>)
-> Result<(), SelectionError<'tcx>>
{
- debug!("assemble_candidates_from_impls(obligation={})", obligation.repr(self.tcx()));
+ debug!("assemble_candidates_from_impls(obligation={})", obligation.repr());
let def = ty::lookup_trait_def(self.tcx(), obligation.predicate.def_id());
{
// OK to skip binder here because the tests we do below do not involve bound regions
let self_ty = self.infcx.shallow_resolve(*obligation.self_ty().skip_binder());
- debug!("assemble_candidates_from_default_impls(self_ty={})", self_ty.repr(self.tcx()));
+ debug!("assemble_candidates_from_default_impls(self_ty={})", self_ty.repr());
let def_id = obligation.predicate.def_id();
candidates: &mut SelectionCandidateSet<'tcx>)
{
debug!("assemble_candidates_from_object_ty(self_ty={})",
- self.infcx.shallow_resolve(*obligation.self_ty().skip_binder()).repr(self.tcx()));
+ self.infcx.shallow_resolve(*obligation.self_ty().skip_binder()).repr());
// Object-safety candidates are only applicable to object-safe
// traits. Including this check is useful because it helps
};
debug!("assemble_candidates_from_object_ty: poly_trait_ref={}",
- poly_trait_ref.repr(self.tcx()));
+ poly_trait_ref.repr());
// see whether the object trait can be upcast to the trait we are looking for
let upcast_trait_refs = self.upcast(poly_trait_ref, obligation);
let target = self.infcx.shallow_resolve(obligation.predicate.0.input_types()[0]);
debug!("assemble_candidates_for_unsizing(source={}, target={})",
- source.repr(self.tcx()), target.repr(self.tcx()));
+ source.repr(), target.repr());
let may_apply = match (&source.sty, &target.sty) {
// Trait+Kx+'a -> Trait+Ky+'b (upcasts).
candidate: &SelectionCandidate<'tcx>)
-> EvaluationResult<'tcx>
{
- debug!("winnow_candidate: candidate={}", candidate.repr(self.tcx()));
+ debug!("winnow_candidate: candidate={}", candidate.repr());
let result = self.infcx.probe(|_| {
let candidate = (*candidate).clone();
match self.confirm_candidate(stack.obligation, candidate) {
match self.builtin_bound(bound, stack.obligation) {
Ok(If(..)) => {
debug!("builtin_bound: bound={}",
- bound.repr(self.tcx()));
+ bound.repr());
candidates.vec.push(BuiltinCandidate(bound));
Ok(())
}
self.tcx().sess.bug(
&format!(
"asked to assemble builtin bounds of unexpected type: {}",
- self_ty.repr(self.tcx())));
+ self_ty.repr()));
}
};
self.tcx().sess.bug(
&format!(
"asked to assemble constituent types of unexpected type: {}",
- t.repr(self.tcx())));
+ t.repr()));
}
ty::TyBox(referent_ty) => { // Box<T>
-> Result<Selection<'tcx>,SelectionError<'tcx>>
{
debug!("confirm_candidate({}, {})",
- obligation.repr(self.tcx()),
- candidate.repr(self.tcx()));
+ obligation.repr(),
+ candidate.repr());
match candidate {
BuiltinCandidate(builtin_bound) => {
-> Vec<PredicateObligation<'tcx>>
{
debug!("confirm_param_candidate({},{})",
- obligation.repr(self.tcx()),
- param.repr(self.tcx()));
+ obligation.repr(),
+ param.repr());
// During evaluation, we already checked that this
// where-clause trait-ref could be unified with the obligation
Err(()) => {
self.tcx().sess.bug(
&format!("Where clause `{}` was applicable to `{}` but now is not",
- param.repr(self.tcx()),
- obligation.repr(self.tcx())));
+ param.repr(),
+ obligation.repr()));
}
}
}
SelectionError<'tcx>>
{
debug!("confirm_builtin_candidate({})",
- obligation.repr(self.tcx()));
+ obligation.repr());
match try!(self.builtin_bound(bound, obligation)) {
If(nested) => Ok(self.vtable_builtin_data(obligation, bound, nested)),
self.tcx().sess.span_bug(
obligation.cause.span,
&format!("builtin bound for {} was ambig",
- obligation.repr(self.tcx())));
+ obligation.repr()));
}
}
}
let obligations = self.collect_predicates_for_types(obligation, trait_def, nested);
debug!("vtable_builtin_data: obligations={}",
- obligations.repr(self.tcx()));
+ obligations.repr());
VtableBuiltinData { nested: obligations }
}
-> VtableDefaultImplData<PredicateObligation<'tcx>>
{
debug!("confirm_default_impl_candidate({}, {})",
- obligation.repr(self.tcx()),
- trait_def_id.repr(self.tcx()));
+ obligation.repr(),
+ trait_def_id.repr());
// binder is moved below
let self_ty = self.infcx.shallow_resolve(obligation.predicate.skip_binder().self_ty());
self.tcx().sess.bug(
&format!(
"asked to confirm default implementation for ambiguous type: {}",
- self_ty.repr(self.tcx())));
+ self_ty.repr()));
}
}
}
-> VtableDefaultImplData<PredicateObligation<'tcx>>
{
debug!("confirm_default_impl_object_candidate({}, {})",
- obligation.repr(self.tcx()),
- trait_def_id.repr(self.tcx()));
+ obligation.repr(),
+ trait_def_id.repr());
assert!(ty::has_attr(self.tcx(), trait_def_id, "rustc_reflect_like"));
self.tcx().sess.bug(
&format!(
"asked to confirm default object implementation for non-object type: {}",
- self_ty.repr(self.tcx())));
+ self_ty.repr()));
}
}
}
nested: ty::Binder<Vec<Ty<'tcx>>>)
-> VtableDefaultImplData<PredicateObligation<'tcx>>
{
- debug!("vtable_default_impl_data: nested={}", nested.repr(self.tcx()));
+ debug!("vtable_default_impl_data: nested={}", nested.repr());
let mut obligations = self.collect_predicates_for_types(obligation,
trait_def_id,
// no Errors in that code above
obligations.append(&mut trait_obligations.unwrap());
- debug!("vtable_default_impl_data: obligations={}", obligations.repr(self.tcx()));
+ debug!("vtable_default_impl_data: obligations={}", obligations.repr());
VtableDefaultImplData {
trait_def_id: trait_def_id,
SelectionError<'tcx>>
{
debug!("confirm_impl_candidate({},{})",
- obligation.repr(self.tcx()),
- impl_def_id.repr(self.tcx()));
+ obligation.repr(),
+ impl_def_id.repr());
// First, create the substitutions by matching the impl again,
// this time not in a probe.
let (substs, skol_map) =
self.rematch_impl(impl_def_id, obligation,
snapshot);
- debug!("confirm_impl_candidate substs={}", substs.repr(self.tcx()));
+ debug!("confirm_impl_candidate substs={}", substs.repr());
Ok(self.vtable_impl(impl_def_id, substs, obligation.cause.clone(),
obligation.recursion_depth + 1, skol_map, snapshot))
})
-> VtableImplData<'tcx, PredicateObligation<'tcx>>
{
debug!("vtable_impl(impl_def_id={}, substs={}, recursion_depth={}, skol_map={})",
- impl_def_id.repr(self.tcx()),
- substs.repr(self.tcx()),
+ impl_def_id.repr(),
+ substs.repr(),
recursion_depth,
- skol_map.repr(self.tcx()));
+ skol_map.repr());
let mut impl_obligations =
self.impl_or_trait_obligations(cause,
snapshot);
debug!("vtable_impl: impl_def_id={} impl_obligations={}",
- impl_def_id.repr(self.tcx()),
- impl_obligations.repr(self.tcx()));
+ impl_def_id.repr(),
+ impl_obligations.repr());
impl_obligations.append(&mut substs.obligations);
-> VtableObjectData<'tcx>
{
debug!("confirm_object_candidate({})",
- obligation.repr(self.tcx()));
+ obligation.repr());
// FIXME skipping binder here seems wrong -- we should
// probably flatten the binder from the obligation and the
-> Result<ty::Ty<'tcx>,SelectionError<'tcx>>
{
debug!("confirm_fn_pointer_candidate({})",
- obligation.repr(self.tcx()));
+ obligation.repr());
// ok to skip binder; it is reintroduced below
let self_ty = self.infcx.shallow_resolve(*obligation.self_ty().skip_binder());
SelectionError<'tcx>>
{
debug!("confirm_closure_candidate({},{},{})",
- obligation.repr(self.tcx()),
- closure_def_id.repr(self.tcx()),
- substs.repr(self.tcx()));
+ obligation.repr(),
+ closure_def_id.repr(),
+ substs.repr());
let Normalized {
value: trait_ref,
} = self.closure_trait_ref(obligation, closure_def_id, substs);
debug!("confirm_closure_candidate(closure_def_id={}, trait_ref={}, obligations={})",
- closure_def_id.repr(self.tcx()),
- trait_ref.repr(self.tcx()),
- obligations.repr(self.tcx()));
+ closure_def_id.repr(),
+ trait_ref.repr(),
+ obligations.repr());
try!(self.confirm_poly_trait_refs(obligation.cause.clone(),
obligation.predicate.to_poly_trait_ref(),
let target = self.infcx.shallow_resolve(obligation.predicate.0.input_types()[0]);
debug!("confirm_builtin_unsize_candidate(source={}, target={})",
- source.repr(tcx), target.repr(tcx));
+ source.repr(), target.repr());
let mut nested = vec![];
match (&source.sty, &target.sty) {
Err(()) => {
self.tcx().sess.bug(
&format!("Impl {} was matchable against {} but now is not",
- impl_def_id.repr(self.tcx()),
- obligation.repr(self.tcx())));
+ impl_def_id.repr(),
+ obligation.repr()));
}
}
}
debug!("match_impl(impl_def_id={}, obligation={}, \
impl_trait_ref={}, skol_obligation_trait_ref={})",
- impl_def_id.repr(self.tcx()),
- obligation.repr(self.tcx()),
- impl_trait_ref.repr(self.tcx()),
- skol_obligation_trait_ref.repr(self.tcx()));
+ impl_def_id.repr(),
+ obligation.repr(),
+ impl_trait_ref.repr(),
+ skol_obligation_trait_ref.repr());
let origin = infer::RelateOutputImplTypes(obligation.cause.span);
if let Err(e) = self.infcx.sub_trait_refs(false,
return Err(());
}
- debug!("match_impl: success impl_substs={}", impl_substs.repr(self.tcx()));
+ debug!("match_impl: success impl_substs={}", impl_substs.repr());
Ok((Normalized {
value: impl_substs,
obligations: impl_trait_ref.obligations
-> Result<(),()>
{
debug!("match_poly_trait_ref: obligation={} poly_trait_ref={}",
- obligation.repr(self.tcx()),
- poly_trait_ref.repr(self.tcx()));
+ obligation.repr(),
+ poly_trait_ref.repr());
let origin = infer::RelateOutputImplTypes(obligation.cause.span);
match self.infcx.sub_poly_trait_refs(false,
let impl_self_ty = impl_self_ty.subst(self.tcx(), &impl_substs);
debug!("match_impl_self_types(obligation_self_ty={}, impl_self_ty={})",
- obligation_self_ty.repr(self.tcx()),
- impl_self_ty.repr(self.tcx()));
+ obligation_self_ty.repr(),
+ impl_self_ty.repr());
match self.match_self_types(obligation_cause,
impl_self_ty,
obligation_self_ty) {
Ok(()) => {
- debug!("Matched impl_substs={}", impl_substs.repr(self.tcx()));
+ debug!("Matched impl_substs={}", impl_substs.repr());
Ok(impl_substs)
}
Err(()) => {
snapshot: &infer::CombinedSnapshot)
-> Vec<PredicateObligation<'tcx>>
{
- debug!("impl_or_trait_obligations(def_id={})", def_id.repr(self.tcx()));
+ debug!("impl_or_trait_obligations(def_id={})", def_id.repr());
let predicates = ty::lookup_predicates(self.tcx(), def_id);
let predicates = predicates.instantiate(self.tcx(), substs);
-> Vec<ty::PolyTraitRef<'tcx>>
{
debug!("upcast(obj_trait_ref={}, obligation={})",
- obj_trait_ref.repr(self.tcx()),
- obligation.repr(self.tcx()));
+ obj_trait_ref.repr(),
+ obligation.repr());
let obligation_def_id = obligation.predicate.def_id();
let mut upcast_trait_refs = util::upcast(self.tcx(), obj_trait_ref, obligation_def_id);
self.infcx.probe(|_| self.match_poly_trait_ref(obligation, upcast_trait_ref)).is_ok()
});
- debug!("upcast: upcast_trait_refs={}", upcast_trait_refs.repr(self.tcx()));
+ debug!("upcast: upcast_trait_refs={}", upcast_trait_refs.repr());
upcast_trait_refs
}
}
-impl<'tcx> Repr<'tcx> for SelectionCandidate<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for SelectionCandidate<'tcx> {
+ fn repr(&self) -> String {
match *self {
PhantomFnCandidate => format!("PhantomFnCandidate"),
ErrorCandidate => format!("ErrorCandidate"),
BuiltinCandidate(b) => format!("BuiltinCandidate({:?})", b),
BuiltinObjectCandidate => format!("BuiltinObjectCandidate"),
BuiltinUnsizeCandidate => format!("BuiltinUnsizeCandidate"),
- ParamCandidate(ref a) => format!("ParamCandidate({})", a.repr(tcx)),
- ImplCandidate(a) => format!("ImplCandidate({})", a.repr(tcx)),
+ ParamCandidate(ref a) => format!("ParamCandidate({})", a.repr()),
+ ImplCandidate(a) => format!("ImplCandidate({})", a.repr()),
DefaultImplCandidate(t) => format!("DefaultImplCandidate({:?})", t),
DefaultImplObjectCandidate(t) => format!("DefaultImplObjectCandidate({:?})", t),
ProjectionCandidate => format!("ProjectionCandidate"),
FnPointerCandidate => format!("FnPointerCandidate"),
ObjectCandidate => format!("ObjectCandidate"),
ClosureCandidate(c, ref s) => {
- format!("ClosureCandidate({:?},{})", c, s.repr(tcx))
+ format!("ClosureCandidate({:?},{})", c, s.repr())
}
}
}
}
}
-impl<'o,'tcx> Repr<'tcx> for TraitObligationStack<'o,'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'o,'tcx> Repr for TraitObligationStack<'o,'tcx> {
+ fn repr(&self) -> String {
format!("TraitObligationStack({})",
- self.obligation.repr(tcx))
+ self.obligation.repr())
}
}
.collect();
debug!("super_predicates: data={} predicates={}",
- data.repr(self.tcx), predicates.repr(self.tcx));
+ data.repr(), predicates.repr());
// Only keep those bounds that we haven't already
// seen. This is necessary to prevent infinite
-> Vec<PredicateObligation<'tcx>>
{
debug!("predicates_for_generics(generic_bounds={})",
- generic_bounds.repr(tcx));
+ generic_bounds.repr());
generic_bounds.predicates.iter().map(|predicate| {
Obligation { cause: cause.clone(),
ty::Binder((trait_ref, sig.0.output.unwrap_or(ty::mk_nil(tcx))))
}
-impl<'tcx,O:Repr<'tcx>> Repr<'tcx> for super::Obligation<'tcx, O> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx,O:Repr> Repr for super::Obligation<'tcx, O> {
+ fn repr(&self) -> String {
format!("Obligation(predicate={},depth={})",
- self.predicate.repr(tcx),
+ self.predicate.repr(),
self.recursion_depth)
}
}
-impl<'tcx, N:Repr<'tcx>> Repr<'tcx> for super::Vtable<'tcx, N> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx, N:Repr> Repr for super::Vtable<'tcx, N> {
+ fn repr(&self) -> String {
match *self {
super::VtableImpl(ref v) =>
- v.repr(tcx),
+ v.repr(),
super::VtableDefaultImpl(ref t) =>
- t.repr(tcx),
+ t.repr(),
super::VtableClosure(ref d) =>
- d.repr(tcx),
+ d.repr(),
super::VtableFnPointer(ref d) =>
format!("VtableFnPointer({})",
- d.repr(tcx)),
+ d.repr()),
super::VtableObject(ref d) =>
format!("VtableObject({})",
- d.repr(tcx)),
+ d.repr()),
super::VtableParam(ref n) =>
format!("VtableParam({})",
- n.repr(tcx)),
+ n.repr()),
super::VtableBuiltin(ref d) =>
- d.repr(tcx)
+ d.repr()
}
}
}
-impl<'tcx, N:Repr<'tcx>> Repr<'tcx> for super::VtableImplData<'tcx, N> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx, N:Repr> Repr for super::VtableImplData<'tcx, N> {
+ fn repr(&self) -> String {
format!("VtableImpl(impl_def_id={}, substs={}, nested={})",
- self.impl_def_id.repr(tcx),
- self.substs.repr(tcx),
- self.nested.repr(tcx))
+ self.impl_def_id.repr(),
+ self.substs.repr(),
+ self.nested.repr())
}
}
-impl<'tcx, N:Repr<'tcx>> Repr<'tcx> for super::VtableClosureData<'tcx, N> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx, N:Repr> Repr for super::VtableClosureData<'tcx, N> {
+ fn repr(&self) -> String {
format!("VtableClosure(closure_def_id={}, substs={}, nested={})",
- self.closure_def_id.repr(tcx),
- self.substs.repr(tcx),
- self.nested.repr(tcx))
+ self.closure_def_id.repr(),
+ self.substs.repr(),
+ self.nested.repr())
}
}
-impl<'tcx, N:Repr<'tcx>> Repr<'tcx> for super::VtableBuiltinData<N> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx, N:Repr> Repr for super::VtableBuiltinData<N> {
+ fn repr(&self) -> String {
format!("VtableBuiltin(nested={})",
- self.nested.repr(tcx))
+ self.nested.repr())
}
}
-impl<'tcx, N:Repr<'tcx>> Repr<'tcx> for super::VtableDefaultImplData<N> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx, N:Repr> Repr for super::VtableDefaultImplData<N> {
+ fn repr(&self) -> String {
format!("VtableDefaultImplData(trait_def_id={}, nested={})",
- self.trait_def_id.repr(tcx),
- self.nested.repr(tcx))
+ self.trait_def_id.repr(),
+ self.nested.repr())
}
}
-impl<'tcx> Repr<'tcx> for super::VtableObjectData<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for super::VtableObjectData<'tcx> {
+ fn repr(&self) -> String {
format!("VtableObject(object_ty={})",
- self.object_ty.repr(tcx))
+ self.object_ty.repr())
}
}
-impl<'tcx> Repr<'tcx> for super::SelectionError<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for super::SelectionError<'tcx> {
+ fn repr(&self) -> String {
match *self {
super::Unimplemented =>
format!("Unimplemented"),
super::OutputTypeParameterMismatch(ref a, ref b, ref c) =>
format!("OutputTypeParameterMismatch({},{},{})",
- a.repr(tcx),
- b.repr(tcx),
- c.repr(tcx)),
+ a.repr(),
+ b.repr(),
+ c.repr()),
super::TraitNotObjectSafe(ref tr) =>
format!("TraitNotObjectSafe({})",
- tr.repr(tcx))
+ tr.repr())
}
}
}
-impl<'tcx> Repr<'tcx> for super::FulfillmentError<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for super::FulfillmentError<'tcx> {
+ fn repr(&self) -> String {
format!("FulfillmentError({},{})",
- self.obligation.repr(tcx),
- self.code.repr(tcx))
+ self.obligation.repr(),
+ self.code.repr())
}
}
-impl<'tcx> Repr<'tcx> for super::FulfillmentErrorCode<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for super::FulfillmentErrorCode<'tcx> {
+ fn repr(&self) -> String {
match *self {
- super::CodeSelectionError(ref o) => o.repr(tcx),
- super::CodeProjectionError(ref o) => o.repr(tcx),
+ super::CodeSelectionError(ref o) => o.repr(),
+ super::CodeProjectionError(ref o) => o.repr(),
super::CodeAmbiguity => format!("Ambiguity")
}
}
}
}
-impl<'tcx> Repr<'tcx> for super::MismatchedProjectionTypes<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
- self.err.repr(tcx)
+impl<'tcx> Repr for super::MismatchedProjectionTypes<'tcx> {
+ fn repr(&self) -> String {
+ self.err.repr()
}
}
impl_def_id: DefId,
impl_trait_ref: TraitRef<'tcx>) {
debug!("TraitDef::record_impl for {}, from {}",
- self.repr(tcx), impl_trait_ref.repr(tcx));
+ self.repr(), impl_trait_ref.repr());
// We don't want to borrow_mut after we already populated all impls,
// so check if an impl is present with an immutable borrow first.
TyArray(ty, _) | TySlice(ty) => ty,
TyStr => mk_mach_uint(cx, ast::TyU8),
_ => cx.sess.bug(&format!("sequence_element_type called on non-sequence value: {}",
- ty.user_string(cx))),
+ ty.user_string())),
}
}
let is_impld = traits::type_known_to_meet_builtin_bound(&infcx, param_env, ty, bound, span);
debug!("type_impls_bound({}, {:?}) = {:?}",
- ty.repr(tcx),
+ ty.repr(),
bound,
is_impld);
fn type_requires<'tcx>(cx: &ctxt<'tcx>, seen: &mut Vec<DefId>,
r_ty: Ty<'tcx>, ty: Ty<'tcx>) -> bool {
debug!("type_requires({}, {})?",
- r_ty.repr(cx), ty.repr(cx));
+ r_ty.repr(), ty.repr());
let r = r_ty == ty || subtypes_require(cx, seen, r_ty, ty);
debug!("type_requires({}, {})? {:?}",
- r_ty.repr(cx), ty.repr(cx), r);
+ r_ty.repr(), ty.repr(), r);
return r;
}
fn subtypes_require<'tcx>(cx: &ctxt<'tcx>, seen: &mut Vec<DefId>,
r_ty: Ty<'tcx>, ty: Ty<'tcx>) -> bool {
debug!("subtypes_require({}, {})?",
- r_ty.repr(cx), ty.repr(cx));
+ r_ty.repr(), ty.repr());
let r = match ty.sty {
// fixed length vectors need special treatment compared to
};
debug!("subtypes_require({}, {})? {:?}",
- r_ty.repr(cx), ty.repr(cx), r);
+ r_ty.repr(), ty.repr(), r);
return r;
}
fn is_type_structurally_recursive<'tcx>(cx: &ctxt<'tcx>, sp: Span,
seen: &mut Vec<Ty<'tcx>>,
ty: Ty<'tcx>) -> Representability {
- debug!("is_type_structurally_recursive: {}", ty.repr(cx));
+ debug!("is_type_structurally_recursive: {}", ty.repr());
match ty.sty {
TyStruct(did, _) | TyEnum(did, _) => {
Some(&seen_type) => {
if same_struct_or_enum_def_id(seen_type, did) {
debug!("SelfRecursive: {} contains {}",
- seen_type.repr(cx),
- ty.repr(cx));
+ seen_type.repr(),
+ ty.repr());
return SelfRecursive;
}
}
for &seen_type in iter {
if same_type(ty, seen_type) {
debug!("ContainsRecursive: {} contains {}",
- seen_type.repr(cx),
- ty.repr(cx));
+ seen_type.repr(),
+ ty.repr());
return ContainsRecursive;
}
}
}
}
- debug!("is_type_representable: {}", ty.repr(cx));
+ debug!("is_type_representable: {}", ty.repr());
// To avoid a stack overflow when checking an enum variant or struct that
// contains a different, structurally recursive type, maintain a stack
// of seen types and check recursion for each of them (issues #3008, #3779).
let mut seen: Vec<Ty> = Vec::new();
let r = is_type_structurally_recursive(cx, sp, &mut seen, ty);
- debug!("is_type_representable: {} is {:?}", ty.repr(cx), r);
+ debug!("is_type_representable: {} is {:?}", ty.repr(), r);
r
}
_ => {
cx.sess.bug(
&format!("AdjustReifyFnPointer adjustment on non-fn-item: \
- {}", unadjusted_ty.repr(cx)));
+ {}", unadjusted_ty.repr()));
}
}
}
span,
&format!("the {}th autoderef failed: {}",
i,
- adjusted_ty.user_string(cx))
+ adjusted_ty.user_string())
);
}
}
trait_items.iter().position(|m| m.name() == id)
}
-pub fn ty_sort_string<'tcx>(cx: &ctxt<'tcx>, ty: Ty<'tcx>) -> String {
+pub fn ty_sort_string(cx: &ctxt, ty: Ty) -> String {
match ty.sty {
TyBool | TyChar | TyInt(_) |
- TyUint(_) | TyFloat(_) | TyStr => ty.user_string(cx),
- TyTuple(ref tys) if tys.is_empty() => ty.user_string(cx),
+ TyUint(_) | TyFloat(_) | TyStr => ty.user_string(),
+ TyTuple(ref tys) if tys.is_empty() => ty.user_string(),
TyEnum(id, _) => format!("enum `{}`", item_path_str(cx, id)),
TyBox(_) => "box".to_string(),
}
}
-impl<'tcx> Repr<'tcx> for ty::type_err<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
- ty::type_err_to_str(tcx, self)
+impl<'tcx> Repr for ty::type_err<'tcx> {
+ fn repr(&self) -> String {
+ tls::with(|tcx| ty::type_err_to_str(tcx, self))
}
}
/// in parentheses after some larger message. You should also invoke `note_and_explain_type_err()`
/// afterwards to present additional details, particularly when it comes to lifetime-related
/// errors.
-pub fn type_err_to_str<'tcx>(cx: &ctxt<'tcx>, err: &type_err<'tcx>) -> String {
+pub fn type_err_to_str(cx: &ctxt, err: &type_err) -> String {
match *err {
terr_cyclic_ty => "cyclic type of infinite size".to_string(),
terr_mismatch => "types differ".to_string(),
terr_regions_insufficiently_polymorphic(br, _) => {
format!("expected bound lifetime parameter {}, \
found concrete lifetime",
- br.user_string(cx))
+ br.user_string())
}
terr_regions_overly_polymorphic(br, _) => {
format!("expected concrete lifetime, \
found bound lifetime parameter {}",
- br.user_string(cx))
+ br.user_string())
}
terr_sorts(values) => {
// A naive approach to making sure that we're not reporting silly errors such as:
terr_builtin_bounds(values) => {
if values.expected.is_empty() {
format!("expected no bounds, found `{}`",
- values.found.user_string(cx))
+ values.found.user_string())
} else if values.found.is_empty() {
format!("expected bounds `{}`, found no bounds",
- values.expected.user_string(cx))
+ values.expected.user_string())
} else {
format!("expected bounds `{}`, found bounds `{}`",
- values.expected.user_string(cx),
- values.found.user_string(cx))
+ values.expected.user_string(),
+ values.found.user_string())
}
}
terr_integer_as_char => {
let computed_value = repr_type.disr_wrap_incr(Some(prev_val));
let computed_value = repr_type.disr_string(computed_value);
let prev_val = repr_type.disr_string(prev_val);
- let repr_type = repr_type.to_ty(cx).user_string(cx);
+ let repr_type = repr_type.to_ty(cx).user_string();
span_err!(cx.sess, variant_span, E0370,
"enum discriminant overflowed on value after {}: {}; \
set explicitly via {} = {} if that is desired outcome",
-> Vec<ty::Region>
{
debug!("required_region_bounds(erased_self_ty={:?}, predicates={:?})",
- erased_self_ty.repr(tcx),
- predicates.repr(tcx));
+ erased_self_ty.repr(),
+ predicates.repr());
assert!(!erased_self_ty.has_escaping_regions());
return;
}
- debug!("populate_implementations_for_trait_if_necessary: searching for {}", def.repr(tcx));
+ debug!("populate_implementations_for_trait_if_necessary: searching for {}", def.repr());
if csearch::is_defaulted_trait(&tcx.sess.cstore, trait_id) {
record_trait_has_default_impl(tcx, trait_id);
defs: &[TypeParameterDef<'tcx>]) {
for def in defs {
debug!("construct_parameter_environment(): push_types_from_defs: def={:?}",
- def.repr(tcx));
+ def.repr());
let ty = ty::mk_param_from_def(tcx, def);
types.push(def.space, ty);
}
debug!("construct_parameter_environment: free_id={:?} free_subst={:?} predicates={:?}",
free_id,
- free_substs.repr(tcx),
- predicates.repr(tcx));
+ free_substs.repr(),
+ predicates.repr());
//
// Finally, we have to normalize the bounds in the environment, in
all_outlive_scope: region::DestructionScopeData,
value: &Binder<T>)
-> T
- where T : TypeFoldable<'tcx> + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + Repr
{
ty_fold::replace_late_bound_regions(
tcx, value,
tcx: &ty::ctxt<'tcx>,
value: &Binder<T>)
-> usize
- where T : TypeFoldable<'tcx> + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + Repr
{
let (_, skol_map) = ty_fold::replace_late_bound_regions(tcx, value, |_| ty::ReStatic);
skol_map.len()
tcx: &ty::ctxt<'tcx>,
value: &Binder<T>)
-> bool
- where T : TypeFoldable<'tcx> + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + Repr
{
count_late_bound_regions(tcx, value) > 0
}
tcx: &ty::ctxt<'tcx>,
bound2_value: &Binder<Binder<T>>)
-> Binder<T>
- where T: TypeFoldable<'tcx> + Repr<'tcx>
+ where T: TypeFoldable<'tcx> + Repr
{
let bound0_value = bound2_value.skip_binder().skip_binder();
let value = ty_fold::fold_regions(tcx, bound0_value, |region, current_depth| {
tcx: &ty::ctxt<'tcx>,
value: &Binder<T>)
-> Option<T>
- where T : TypeFoldable<'tcx> + Repr<'tcx> + Clone
+ where T : TypeFoldable<'tcx> + Repr + Clone
{
if binds_late_bound_regions(tcx, value) {
None
tcx: &ty::ctxt<'tcx>,
value: &Binder<T>)
-> T
- where T : TypeFoldable<'tcx> + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + Repr
{
ty_fold::replace_late_bound_regions(tcx, value, |_| ty::ReStatic).0
}
tcx: &ctxt<'tcx>,
sig: &Binder<T>)
-> Binder<T>
- where T : TypeFoldable<'tcx> + Repr<'tcx>,
+ where T : TypeFoldable<'tcx> + Repr,
{
let mut counter = 0;
ty::Binder(ty_fold::replace_late_bound_regions(tcx, sig, |_| {
}
}
-impl<'tcx> Repr<'tcx> for AutoAdjustment<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for AutoAdjustment<'tcx> {
+ fn repr(&self) -> String {
match *self {
AdjustReifyFnPointer => {
format!("AdjustReifyFnPointer")
format!("AdjustUnsafeFnPointer")
}
AdjustDerefRef(ref data) => {
- data.repr(tcx)
+ data.repr()
}
}
}
}
-impl<'tcx> Repr<'tcx> for AutoDerefRef<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for AutoDerefRef<'tcx> {
+ fn repr(&self) -> String {
format!("AutoDerefRef({}, unsize={}, {})",
- self.autoderefs, self.unsize.repr(tcx), self.autoref.repr(tcx))
+ self.autoderefs, self.unsize.repr(), self.autoref.repr())
}
}
-impl<'tcx> Repr<'tcx> for AutoRef<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for AutoRef<'tcx> {
+ fn repr(&self) -> String {
match *self {
AutoPtr(a, b) => {
- format!("AutoPtr({},{:?})", a.repr(tcx), b)
+ format!("AutoPtr({},{:?})", a.repr(), b)
}
AutoUnsafe(ref a) => {
format!("AutoUnsafe({:?})", a)
}
}
-impl<'tcx> Repr<'tcx> for TraitTy<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for TraitTy<'tcx> {
+ fn repr(&self) -> String {
format!("TraitTy({},{})",
- self.principal.repr(tcx),
- self.bounds.repr(tcx))
+ self.principal.repr(),
+ self.bounds.repr())
}
}
-impl<'tcx> Repr<'tcx> for ty::Predicate<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::Predicate<'tcx> {
+ fn repr(&self) -> String {
match *self {
- Predicate::Trait(ref a) => a.repr(tcx),
- Predicate::Equate(ref pair) => pair.repr(tcx),
- Predicate::RegionOutlives(ref pair) => pair.repr(tcx),
- Predicate::TypeOutlives(ref pair) => pair.repr(tcx),
- Predicate::Projection(ref pair) => pair.repr(tcx),
+ Predicate::Trait(ref a) => a.repr(),
+ Predicate::Equate(ref pair) => pair.repr(),
+ Predicate::RegionOutlives(ref pair) => pair.repr(),
+ Predicate::TypeOutlives(ref pair) => pair.repr(),
+ Predicate::Projection(ref pair) => pair.repr(),
}
}
}
}
}
-impl<'tcx> Repr<'tcx> for ty::ProjectionPredicate<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::ProjectionPredicate<'tcx> {
+ fn repr(&self) -> String {
format!("ProjectionPredicate({}, {})",
- self.projection_ty.repr(tcx),
- self.ty.repr(tcx))
+ self.projection_ty.repr(),
+ self.ty.repr())
}
}
}
}
-impl<'tcx> Repr<'tcx> for ClosureTy<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ClosureTy<'tcx> {
+ fn repr(&self) -> String {
format!("ClosureTy({},{},{})",
self.unsafety,
- self.sig.repr(tcx),
+ self.sig.repr(),
self.abi)
}
}
-impl<'tcx> Repr<'tcx> for ClosureUpvar<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ClosureUpvar<'tcx> {
+ fn repr(&self) -> String {
format!("ClosureUpvar({},{})",
- self.def.repr(tcx),
- self.ty.repr(tcx))
+ self.def.repr(),
+ self.ty.repr())
}
}
-impl<'tcx> Repr<'tcx> for field<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for field<'tcx> {
+ fn repr(&self) -> String {
format!("field({},{})",
- self.name.repr(tcx),
- self.mt.repr(tcx))
+ self.name.repr(),
+ self.mt.repr())
}
}
-impl<'a, 'tcx> Repr<'tcx> for ParameterEnvironment<'a, 'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'a, 'tcx> Repr for ParameterEnvironment<'a, 'tcx> {
+ fn repr(&self) -> String {
format!("ParameterEnvironment(\
free_substs={}, \
implicit_region_bound={}, \
caller_bounds={})",
- self.free_substs.repr(tcx),
- self.implicit_region_bound.repr(tcx),
- self.caller_bounds.repr(tcx))
+ self.free_substs.repr(),
+ self.implicit_region_bound.repr(),
+ self.caller_bounds.repr())
}
}
-impl<'tcx> Repr<'tcx> for ObjectLifetimeDefault {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ObjectLifetimeDefault {
+ fn repr(&self) -> String {
match *self {
ObjectLifetimeDefault::Ambiguous => format!("Ambiguous"),
- ObjectLifetimeDefault::Specific(ref r) => r.repr(tcx),
+ ObjectLifetimeDefault::Specific(ref r) => r.repr(),
}
}
}
/// The TypeFoldable trait is implemented for every type that can be folded.
/// Basically, every type that has a corresponding method in TypeFolder.
-pub trait TypeFoldable<'tcx>: Repr<'tcx> + Clone {
+pub trait TypeFoldable<'tcx>: Repr + Clone {
fn fold_with<F: TypeFolder<'tcx>>(&self, folder: &mut F) -> Self;
}
fn exit_region_binder(&mut self) { }
fn fold_binder<T>(&mut self, t: &ty::Binder<T>) -> ty::Binder<T>
- where T : TypeFoldable<'tcx> + Repr<'tcx> + Clone
+ where T : TypeFoldable<'tcx> + Repr + Clone
{
// FIXME(#20526) this should replace `enter_region_binder`/`exit_region_binder`.
super_fold_binder(self, t)
}
}
-impl<'tcx, T:TypeFoldable<'tcx>+Repr<'tcx>+Clone> TypeFoldable<'tcx> for ty::Binder<T> {
+impl<'tcx, T:TypeFoldable<'tcx>+Repr+Clone> TypeFoldable<'tcx> for ty::Binder<T> {
fn fold_with<F: TypeFolder<'tcx>>(&self, folder: &mut F) -> ty::Binder<T> {
folder.fold_binder(self)
}
match r {
ty::ReLateBound(debruijn, _) if debruijn.depth < self.current_depth => {
debug!("RegionFolder.fold_region({}) skipped bound region (current depth={})",
- r.repr(self.tcx()), self.current_depth);
+ r.repr(), self.current_depth);
r
}
_ => {
debug!("RegionFolder.fold_region({}) folding free region (current_depth={})",
- r.repr(self.tcx()), self.current_depth);
+ r.repr(), self.current_depth);
(self.fld_r)(r, self.current_depth)
}
}
mut f: F)
-> (T, FnvHashMap<ty::BoundRegion, ty::Region>)
where F : FnMut(ty::BoundRegion) -> ty::Region,
- T : TypeFoldable<'tcx> + Repr<'tcx>,
+ T : TypeFoldable<'tcx> + Repr,
{
- debug!("replace_late_bound_regions({})", value.repr(tcx));
+ debug!("replace_late_bound_regions({})", value.repr());
let mut replacer = RegionReplacer::new(tcx, &mut f);
let result = value.skip_binder().fold_with(&mut replacer);
(result, replacer.map)
match r {
ty::ReLateBound(debruijn, br) if debruijn.depth == self.current_depth => {
debug!("RegionReplacer.fold_region({}) folding region (current_depth={})",
- r.repr(self.tcx()), self.current_depth);
+ r.repr(), self.current_depth);
let fld_r = &mut self.fld_r;
let region = *self.map.entry(br).or_insert_with(|| fld_r(br));
if let ty::ReLateBound(debruijn1, br) = region {
}
}
-pub fn shift_regions<'tcx, T:TypeFoldable<'tcx>+Repr<'tcx>>(tcx: &ty::ctxt<'tcx>,
+pub fn shift_regions<'tcx, T:TypeFoldable<'tcx>+Repr>(tcx: &ty::ctxt<'tcx>,
amount: u32, value: &T) -> T {
debug!("shift_regions(value={}, amount={})",
- value.repr(tcx), amount);
+ value.repr(), amount);
value.fold_with(&mut RegionFolder::new(tcx, &mut |region, _current_depth| {
shift_region(region, amount)
fn regions(&mut self, a: ty::Region, b: ty::Region) -> RelateResult<'tcx, ty::Region> {
debug!("{}.regions({}, {})",
self.tag(),
- a.repr(self.tcx()),
- b.repr(self.tcx()));
+ a.repr(),
+ b.repr());
Ok(a)
}
fn tys(&mut self, a: Ty<'tcx>, b: Ty<'tcx>) -> RelateResult<'tcx, Ty<'tcx>> {
debug!("{}.tys({}, {})", self.tag(),
- a.repr(self.tcx()), b.repr(self.tcx()));
+ a.repr(), b.repr());
if a == b { return Ok(a); }
match (&a.sty, &b.sty) {
{
debug!("{}.mts({}, {})",
relation.tag(),
- a.repr(relation.tcx()),
- b.repr(relation.tcx()));
+ a.repr(),
+ b.repr());
if a.mutbl != b.mutbl {
Err(ty::terr_mutability)
} else {
where R: TypeRelation<'a,'tcx>
{
debug!("substs: item_def_id={} a_subst={} b_subst={}",
- item_def_id.repr(relation.tcx()),
- a_subst.repr(relation.tcx()),
- b_subst.repr(relation.tcx()));
+ item_def_id.repr(),
+ a_subst.repr(),
+ b_subst.repr());
let variances;
let opt_variances = if relation.tcx().variance_computed.get() {
debug!("relate_region_params(a_rs={}, \
b_rs={}, variances={})",
- a_rs.repr(tcx),
- b_rs.repr(tcx),
- variances.repr(tcx));
+ a_rs.repr(),
+ b_rs.repr(),
+ variances.repr());
assert_eq!(num_region_params,
variances.map_or(num_region_params,
use syntax::owned_slice::OwnedSlice;
/// Produces a string suitable for debugging output.
-pub trait Repr<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String;
+pub trait Repr {
+ fn repr(&self) -> String;
}
/// Produces a string suitable for showing to the user.
-pub trait UserString<'tcx> : Repr<'tcx> {
- fn user_string(&self, tcx: &ctxt<'tcx>) -> String;
+pub trait UserString: Repr {
+ fn user_string(&self) -> String;
}
-fn parameterized<'tcx, GG>(cx: &ctxt<'tcx>,
- substs: &subst::Substs<'tcx>,
- did: ast::DefId,
- projections: &[ty::ProjectionPredicate<'tcx>],
- get_generics: GG)
- -> String
- where GG : FnOnce() -> ty::Generics<'tcx>
+pub fn verbose() -> bool {
+ ty::tls::with(|tcx| tcx.sess.verbose())
+}
+
+fn parameterized<GG>(substs: &subst::Substs,
+ did: ast::DefId,
+ projections: &[ty::ProjectionPredicate],
+ get_generics: GG)
+ -> String
+ where GG: for<'tcx> FnOnce(&ty::ctxt<'tcx>) -> ty::Generics<'tcx>
{
- let base = ty::item_path_str(cx, did);
- if cx.sess.verbose() {
+ let base = ty::tls::with(|tcx| ty::item_path_str(tcx, did));
+ if verbose() {
let mut strings = vec![];
match substs.regions {
subst::ErasedRegions => {
}
subst::NonerasedRegions(ref regions) => {
for region in regions {
- strings.push(region.repr(cx));
+ strings.push(region.repr());
}
}
}
for ty in &substs.types {
- strings.push(ty.repr(cx));
+ strings.push(ty.repr());
}
for projection in projections {
strings.push(format!("{}={}",
- projection.projection_ty.item_name.user_string(cx),
- projection.ty.user_string(cx)));
+ projection.projection_ty.item_name.user_string(),
+ projection.ty.user_string()));
}
return if strings.is_empty() {
format!("{}", base)
subst::ErasedRegions => { }
subst::NonerasedRegions(ref regions) => {
for &r in regions {
- let s = r.user_string(cx);
+ let s = r.user_string();
if s.is_empty() {
// This happens when the value of the region
// parameter is not easily serialized. This may be
// ICEs trying to fetch the generics early in the pipeline. This
// is kind of a hacky workaround in that -Z verbose is required to
// avoid those ICEs.
- let generics = get_generics();
-
- let has_self = substs.self_ty().is_some();
- let tps = substs.types.get_slice(subst::TypeSpace);
- let ty_params = generics.types.get_slice(subst::TypeSpace);
- let has_defaults = ty_params.last().map_or(false, |def| def.default.is_some());
- let num_defaults = if has_defaults {
- ty_params.iter().zip(tps).rev().take_while(|&(def, &actual)| {
- match def.default {
- Some(default) => {
- if !has_self && ty::type_has_self(default) {
- // In an object type, there is no `Self`, and
- // thus if the default value references Self,
- // the user will be required to give an
- // explicit value. We can't even do the
- // substitution below to check without causing
- // an ICE. (#18956).
- false
- } else {
- default.subst(cx, substs) == actual
+ ty::tls::with(|tcx| {
+ let generics = get_generics(tcx);
+
+ let has_self = substs.self_ty().is_some();
+ let tps = substs.types.get_slice(subst::TypeSpace);
+ let ty_params = generics.types.get_slice(subst::TypeSpace);
+ let has_defaults = ty_params.last().map_or(false, |def| def.default.is_some());
+ let num_defaults = if has_defaults {
+ let substs = tcx.lift(&substs);
+ ty_params.iter().zip(tps).rev().take_while(|&(def, &actual)| {
+ match def.default {
+ Some(default) => {
+ if !has_self && ty::type_has_self(default) {
+ // In an object type, there is no `Self`, and
+ // thus if the default value references Self,
+ // the user will be required to give an
+ // explicit value. We can't even do the
+ // substitution below to check without causing
+ // an ICE. (#18956).
+ false
+ } else {
+ let default = tcx.lift(&default);
+ substs.and_then(|substs| default.subst(tcx, substs)) == Some(actual)
+ }
}
+ None => false
}
- None => false
- }
- }).count()
- } else {
- 0
- };
+ }).count()
+ } else {
+ 0
+ };
- for t in &tps[..tps.len() - num_defaults] {
- strs.push(t.user_string(cx))
- }
+ for t in &tps[..tps.len() - num_defaults] {
+ strs.push(t.user_string())
+ }
+ });
for projection in projections {
strs.push(format!("{}={}",
- projection.projection_ty.item_name.user_string(cx),
- projection.ty.user_string(cx)));
+ projection.projection_ty.item_name.user_string(),
+ projection.ty.user_string()));
}
- if cx.lang_items.fn_trait_kind(did).is_some() && projections.len() == 1 {
+ let fn_trait_kind = ty::tls::with(|tcx| tcx.lang_items.fn_trait_kind(did));
+ if fn_trait_kind.is_some() && projections.len() == 1 {
let projection_ty = projections[0].ty;
let tail =
if ty::type_is_nil(projection_ty) {
format!("")
} else {
- format!(" -> {}", projection_ty.user_string(cx))
+ format!(" -> {}", projection_ty.user_string())
};
format!("{}({}){}",
base,
}
}
-impl<'tcx, T:Repr<'tcx>> Repr<'tcx> for Option<T> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+fn in_binder<'tcx, T, U>(tcx: &ty::ctxt<'tcx>,
+ original: &ty::Binder<T>,
+ lifted: Option<ty::Binder<U>>) -> String
+ where T: UserString, U: UserString + TypeFoldable<'tcx>
+{
+ // Replace any anonymous late-bound regions with named
+ // variants, using gensym'd identifiers, so that we can
+ // clearly differentiate between named and unnamed regions in
+ // the output. We'll probably want to tweak this over time to
+ // decide just how much information to give.
+ let value = if let Some(v) = lifted {
+ v
+ } else {
+ return original.0.user_string();
+ };
+ let mut names = Vec::new();
+ let value_str = ty_fold::replace_late_bound_regions(tcx, &value, |br| {
+ ty::ReLateBound(ty::DebruijnIndex::new(1), match br {
+ ty::BrNamed(_, name) => {
+ names.push(token::get_name(name).to_string());
+ br
+ }
+ ty::BrAnon(_) |
+ ty::BrFresh(_) |
+ ty::BrEnv => {
+ let name = token::gensym("'r");
+ names.push(token::get_name(name).to_string());
+ ty::BrNamed(ast_util::local_def(ast::DUMMY_NODE_ID), name)
+ }
+ })
+ }).0.user_string();
+
+ if names.is_empty() {
+ value_str
+ } else {
+ format!("for<{}> {}", names.connect(","), value_str)
+ }
+}
+
+impl<T:Repr> Repr for Option<T> {
+ fn repr(&self) -> String {
match self {
&None => "None".to_string(),
- &Some(ref t) => t.repr(tcx),
+ &Some(ref t) => t.repr(),
}
}
}
-impl<'tcx, T:Repr<'tcx>> Repr<'tcx> for P<T> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
- (**self).repr(tcx)
+impl<T:Repr> Repr for P<T> {
+ fn repr(&self) -> String {
+ (**self).repr()
}
}
-impl<'tcx,T:Repr<'tcx>,U:Repr<'tcx>> Repr<'tcx> for Result<T,U> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<T:Repr,U:Repr> Repr for Result<T,U> {
+ fn repr(&self) -> String {
match self {
- &Ok(ref t) => t.repr(tcx),
- &Err(ref u) => format!("Err({})", u.repr(tcx))
+ &Ok(ref t) => t.repr(),
+ &Err(ref u) => format!("Err({})", u.repr())
}
}
}
-impl<'tcx> Repr<'tcx> for () {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for () {
+ fn repr(&self) -> String {
"()".to_string()
}
}
-impl<'a, 'tcx, T: ?Sized +Repr<'tcx>> Repr<'tcx> for &'a T {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
- Repr::repr(*self, tcx)
+impl<'a, T: ?Sized +Repr> Repr for &'a T {
+ fn repr(&self) -> String {
+ (**self).repr()
}
}
-impl<'tcx, T:Repr<'tcx>> Repr<'tcx> for Rc<T> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
- (&**self).repr(tcx)
+impl<T:Repr> Repr for Rc<T> {
+ fn repr(&self) -> String {
+ (&**self).repr()
}
}
-impl<'tcx, T:Repr<'tcx>> Repr<'tcx> for Box<T> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
- (&**self).repr(tcx)
+impl<T:Repr> Repr for Box<T> {
+ fn repr(&self) -> String {
+ (&**self).repr()
}
}
-impl<'tcx, T:Repr<'tcx>> Repr<'tcx> for [T] {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
- format!("[{}]", self.iter().map(|t| t.repr(tcx)).collect::<Vec<_>>().connect(", "))
+impl<T:Repr> Repr for [T] {
+ fn repr(&self) -> String {
+ format!("[{}]", self.iter().map(|t| t.repr()).collect::<Vec<_>>().connect(", "))
}
}
-impl<'tcx, T:Repr<'tcx>> Repr<'tcx> for OwnedSlice<T> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
- self[..].repr(tcx)
+impl<T:Repr> Repr for OwnedSlice<T> {
+ fn repr(&self) -> String {
+ self[..].repr()
}
}
// This is necessary to handle types like Option<Vec<T>>, for which
// autoderef cannot convert the &[T] handler
-impl<'tcx, T:Repr<'tcx>> Repr<'tcx> for Vec<T> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
- self[..].repr(tcx)
+impl<T:Repr> Repr for Vec<T> {
+ fn repr(&self) -> String {
+ self[..].repr()
}
}
-impl<'a, 'tcx, T: ?Sized +UserString<'tcx>> UserString<'tcx> for &'a T {
- fn user_string(&self, tcx: &ctxt<'tcx>) -> String {
- UserString::user_string(*self, tcx)
+impl<'a, T: ?Sized +UserString> UserString for &'a T {
+ fn user_string(&self) -> String {
+ (**self).user_string()
}
}
-impl<'tcx, T:UserString<'tcx>> UserString<'tcx> for Vec<T> {
- fn user_string(&self, tcx: &ctxt<'tcx>) -> String {
+impl<T:UserString> UserString for Vec<T> {
+ fn user_string(&self) -> String {
let strs: Vec<String> =
- self.iter().map(|t| t.user_string(tcx)).collect();
+ self.iter().map(|t| t.user_string()).collect();
strs.connect(", ")
}
}
-impl<'tcx> Repr<'tcx> for def::Def {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for def::Def {
+ fn repr(&self) -> String {
format!("{:?}", *self)
}
}
type TraitAndProjections<'tcx> =
(ty::TraitRef<'tcx>, Vec<ty::ProjectionPredicate<'tcx>>);
-impl<'tcx> UserString<'tcx> for TraitAndProjections<'tcx> {
- fn user_string(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> UserString for TraitAndProjections<'tcx> {
+ fn user_string(&self) -> String {
let &(ref trait_ref, ref projection_bounds) = self;
- parameterized(tcx,
- trait_ref.substs,
+ parameterized(trait_ref.substs,
trait_ref.def_id,
&projection_bounds[..],
- || ty::lookup_trait_def(tcx, trait_ref.def_id).generics.clone())
+ |tcx| ty::lookup_trait_def(tcx, trait_ref.def_id).generics.clone())
}
}
-impl<'tcx> UserString<'tcx> for ty::TraitTy<'tcx> {
- fn user_string(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> UserString for ty::TraitTy<'tcx> {
+ fn user_string(&self) -> String {
let &ty::TraitTy { ref principal, ref bounds } = self;
let mut components = vec![];
bounds.projection_bounds.iter().map(|x| x.0.clone()).collect()));
// Generate the main trait ref, including associated types.
- components.push(tap.user_string(tcx));
+ components.push(tap.user_string());
// Builtin bounds.
for bound in &bounds.builtin_bounds {
- components.push(bound.user_string(tcx));
+ components.push(bound.user_string());
}
// Region, if not obviously implied by builtin bounds.
if bounds.region_bound != ty::ReStatic {
// Region bound is implied by builtin bounds:
- components.push(bounds.region_bound.user_string(tcx));
+ components.push(bounds.region_bound.user_string());
}
components.retain(|s| !s.is_empty());
}
}
-impl<'tcx> Repr<'tcx> for ty::TypeParameterDef<'tcx> {
- fn repr(&self, _tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::TypeParameterDef<'tcx> {
+ fn repr(&self) -> String {
format!("TypeParameterDef({:?}, {:?}/{})",
self.def_id,
self.space,
}
}
-impl<'tcx> Repr<'tcx> for ty::RegionParameterDef {
- fn repr(&self, tcx: &ctxt) -> String {
+impl Repr for ty::RegionParameterDef {
+ fn repr(&self) -> String {
format!("RegionParameterDef(name={}, def_id={}, bounds={})",
token::get_name(self.name),
- self.def_id.repr(tcx),
- self.bounds.repr(tcx))
+ self.def_id.repr(),
+ self.bounds.repr())
}
}
-impl<'tcx> Repr<'tcx> for ty::TyS<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
- self.user_string(tcx)
+impl<'tcx> Repr for ty::TyS<'tcx> {
+ fn repr(&self) -> String {
+ self.user_string()
}
}
-impl<'tcx> Repr<'tcx> for ty::mt<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::mt<'tcx> {
+ fn repr(&self) -> String {
format!("{}{}",
if self.mutbl == ast::MutMutable { "mut " } else { "" },
- self.ty.user_string(tcx))
+ self.ty.user_string())
}
}
-impl<'tcx> Repr<'tcx> for subst::Substs<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for subst::Substs<'tcx> {
+ fn repr(&self) -> String {
format!("Substs[types={}, regions={}]",
- self.types.repr(tcx),
- self.regions.repr(tcx))
+ self.types.repr(),
+ self.regions.repr())
}
}
-impl<'tcx, T:Repr<'tcx>> Repr<'tcx> for subst::VecPerParamSpace<T> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<T:Repr> Repr for subst::VecPerParamSpace<T> {
+ fn repr(&self) -> String {
format!("[{};{};{}]",
- self.get_slice(subst::TypeSpace).repr(tcx),
- self.get_slice(subst::SelfSpace).repr(tcx),
- self.get_slice(subst::FnSpace).repr(tcx))
+ self.get_slice(subst::TypeSpace).repr(),
+ self.get_slice(subst::SelfSpace).repr(),
+ self.get_slice(subst::FnSpace).repr())
}
}
-impl<'tcx> Repr<'tcx> for ty::ItemSubsts<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
- format!("ItemSubsts({})", self.substs.repr(tcx))
+impl<'tcx> Repr for ty::ItemSubsts<'tcx> {
+ fn repr(&self) -> String {
+ format!("ItemSubsts({})", self.substs.repr())
}
}
-impl<'tcx> Repr<'tcx> for subst::RegionSubsts {
- fn repr(&self, tcx: &ctxt) -> String {
+impl Repr for subst::RegionSubsts {
+ fn repr(&self) -> String {
match *self {
subst::ErasedRegions => "erased".to_string(),
- subst::NonerasedRegions(ref regions) => regions.repr(tcx)
+ subst::NonerasedRegions(ref regions) => regions.repr()
}
}
}
-impl<'tcx> Repr<'tcx> for ty::BuiltinBounds {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for ty::BuiltinBounds {
+ fn repr(&self) -> String {
let mut res = Vec::new();
for b in self {
res.push(match b {
}
}
-impl<'tcx> Repr<'tcx> for ty::ParamBounds<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::ParamBounds<'tcx> {
+ fn repr(&self) -> String {
let mut res = Vec::new();
- res.push(self.builtin_bounds.repr(tcx));
+ res.push(self.builtin_bounds.repr());
for t in &self.trait_bounds {
- res.push(t.repr(tcx));
+ res.push(t.repr());
}
res.connect("+")
}
}
-impl<'tcx> Repr<'tcx> for ty::TraitRef<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::TraitRef<'tcx> {
+ fn repr(&self) -> String {
// when printing out the debug representation, we don't need
// to enumerate the `for<...>` etc because the debruijn index
// tells you everything you need to know.
- let result = self.user_string(tcx);
+ let result = self.user_string();
match self.substs.self_ty() {
None => result,
- Some(sty) => format!("<{} as {}>", sty.repr(tcx), result)
+ Some(sty) => format!("<{} as {}>", sty.repr(), result)
}
}
}
-impl<'tcx> Repr<'tcx> for ty::TraitDef<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::TraitDef<'tcx> {
+ fn repr(&self) -> String {
format!("TraitDef(generics={}, trait_ref={})",
- self.generics.repr(tcx),
- self.trait_ref.repr(tcx))
+ self.generics.repr(),
+ self.trait_ref.repr())
}
}
-impl<'tcx> Repr<'tcx> for ast::TraitItem {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for ast::TraitItem {
+ fn repr(&self) -> String {
let kind = match self.node {
ast::ConstTraitItem(..) => "ConstTraitItem",
ast::MethodTraitItem(..) => "MethodTraitItem",
}
}
-impl<'tcx> Repr<'tcx> for ast::Expr {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for ast::Expr {
+ fn repr(&self) -> String {
format!("expr({}: {})", self.id, pprust::expr_to_string(self))
}
}
-impl<'tcx> Repr<'tcx> for ast::Path {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for ast::Path {
+ fn repr(&self) -> String {
format!("path({})", pprust::path_to_string(self))
}
}
-impl<'tcx> UserString<'tcx> for ast::Path {
- fn user_string(&self, _tcx: &ctxt) -> String {
+impl UserString for ast::Path {
+ fn user_string(&self) -> String {
pprust::path_to_string(self)
}
}
-impl<'tcx> Repr<'tcx> for ast::Ty {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for ast::Ty {
+ fn repr(&self) -> String {
format!("type({})", pprust::ty_to_string(self))
}
}
-impl<'tcx> Repr<'tcx> for ast::Item {
- fn repr(&self, tcx: &ctxt) -> String {
- format!("item({})", tcx.map.node_to_string(self.id))
+impl Repr for ast::Item {
+ fn repr(&self) -> String {
+ format!("item({})", ty::tls::with(|tcx| tcx.map.node_to_string(self.id)))
}
}
-impl<'tcx> Repr<'tcx> for ast::Lifetime {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for ast::Lifetime {
+ fn repr(&self) -> String {
format!("lifetime({}: {})", self.id, pprust::lifetime_to_string(self))
}
}
-impl<'tcx> Repr<'tcx> for ast::Stmt {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for ast::Stmt {
+ fn repr(&self) -> String {
format!("stmt({}: {})",
ast_util::stmt_id(self),
pprust::stmt_to_string(self))
}
}
-impl<'tcx> Repr<'tcx> for ast::Pat {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for ast::Pat {
+ fn repr(&self) -> String {
format!("pat({}: {})", self.id, pprust::pat_to_string(self))
}
}
-impl<'tcx> Repr<'tcx> for ty::BoundRegion {
- fn repr(&self, tcx: &ctxt) -> String {
+impl Repr for ty::BoundRegion {
+ fn repr(&self) -> String {
match *self {
ty::BrAnon(id) => format!("BrAnon({})", id),
ty::BrNamed(id, name) => {
- format!("BrNamed({}, {})", id.repr(tcx), token::get_name(name))
+ format!("BrNamed({}, {})", id.repr(), token::get_name(name))
}
ty::BrFresh(id) => format!("BrFresh({})", id),
ty::BrEnv => "BrEnv".to_string()
}
}
-impl<'tcx> UserString<'tcx> for ty::BoundRegion {
- fn user_string(&self, tcx: &ctxt) -> String {
- if tcx.sess.verbose() {
- return self.repr(tcx);
+impl UserString for ty::BoundRegion {
+ fn user_string(&self) -> String {
+ if verbose() {
+ return self.repr();
}
match *self {
}
}
-impl<'tcx> Repr<'tcx> for ty::Region {
- fn repr(&self, tcx: &ctxt) -> String {
+impl Repr for ty::Region {
+ fn repr(&self) -> String {
match *self {
ty::ReEarlyBound(ref data) => {
format!("ReEarlyBound({}, {:?}, {}, {})",
ty::ReLateBound(binder_id, ref bound_region) => {
format!("ReLateBound({:?}, {})",
binder_id,
- bound_region.repr(tcx))
+ bound_region.repr())
}
- ty::ReFree(ref fr) => fr.repr(tcx),
+ ty::ReFree(ref fr) => fr.repr(),
ty::ReScope(id) => {
format!("ReScope({:?})", id)
}
ty::ReInfer(ReSkolemized(id, ref bound_region)) => {
- format!("re_skolemized({}, {})", id, bound_region.repr(tcx))
+ format!("re_skolemized({}, {})", id, bound_region.repr())
}
ty::ReEmpty => {
}
}
-impl<'tcx> UserString<'tcx> for ty::Region {
- fn user_string(&self, tcx: &ctxt) -> String {
- if tcx.sess.verbose() {
- return self.repr(tcx);
+impl UserString for ty::Region {
+ fn user_string(&self) -> String {
+ if verbose() {
+ return self.repr();
}
// These printouts are concise. They do not contain all the information
ty::ReLateBound(_, br) |
ty::ReFree(ty::FreeRegion { bound_region: br, .. }) |
ty::ReInfer(ReSkolemized(_, br)) => {
- br.user_string(tcx)
+ br.user_string()
}
ty::ReScope(_) |
ty::ReInfer(ReVar(_)) => String::new(),
}
}
-impl<'tcx> Repr<'tcx> for ty::FreeRegion {
- fn repr(&self, tcx: &ctxt) -> String {
+impl Repr for ty::FreeRegion {
+ fn repr(&self) -> String {
format!("ReFree({}, {})",
- self.scope.repr(tcx),
- self.bound_region.repr(tcx))
+ self.scope.repr(),
+ self.bound_region.repr())
}
}
-impl<'tcx> Repr<'tcx> for region::CodeExtent {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for region::CodeExtent {
+ fn repr(&self) -> String {
match *self {
region::CodeExtent::ParameterScope { fn_id, body_id } =>
format!("ParameterScope({}, {})", fn_id, body_id),
}
}
-impl<'tcx> Repr<'tcx> for region::DestructionScopeData {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for region::DestructionScopeData {
+ fn repr(&self) -> String {
match *self {
region::DestructionScopeData{ node_id } =>
format!("DestructionScopeData {{ node_id: {} }}", node_id),
}
}
-impl<'tcx> Repr<'tcx> for ast::DefId {
- fn repr(&self, tcx: &ctxt) -> String {
+impl Repr for ast::DefId {
+ fn repr(&self) -> String {
// Unfortunately, there seems to be no way to attempt to print
// a path for a def-id, so I'll just make a best effort for now
// and otherwise fallback to just printing the crate/node pair
- if self.krate == ast::LOCAL_CRATE {
- match tcx.map.find(self.node) {
- Some(ast_map::NodeItem(..)) |
- Some(ast_map::NodeForeignItem(..)) |
- Some(ast_map::NodeImplItem(..)) |
- Some(ast_map::NodeTraitItem(..)) |
- Some(ast_map::NodeVariant(..)) |
- Some(ast_map::NodeStructCtor(..)) => {
- return format!(
- "{:?}:{}",
- *self,
- ty::item_path_str(tcx, *self))
+ ty::tls::with(|tcx| {
+ if self.krate == ast::LOCAL_CRATE {
+ match tcx.map.find(self.node) {
+ Some(ast_map::NodeItem(..)) |
+ Some(ast_map::NodeForeignItem(..)) |
+ Some(ast_map::NodeImplItem(..)) |
+ Some(ast_map::NodeTraitItem(..)) |
+ Some(ast_map::NodeVariant(..)) |
+ Some(ast_map::NodeStructCtor(..)) => {
+ return format!("{:?}:{}",
+ *self,
+ ty::item_path_str(tcx, *self));
+ }
+ _ => {}
}
- _ => {}
}
- }
- return format!("{:?}", *self)
+ format!("{:?}", *self)
+ })
}
}
-impl<'tcx> Repr<'tcx> for ty::TypeScheme<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::TypeScheme<'tcx> {
+ fn repr(&self) -> String {
format!("TypeScheme {{generics: {}, ty: {}}}",
- self.generics.repr(tcx),
- self.ty.repr(tcx))
+ self.generics.repr(),
+ self.ty.repr())
}
}
-impl<'tcx> Repr<'tcx> for ty::Generics<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::Generics<'tcx> {
+ fn repr(&self) -> String {
format!("Generics(types: {}, regions: {})",
- self.types.repr(tcx),
- self.regions.repr(tcx))
+ self.types.repr(),
+ self.regions.repr())
}
}
-impl<'tcx> Repr<'tcx> for ty::GenericPredicates<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::GenericPredicates<'tcx> {
+ fn repr(&self) -> String {
format!("GenericPredicates(predicates: {})",
- self.predicates.repr(tcx))
+ self.predicates.repr())
}
}
-impl<'tcx> Repr<'tcx> for ty::InstantiatedPredicates<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::InstantiatedPredicates<'tcx> {
+ fn repr(&self) -> String {
format!("InstantiatedPredicates({})",
- self.predicates.repr(tcx))
+ self.predicates.repr())
}
}
-impl<'tcx> Repr<'tcx> for ty::ItemVariances {
- fn repr(&self, tcx: &ctxt) -> String {
+impl Repr for ty::ItemVariances {
+ fn repr(&self) -> String {
format!("ItemVariances(types={}, \
regions={})",
- self.types.repr(tcx),
- self.regions.repr(tcx))
+ self.types.repr(),
+ self.regions.repr())
}
}
-impl<'tcx> Repr<'tcx> for ty::Variance {
- fn repr(&self, _: &ctxt) -> String {
+impl Repr for ty::Variance {
+ fn repr(&self) -> String {
// The first `.to_string()` returns a &'static str (it is not an implementation
// of the ToString trait). Because of that, we need to call `.to_string()` again
// if we want to have a `String`.
}
}
-impl<'tcx> Repr<'tcx> for ty::ImplOrTraitItem<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::ImplOrTraitItem<'tcx> {
+ fn repr(&self) -> String {
format!("ImplOrTraitItem({})",
match *self {
- ty::ImplOrTraitItem::MethodTraitItem(ref i) => i.repr(tcx),
- ty::ImplOrTraitItem::ConstTraitItem(ref i) => i.repr(tcx),
- ty::ImplOrTraitItem::TypeTraitItem(ref i) => i.repr(tcx),
+ ty::ImplOrTraitItem::MethodTraitItem(ref i) => i.repr(),
+ ty::ImplOrTraitItem::ConstTraitItem(ref i) => i.repr(),
+ ty::ImplOrTraitItem::TypeTraitItem(ref i) => i.repr(),
})
}
}
-impl<'tcx> Repr<'tcx> for ty::AssociatedConst<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::AssociatedConst<'tcx> {
+ fn repr(&self) -> String {
format!("AssociatedConst(name: {}, ty: {}, vis: {}, def_id: {})",
- self.name.repr(tcx),
- self.ty.repr(tcx),
- self.vis.repr(tcx),
- self.def_id.repr(tcx))
+ self.name.repr(),
+ self.ty.repr(),
+ self.vis.repr(),
+ self.def_id.repr())
}
}
-impl<'tcx> Repr<'tcx> for ty::AssociatedType<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::AssociatedType<'tcx> {
+ fn repr(&self) -> String {
format!("AssociatedType(name: {}, vis: {}, def_id: {})",
- self.name.repr(tcx),
- self.vis.repr(tcx),
- self.def_id.repr(tcx))
+ self.name.repr(),
+ self.vis.repr(),
+ self.def_id.repr())
}
}
-impl<'tcx> Repr<'tcx> for ty::Method<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::Method<'tcx> {
+ fn repr(&self) -> String {
format!("Method(name: {}, generics: {}, predicates: {}, fty: {}, \
explicit_self: {}, vis: {}, def_id: {})",
- self.name.repr(tcx),
- self.generics.repr(tcx),
- self.predicates.repr(tcx),
- self.fty.repr(tcx),
- self.explicit_self.repr(tcx),
- self.vis.repr(tcx),
- self.def_id.repr(tcx))
+ self.name.repr(),
+ self.generics.repr(),
+ self.predicates.repr(),
+ self.fty.repr(),
+ self.explicit_self.repr(),
+ self.vis.repr(),
+ self.def_id.repr())
}
}
-impl<'tcx> Repr<'tcx> for ast::Name {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for ast::Name {
+ fn repr(&self) -> String {
token::get_name(*self).to_string()
}
}
-impl<'tcx> UserString<'tcx> for ast::Name {
- fn user_string(&self, _tcx: &ctxt) -> String {
+impl UserString for ast::Name {
+ fn user_string(&self) -> String {
token::get_name(*self).to_string()
}
}
-impl<'tcx> Repr<'tcx> for ast::Ident {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for ast::Ident {
+ fn repr(&self) -> String {
token::get_ident(*self).to_string()
}
}
-impl<'tcx> Repr<'tcx> for ast::ExplicitSelf_ {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for ast::ExplicitSelf_ {
+ fn repr(&self) -> String {
format!("{:?}", *self)
}
}
-impl<'tcx> Repr<'tcx> for ast::Visibility {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for ast::Visibility {
+ fn repr(&self) -> String {
format!("{:?}", *self)
}
}
-impl<'tcx> Repr<'tcx> for ty::BareFnTy<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::BareFnTy<'tcx> {
+ fn repr(&self) -> String {
format!("BareFnTy {{unsafety: {}, abi: {}, sig: {}}}",
self.unsafety,
self.abi.to_string(),
- self.sig.repr(tcx))
+ self.sig.repr())
}
}
-impl<'tcx> Repr<'tcx> for ty::FnSig<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
- format!("fn{} -> {}", self.inputs.repr(tcx), self.output.repr(tcx))
+impl<'tcx> Repr for ty::FnSig<'tcx> {
+ fn repr(&self) -> String {
+ format!("fn{} -> {}", self.inputs.repr(), self.output.repr())
}
}
-impl<'tcx> Repr<'tcx> for ty::FnOutput<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::FnOutput<'tcx> {
+ fn repr(&self) -> String {
match *self {
ty::FnConverging(ty) =>
- format!("FnConverging({0})", ty.repr(tcx)),
+ format!("FnConverging({0})", ty.repr()),
ty::FnDiverging =>
"FnDiverging".to_string()
}
}
}
-impl<'tcx> Repr<'tcx> for ty::MethodCallee<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::MethodCallee<'tcx> {
+ fn repr(&self) -> String {
format!("MethodCallee {{origin: {}, ty: {}, {}}}",
- self.origin.repr(tcx),
- self.ty.repr(tcx),
- self.substs.repr(tcx))
+ self.origin.repr(),
+ self.ty.repr(),
+ self.substs.repr())
}
}
-impl<'tcx> Repr<'tcx> for ty::MethodOrigin<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::MethodOrigin<'tcx> {
+ fn repr(&self) -> String {
match self {
&ty::MethodStatic(def_id) => {
- format!("MethodStatic({})", def_id.repr(tcx))
+ format!("MethodStatic({})", def_id.repr())
}
&ty::MethodStaticClosure(def_id) => {
- format!("MethodStaticClosure({})", def_id.repr(tcx))
+ format!("MethodStaticClosure({})", def_id.repr())
}
&ty::MethodTypeParam(ref p) => {
- p.repr(tcx)
+ p.repr()
}
&ty::MethodTraitObject(ref p) => {
- p.repr(tcx)
+ p.repr()
}
}
}
}
-impl<'tcx> Repr<'tcx> for ty::MethodParam<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::MethodParam<'tcx> {
+ fn repr(&self) -> String {
format!("MethodParam({},{})",
- self.trait_ref.repr(tcx),
+ self.trait_ref.repr(),
self.method_num)
}
}
-impl<'tcx> Repr<'tcx> for ty::MethodObject<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::MethodObject<'tcx> {
+ fn repr(&self) -> String {
format!("MethodObject({},{},{})",
- self.trait_ref.repr(tcx),
+ self.trait_ref.repr(),
self.method_num,
self.vtable_index)
}
}
-impl<'tcx> Repr<'tcx> for ty::BuiltinBound {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for ty::BuiltinBound {
+ fn repr(&self) -> String {
format!("{:?}", *self)
}
}
-impl<'tcx> UserString<'tcx> for ty::BuiltinBound {
- fn user_string(&self, _tcx: &ctxt) -> String {
+impl UserString for ty::BuiltinBound {
+ fn user_string(&self) -> String {
match *self {
ty::BoundSend => "Send".to_string(),
ty::BoundSized => "Sized".to_string(),
}
}
-impl<'tcx> Repr<'tcx> for Span {
- fn repr(&self, tcx: &ctxt) -> String {
- tcx.sess.codemap().span_to_string(*self).to_string()
+impl Repr for Span {
+ fn repr(&self) -> String {
+ ty::tls::with(|tcx| tcx.sess.codemap().span_to_string(*self).to_string())
}
}
-impl<
'tcx, A:UserString<'tcx>> UserString<'tcx> for Rc<A> {
- fn user_string(&self, tcx: &ctxt<'tcx>) -> String {
+impl<
A:UserString> UserString for Rc<A> {
+ fn user_string(&self) -> String {
let this: &A = &**self;
- this.user_string(tcx)
+ this.user_string()
}
}
-impl<'tcx> UserString<'tcx> for ty::ParamBounds<'tcx> {
- fn user_string(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> UserString for ty::ParamBounds<'tcx> {
+ fn user_string(&self) -> String {
let mut result = Vec::new();
- let s = self.builtin_bounds.user_string(tcx);
+ let s = self.builtin_bounds.user_string();
if !s.is_empty() {
result.push(s);
}
for n in &self.trait_bounds {
- result.push(n.user_string(tcx));
+ result.push(n.user_string());
}
result.connect(" + ")
}
}
-impl<'tcx> Repr<'tcx> for ty::ExistentialBounds<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::ExistentialBounds<'tcx> {
+ fn repr(&self) -> String {
let mut res = Vec::new();
- let region_str = self.region_bound.repr(tcx);
+ let region_str = self.region_bound.repr();
if !region_str.is_empty() {
res.push(region_str);
}
for bound in &self.builtin_bounds {
- res.push(bound.repr(tcx));
+ res.push(bound.repr());
}
for projection_bound in &self.projection_bounds {
- res.push(projection_bound.repr(tcx));
+ res.push(projection_bound.repr());
}
res.connect("+")
}
}
-impl<'tcx> UserString<'tcx> for ty::BuiltinBounds {
- fn user_string(&self, tcx: &ctxt) -> String {
+impl UserString for ty::BuiltinBounds {
+ fn user_string(&self) -> String {
self.iter()
- .map(|bb| bb.user_string(tcx))
+ .map(|bb| bb.user_string())
.collect::<Vec<String>>()
.connect("+")
.to_string()
}
}
-impl<'tcx, T> UserString<'tcx> for ty::Binder<T>
- where T : UserString<'tcx> + TypeFoldable<'tcx>
+// The generic impl doesn't work yet because projections are not
+// normalized under HRTB.
+/*impl<T> UserString for ty::Binder<T>
+ where T: UserString + for<'a> ty::Lift<'a>,
+ for<'a> <T as ty::Lift<'a>>::Lifted: UserString + TypeFoldable<'a>
{
- fn user_string(&self, tcx: &ctxt<'tcx>) -> String {
- // Replace any anonymous late-bound regions with named
- // variants, using gensym'd identifiers, so that we can
- // clearly differentiate between named and unnamed regions in
- // the output. We'll probably want to tweak this over time to
- // decide just how much information to give.
- let mut names = Vec::new();
- let (unbound_value, _) = ty_fold::replace_late_bound_regions(tcx, self, |br| {
- ty::ReLateBound(ty::DebruijnIndex::new(1), match br {
- ty::BrNamed(_, name) => {
- names.push(token::get_name(name));
- br
- }
- ty::BrAnon(_) |
- ty::BrFresh(_) |
- ty::BrEnv => {
- let name = token::gensym("'r");
- names.push(token::get_name(name));
- ty::BrNamed(ast_util::local_def(ast::DUMMY_NODE_ID), name)
- }
- })
- });
- let names: Vec<_> = names.iter().map(|s| &s[..]).collect();
+ fn user_string(&self) -> String {
+ ty::tls::with(|tcx| in_binder(tcx, self, tcx.lift(self)))
+ }
+}*/
- let value_str = unbound_value.user_string(tcx);
- if names.is_empty() {
- value_str
- } else {
- format!("for<{}> {}", names.connect(","), value_str)
- }
+impl<'tcx> UserString for ty::Binder<ty::TraitRef<'tcx>> {
+ fn user_string(&self) -> String {
+ ty::tls::with(|tcx| in_binder(tcx, self, tcx.lift(self)))
+ }
+}
+
+impl<'tcx> UserString for ty::Binder<ty::TraitPredicate<'tcx>> {
+ fn user_string(&self) -> String {
+ ty::tls::with(|tcx| in_binder(tcx, self, tcx.lift(self)))
}
}
-impl<'tcx> UserString<'tcx> for ty::TraitRef<'tcx> {
- fn user_string(&self, tcx: &ctxt<'tcx>) -> String {
- parameterized(tcx, self.substs, self.def_id, &[],
- || ty::lookup_trait_def(tcx, self.def_id).generics.clone())
+impl<'tcx> UserString for ty::Binder<ty::EquatePredicate<'tcx>> {
+ fn user_string(&self) -> String {
+ ty::tls::with(|tcx| in_binder(tcx, self, tcx.lift(self)))
}
}
-impl<'tcx> UserString<'tcx> for ty::TyS<'tcx> {
- fn user_string(&self, tcx: &ctxt<'tcx>) -> String {
- fn bare_fn_to_string<'tcx>(cx: &ctxt<'tcx>,
- opt_def_id: Option<ast::DefId>,
- unsafety: ast::Unsafety,
- abi: abi::Abi,
- ident: Option<ast::Ident>,
- sig: &ty::PolyFnSig<'tcx>)
- -> String {
+impl<'tcx> UserString for ty::Binder<ty::ProjectionPredicate<'tcx>> {
+ fn user_string(&self) -> String {
+ ty::tls::with(|tcx| in_binder(tcx, self, tcx.lift(self)))
+ }
+}
+
+impl<'tcx> UserString for ty::Binder<TraitAndProjections<'tcx>> {
+ fn user_string(&self) -> String {
+ ty::tls::with(|tcx| in_binder(tcx, self, tcx.lift(self)))
+ }
+}
+
+impl<'tcx> UserString for ty::Binder<ty::OutlivesPredicate<Ty<'tcx>, ty::Region>> {
+ fn user_string(&self) -> String {
+ ty::tls::with(|tcx| in_binder(tcx, self, tcx.lift(self)))
+ }
+}
+
+impl UserString for ty::Binder<ty::OutlivesPredicate<ty::Region, ty::Region>> {
+ fn user_string(&self) -> String {
+ ty::tls::with(|tcx| in_binder(tcx, self, tcx.lift(self)))
+ }
+}
+
+impl<'tcx> UserString for ty::TraitRef<'tcx> {
+ fn user_string(&self) -> String {
+ parameterized(self.substs, self.def_id, &[],
+ |tcx| ty::lookup_trait_def(tcx, self.def_id).generics.clone())
+ }
+}
+
+impl<'tcx> UserString for ty::TyS<'tcx> {
+ fn user_string(&self) -> String {
+ fn bare_fn_to_string(opt_def_id: Option<ast::DefId>,
+ unsafety: ast::Unsafety,
+ abi: abi::Abi,
+ ident: Option<ast::Ident>,
+ sig: &ty::PolyFnSig)
+ -> String {
let mut s = String::new();
match unsafety {
_ => { }
}
- push_sig_to_string(cx, &mut s, '(', ')', sig);
+ push_sig_to_string(&mut s, '(', ')', sig);
match opt_def_id {
Some(def_id) => {
s.push_str(" {");
- let path_str = ty::item_path_str(cx, def_id);
+ let path_str = ty::tls::with(|tcx| ty::item_path_str(tcx, def_id));
s.push_str(&path_str[..]);
s.push_str("}");
}
s
}
- fn closure_to_string<'tcx>(cx: &ctxt<'tcx>,
- cty: &ty::ClosureTy<'tcx>,
- did: &ast::DefId)
- -> String {
- let mut s = String::new();
- s.push_str("[closure");
- push_sig_to_string(cx, &mut s, '(', ')', &cty.sig);
- if cx.sess.verbose() {
- s.push_str(&format!(" id={:?}]", did));
- } else {
- s.push(']');
- }
- s
- }
-
- fn push_sig_to_string<'tcx>(cx: &ctxt<'tcx>,
- s: &mut String,
- bra: char,
- ket: char,
- sig: &ty::PolyFnSig<'tcx>) {
+ fn push_sig_to_string(s: &mut String,
+ bra: char,
+ ket: char,
+ sig: &ty::PolyFnSig) {
s.push(bra);
let strs = sig.0.inputs
.iter()
- .map(|a| a.user_string(cx))
+ .map(|a| a.user_string())
.collect::<Vec<_>>();
s.push_str(&strs.connect(", "));
if sig.0.variadic {
ty::FnConverging(t) => {
if !ty::type_is_nil(t) {
s.push_str(" -> ");
- s.push_str(& t.user_string(cx));
+ s.push_str(&t.user_string());
}
}
ty::FnDiverging => {
}
}
- fn infer_ty_to_string(cx: &ctxt, ty: ty::InferTy) -> String {
- let print_var_ids = cx.sess.verbose();
- match ty {
- ty::TyVar(ref vid) if print_var_ids => vid.repr(cx),
- ty::IntVar(ref vid) if print_var_ids => vid.repr(cx),
- ty::FloatVar(ref vid) if print_var_ids => vid.repr(cx),
- ty::TyVar(_) | ty::IntVar(_) | ty::FloatVar(_) => format!("_"),
- ty::FreshTy(v) => format!("FreshTy({})", v),
- ty::FreshIntTy(v) => format!("FreshIntTy({})", v),
- ty::FreshFloatTy(v) => format!("FreshFloatTy({})", v)
- }
- }
-
// pretty print the structural type representation:
match self.sty {
TyBool => "bool".to_string(),
TyInt(t) => ast_util::int_ty_to_string(t, None).to_string(),
TyUint(t) => ast_util::uint_ty_to_string(t, None).to_string(),
TyFloat(t) => ast_util::float_ty_to_string(t).to_string(),
- TyBox(typ) => format!("Box<{}>", typ.user_string(tcx)),
+ TyBox(typ) => format!("Box<{}>", typ.user_string()),
TyRawPtr(ref tm) => {
format!("*{} {}", match tm.mutbl {
ast::MutMutable => "mut",
ast::MutImmutable => "const",
- }, tm.ty.user_string(tcx))
+ }, tm.ty.user_string())
}
TyRef(r, ref tm) => {
let mut buf = "&".to_owned();
- buf.push_str(&r.user_string(tcx));
- if !buf.is_empty() {
+ buf.push_str(&r.user_string());
+ if buf.len() > 1 {
buf.push_str(" ");
}
- buf.push_str(&tm.repr(tcx));
+ buf.push_str(&tm.repr());
buf
}
TyTuple(ref elems) => {
let strs = elems
.iter()
- .map(|elem| elem.user_string(tcx))
+ .map(|elem| elem.user_string())
.collect::<Vec<_>>();
match &strs[..] {
[ref string] => format!("({},)", string),
}
}
TyBareFn(opt_def_id, ref f) => {
- bare_fn_to_string(tcx, opt_def_id, f.unsafety, f.abi, None, &f.sig)
+ bare_fn_to_string(opt_def_id, f.unsafety, f.abi, None, &f.sig)
}
- TyInfer(infer_ty) => infer_ty_to_string(tcx, infer_ty),
+ TyInfer(infer_ty) => infer_ty.repr(),
TyError => "[type error]".to_string(),
- TyParam(ref param_ty) => param_ty.user_string(tcx),
+ TyParam(ref param_ty) => param_ty.user_string(),
TyEnum(did, substs) | TyStruct(did, substs) => {
- parameterized(tcx, substs, did, &[],
- || ty::lookup_item_type(tcx, did).generics)
+ parameterized(substs, did, &[],
+ |tcx| ty::lookup_item_type(tcx, did).generics)
}
TyTrait(ref data) => {
- data.user_string(tcx)
+ data.user_string()
}
ty::TyProjection(ref data) => {
format!("<{} as {}>::{}",
- data.trait_ref.self_ty().user_string(tcx),
- data.trait_ref.user_string(tcx),
- data.item_name.user_string(tcx))
+ data.trait_ref.self_ty().user_string(),
+ data.trait_ref.user_string(),
+ data.item_name.user_string())
}
TyStr => "str".to_string(),
- TyClosure(ref did, substs) => {
+ TyClosure(ref did, substs) => ty::tls::with(|tcx| {
let closure_tys = tcx.closure_tys.borrow();
- closure_tys.get(did).map(|closure_type| {
- closure_to_string(tcx, &closure_type.subst(tcx, substs), did)
+ closure_tys.get(did).map(|cty| &cty.sig).and_then(|sig| {
+ tcx.lift(&substs).map(|substs| sig.subst(tcx, substs))
+ }).map(|sig| {
+ let mut s = String::new();
+ s.push_str("[closure");
+ push_sig_to_string(&mut s, '(', ')', &sig);
+ if verbose() {
+ s.push_str(&format!(" id={:?}]", did));
+ } else {
+ s.push(']');
+ }
+ s
}).unwrap_or_else(|| {
- let id_str = if tcx.sess.verbose() {
+ let id_str = if verbose() {
format!(" id={:?}", did)
} else {
"".to_owned()
};
-
if did.krate == ast::LOCAL_CRATE {
- let span = tcx.map.span(did.node);
- format!("[closure {}{}]", span.repr(tcx), id_str)
+ let span = ty::tls::with(|tcx| tcx.map.span(did.node));
+ format!("[closure {}{}]", span.repr(), id_str)
} else {
format!("[closure{}]", id_str)
}
})
- }
+ }),
TyArray(t, sz) => {
- format!("[{}; {}]", t.user_string(tcx), sz)
+ format!("[{}; {}]", t.user_string(), sz)
}
TySlice(t) => {
- format!("[{}]", t.user_string(tcx))
+ format!("[{}]", t.user_string())
}
}
}
}
-impl<'tcx> UserString<'tcx> for ast::Ident {
- fn user_string(&self, _tcx: &ctxt) -> String {
+impl UserString for ast::Ident {
+ fn user_string(&self) -> String {
token::get_name(self.name).to_string()
}
}
-impl<'tcx> Repr<'tcx> for abi::Abi {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for abi::Abi {
+ fn repr(&self) -> String {
self.to_string()
}
}
-impl<'tcx> UserString<'tcx> for abi::Abi {
- fn user_string(&self, _tcx: &ctxt) -> String {
+impl UserString for abi::Abi {
+ fn user_string(&self) -> String {
self.to_string()
}
}
-impl<'tcx> Repr<'tcx> for ty::UpvarId {
- fn repr(&self, tcx: &ctxt) -> String {
+impl Repr for ty::UpvarId {
+ fn repr(&self) -> String {
format!("UpvarId({};`{}`;{})",
self.var_id,
- ty::local_var_name_str(tcx, self.var_id),
+ ty::tls::with(|tcx| ty::local_var_name_str(tcx, self.var_id)),
self.closure_expr_id)
}
}
-impl<'tcx> Repr<'tcx> for ast::Mutability {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for ast::Mutability {
+ fn repr(&self) -> String {
format!("{:?}", *self)
}
}
-impl<'tcx> Repr<'tcx> for ty::BorrowKind {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for ty::BorrowKind {
+ fn repr(&self) -> String {
format!("{:?}", *self)
}
}
-impl<'tcx> Repr<'tcx> for ty::UpvarBorrow {
- fn repr(&self, tcx: &ctxt) -> String {
+impl Repr for ty::UpvarBorrow {
+ fn repr(&self) -> String {
format!("UpvarBorrow({}, {})",
- self.kind.repr(tcx),
- self.region.repr(tcx))
+ self.kind.repr(),
+ self.region.repr())
}
}
-impl<'tcx> Repr<'tcx> for ty::UpvarCapture {
- fn repr(&self, tcx: &ctxt) -> String {
+impl Repr for ty::UpvarCapture {
+ fn repr(&self) -> String {
match *self {
ty::UpvarCapture::ByValue => format!("ByValue"),
- ty::UpvarCapture::ByRef(ref data) => format!("ByRef({})", data.repr(tcx)),
+ ty::UpvarCapture::ByRef(ref data) => format!("ByRef({})", data.repr()),
}
}
}
-impl<'tcx> Repr<'tcx> for ty::IntVid {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for ty::IntVid {
+ fn repr(&self) -> String {
format!("{:?}", self)
}
}
-impl<'tcx> Repr<'tcx> for ty::FloatVid {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for ty::FloatVid {
+ fn repr(&self) -> String {
format!("{:?}", self)
}
}
-impl<'tcx> Repr<'tcx> for ty::RegionVid {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for ty::RegionVid {
+ fn repr(&self) -> String {
format!("{:?}", self)
}
}
-impl<'tcx> Repr<'tcx> for ty::TyVid {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for ty::TyVid {
+ fn repr(&self) -> String {
format!("{:?}", self)
}
}
-impl<'tcx> Repr<'tcx> for ty::IntVarValue {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for ty::IntVarValue {
+ fn repr(&self) -> String {
format!("{:?}", *self)
}
}
-impl<'tcx> Repr<'tcx> for ast::IntTy {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for ty::InferTy {
+ fn repr(&self) -> String {
+ let print_var_ids = verbose();
+ match *self {
+ ty::TyVar(ref vid) if print_var_ids => vid.repr(),
+ ty::IntVar(ref vid) if print_var_ids => vid.repr(),
+ ty::FloatVar(ref vid) if print_var_ids => vid.repr(),
+ ty::TyVar(_) | ty::IntVar(_) | ty::FloatVar(_) => format!("_"),
+ ty::FreshTy(v) => format!("FreshTy({})", v),
+ ty::FreshIntTy(v) => format!("FreshIntTy({})", v),
+ ty::FreshFloatTy(v) => format!("FreshFloatTy({})", v)
+ }
+ }
+}
+
+impl Repr for ast::IntTy {
+ fn repr(&self) -> String {
format!("{:?}", *self)
}
}
-impl<'tcx> Repr<'tcx> for ast::UintTy {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for ast::UintTy {
+ fn repr(&self) -> String {
format!("{:?}", *self)
}
}
-impl<'tcx> Repr<'tcx> for ast::FloatTy {
- fn repr(&self, _tcx: &ctxt) -> String {
+impl Repr for ast::FloatTy {
+ fn repr(&self) -> String {
format!("{:?}", *self)
}
}
-impl<'tcx> Repr<'tcx> for ty::ExplicitSelfCategory {
- fn repr(&self, _: &ctxt) -> String {
+impl Repr for ty::ExplicitSelfCategory {
+ fn repr(&self) -> String {
match *self {
ty::StaticExplicitSelfCategory => "static",
ty::ByValueExplicitSelfCategory => "self",
}
}
-impl<'tcx> UserString<'tcx> for ParamTy {
- fn user_string(&self, _tcx: &ctxt) -> String {
+impl UserString for ParamTy {
+ fn user_string(&self) -> String {
format!("{}", token::get_name(self.name))
}
}
-impl<'tcx> Repr<'tcx> for ParamTy {
- fn repr(&self, tcx: &ctxt) -> String {
- let ident = self.user_string(tcx);
+impl Repr for ParamTy {
+ fn repr(&self) -> String {
+ let ident = self.user_string();
format!("{}/{:?}.{}", ident, self.space, self.idx)
}
}
-impl<'tcx, A:Repr<'tcx>, B:Repr<'tcx>> Repr<'tcx> for (A,B) {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<A:Repr, B:Repr> Repr for (A,B) {
+ fn repr(&self) -> String {
let &(ref a, ref b) = self;
- format!("({},{})", a.repr(tcx), b.repr(tcx))
+ format!("({},{})", a.repr(), b.repr())
}
}
-impl<'tcx, T:Repr<'tcx>> Repr<'tcx> for ty::Binder<T> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
- format!("Binder({})", self.0.repr(tcx))
+impl<T:Repr> Repr for ty::Binder<T> {
+ fn repr(&self) -> String {
+ format!("Binder({})", self.0.repr())
}
}
-impl<'tcx, S, K, V> Repr<'tcx> for HashMap<K, V, S>
- where K: Hash + Eq + Repr<'tcx>,
- V: Repr<'tcx>,
+impl<S, K, V> Repr for HashMap<K, V, S>
+ where K: Hash + Eq + Repr,
+ V: Repr,
S: HashState,
{
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+ fn repr(&self) -> String {
format!("HashMap({})",
self.iter()
- .map(|(k,v)| format!("{} => {}", k.repr(tcx), v.repr(tcx)))
+ .map(|(k,v)| format!("{} => {}", k.repr(), v.repr()))
.collect::<Vec<String>>()
.connect(", "))
}
}
-impl<'tcx, T, U> Repr<'tcx> for ty::OutlivesPredicate<T,U>
- where T : Repr<'tcx> + TypeFoldable<'tcx>,
- U : Repr<'tcx> + TypeFoldable<'tcx>,
+impl<'tcx, T, U> Repr for ty::OutlivesPredicate<T,U>
+ where T : Repr + TypeFoldable<'tcx>,
+ U : Repr + TypeFoldable<'tcx>,
{
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+ fn repr(&self) -> String {
format!("OutlivesPredicate({}, {})",
- self.0.repr(tcx),
- self.1.repr(tcx))
+ self.0.repr(),
+ self.1.repr())
}
}
-impl<'tcx, T, U> UserString<'tcx> for ty::OutlivesPredicate<T,U>
- where T : UserString<'tcx> + TypeFoldable<'tcx>,
- U : UserString<'tcx> + TypeFoldable<'tcx>,
+impl<'tcx, T, U> UserString for ty::OutlivesPredicate<T,U>
+ where T : UserString + TypeFoldable<'tcx>,
+ U : UserString + TypeFoldable<'tcx>,
{
- fn user_string(&self, tcx: &ctxt<'tcx>) -> String {
+ fn user_string(&self) -> String {
format!("{} : {}",
- self.0.user_string(tcx),
- self.1.user_string(tcx))
+ self.0.user_string(),
+ self.1.user_string())
}
}
-impl<'tcx> Repr<'tcx> for ty::EquatePredicate<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::EquatePredicate<'tcx> {
+ fn repr(&self) -> String {
format!("EquatePredicate({}, {})",
- self.0.repr(tcx),
- self.1.repr(tcx))
+ self.0.repr(),
+ self.1.repr())
}
}
-impl<'tcx> UserString<'tcx> for ty::EquatePredicate<'tcx> {
- fn user_string(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> UserString for ty::EquatePredicate<'tcx> {
+ fn user_string(&self) -> String {
format!("{} == {}",
- self.0.user_string(tcx),
- self.1.user_string(tcx))
+ self.0.user_string(),
+ self.1.user_string())
}
}
-impl<'tcx> Repr<'tcx> for ty::TraitPredicate<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::TraitPredicate<'tcx> {
+ fn repr(&self) -> String {
format!("TraitPredicate({})",
- self.trait_ref.repr(tcx))
+ self.trait_ref.repr())
}
}
-impl<'tcx> UserString<'tcx> for ty::TraitPredicate<'tcx> {
- fn user_string(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> UserString for ty::TraitPredicate<'tcx> {
+ fn user_string(&self) -> String {
format!("{} : {}",
- self.trait_ref.self_ty().user_string(tcx),
- self.trait_ref.user_string(tcx))
+ self.trait_ref.self_ty().user_string(),
+ self.trait_ref.user_string())
}
}
-impl<'tcx> UserString<'tcx> for ty::ProjectionPredicate<'tcx> {
- fn user_string(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> UserString for ty::ProjectionPredicate<'tcx> {
+ fn user_string(&self) -> String {
format!("{} == {}",
- self.projection_ty.user_string(tcx),
- self.ty.user_string(tcx))
+ self.projection_ty.user_string(),
+ self.ty.user_string())
}
}
-impl<'tcx> Repr<'tcx> for ty::ProjectionTy<'tcx> {
- fn repr(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> Repr for ty::ProjectionTy<'tcx> {
+ fn repr(&self) -> String {
format!("{}::{}",
- self.trait_ref.repr(tcx),
- self.item_name.repr(tcx))
+ self.trait_ref.repr(),
+ self.item_name.repr())
}
}
-impl<'tcx> UserString<'tcx> for ty::ProjectionTy<'tcx> {
- fn user_string(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> UserString for ty::ProjectionTy<'tcx> {
+ fn user_string(&self) -> String {
format!("<{} as {}>::{}",
- self.trait_ref.self_ty().user_string(tcx),
- self.trait_ref.user_string(tcx),
- self.item_name.user_string(tcx))
+ self.trait_ref.self_ty().user_string(),
+ self.trait_ref.user_string(),
+ self.item_name.user_string())
}
}
-impl<'tcx> UserString<'tcx> for ty::Predicate<'tcx> {
- fn user_string(&self, tcx: &ctxt<'tcx>) -> String {
+impl<'tcx> UserString for ty::Predicate<'tcx> {
+ fn user_string(&self) -> String {
match *self {
- ty::Predicate::Trait(ref data) => data.user_string(tcx),
- ty::Predicate::Equate(ref predicate) => predicate.user_string(tcx),
- ty::Predicate::RegionOutlives(ref predicate) => predicate.user_string(tcx),
- ty::Predicate::TypeOutlives(ref predicate) => predicate.user_string(tcx),
- ty::Predicate::Projection(ref predicate) => predicate.user_string(tcx),
+ ty::Predicate::Trait(ref data) => data.user_string(),
+ ty::Predicate::Equate(ref predicate) => predicate.user_string(),
+ ty::Predicate::RegionOutlives(ref predicate) => predicate.user_string(),
+ ty::Predicate::TypeOutlives(ref predicate) => predicate.user_string(),
+ ty::Predicate::Projection(ref predicate) => predicate.user_string(),
}
}
}
-impl<'tcx> Repr<'tcx> for ast::Unsafety {
- fn repr(&self, _: &ctxt<'tcx>) -> String {
+impl Repr for ast::Unsafety {
+ fn repr(&self) -> String {
format!("{:?}", *self)
}
}
cmt: mc::cmt<'tcx>,
mode: euv::ConsumeMode) {
debug!("consume(consume_id={}, cmt={}, mode={:?})",
- consume_id, cmt.repr(self.tcx()), mode);
+ consume_id, cmt.repr(), mode);
self.consume_common(consume_id, consume_span, cmt, mode);
}
cmt: mc::cmt<'tcx>,
mode: euv::ConsumeMode) {
debug!("consume_pat(consume_pat={}, cmt={}, mode={:?})",
- consume_pat.repr(self.tcx()),
- cmt.repr(self.tcx()),
+ consume_pat.repr(),
+ cmt.repr(),
mode);
self.consume_common(consume_pat.id, consume_pat.span, cmt, mode);
{
debug!("borrow(borrow_id={}, cmt={}, loan_region={:?}, \
bk={:?}, loan_cause={:?})",
- borrow_id, cmt.repr(self.tcx()), loan_region,
+ borrow_id, cmt.repr(), loan_region,
bk, loan_cause);
match opt_loan_path(&cmt) {
mode: euv::MutateMode)
{
debug!("mutate(assignment_id={}, assignee_cmt={})",
- assignment_id, assignee_cmt.repr(self.tcx()));
+ assignment_id, assignee_cmt.repr());
match opt_loan_path(&assignee_cmt) {
Some(lp) => {
//! simultaneously.
debug!("report_error_if_loans_conflict(old_loan={}, new_loan={})",
- old_loan.repr(self.tcx()),
- new_loan.repr(self.tcx()));
+ old_loan.repr(),
+ new_loan.repr());
// Should only be called for loans that are in scope at the same time.
assert!(self.tcx().region_maps.scopes_intersect(old_loan.kill_scope,
debug!("report_error_if_loan_conflicts_with_restriction(\
loan1={}, loan2={})",
- loan1.repr(self.tcx()),
- loan2.repr(self.tcx()));
+ loan1.repr(),
+ loan2.repr());
if compatible_borrow_kinds(loan1.kind, loan2.kind) {
return true;
-> UseError<'tcx> {
debug!("analyze_restrictions_on_use(expr_id={}, use_path={})",
self.tcx().map.node_to_string(expr_id),
- use_path.repr(self.tcx()));
+ use_path.repr());
let mut ret = UseOk;
use_kind: MovedValueUseKind,
lp: &Rc<LoanPath<'tcx>>) {
debug!("check_if_path_is_moved(id={}, use_kind={:?}, lp={})",
- id, use_kind, lp.repr(self.bccx.tcx));
+ id, use_kind, lp.repr());
// FIXME (22079): if you find yourself tempted to cut and paste
// the body below and then specializing the error reporting,
assignment_span: Span,
assignee_cmt: mc::cmt<'tcx>,
mode: euv::MutateMode) {
- debug!("check_assignment(assignee_cmt={})", assignee_cmt.repr(self.tcx()));
+ debug!("check_assignment(assignee_cmt={})", assignee_cmt.repr());
// Mutable values can be assigned, as long as they obey loans
// and aliasing restrictions:
//! `used_mut_nodes` table here.
loop {
- debug!("mark_variable_as_used_mut(cmt={})", cmt.repr(this.tcx()));
+ debug!("mark_variable_as_used_mut(cmt={})", cmt.repr());
match cmt.cat.clone() {
mc::cat_upvar(mc::Upvar { id: ty::UpvarId { var_id: id, .. }, .. }) |
mc::cat_local(id) => {
let guarantor = cmt.guarantor();
debug!("check_for_aliasable_mutable_writes(cmt={}, guarantor={})",
- cmt.repr(this.tcx()), guarantor.repr(this.tcx()));
+ cmt.repr(), guarantor.repr());
if let mc::cat_deref(ref b, _, mc::BorrowedPtr(ty::MutBorrow, _)) = guarantor.cat {
// Statically prohibit writes to `&mut` when aliasable
check_for_aliasability_violation(this, span, b.clone());
impl Fragment {
fn loan_path_repr<'tcx>(&self, move_data: &MoveData<'tcx>, tcx: &ty::ctxt<'tcx>) -> String {
- let repr = |mpi| move_data.path_loan_path(mpi).repr(tcx);
+ let repr = |mpi| move_data.path_loan_path(mpi).repr();
match *self {
Just(mpi) => repr(mpi),
AllButOneFrom(mpi) => format!("$(allbutone {})", repr(mpi)),
fn loan_path_user_string<'tcx>(&self,
move_data: &MoveData<'tcx>,
tcx: &ty::ctxt<'tcx>) -> String {
- let user_string = |mpi| move_data.path_loan_path(mpi).user_string(tcx);
+ let user_string = |mpi| move_data.path_loan_path(mpi).user_string();
match *self {
Just(mpi) => user_string(mpi),
AllButOneFrom(mpi) => format!("$(allbutone {})", user_string(mpi)),
let instrument_all_paths = |kind, vec_rc: &Vec<MovePathIndex>| {
for (i, mpi) in vec_rc.iter().enumerate() {
- let render = || this.path_loan_path(*mpi).user_string(tcx);
+ let render = || this.path_loan_path(*mpi).user_string();
if span_err {
tcx.sess.span_err(sp, &format!("{}: `{}`", kind, render()));
}
let mut assigned = mem::replace(&mut fragments.assigned_leaf_paths, vec![]);
let path_lps = |mpis: &[MovePathIndex]| -> Vec<String> {
- mpis.iter().map(|mpi| this.path_loan_path(*mpi).repr(tcx)).collect()
+ mpis.iter().map(|mpi| this.path_loan_path(*mpi).repr()).collect()
};
let frag_lps = |fs: &[Fragment]| -> Vec<String> {
mc::PositionalField(tuple_idx) => tuple_idx,
mc::NamedField(_) =>
panic!("tuple type {} should not have named fields.",
- parent_ty.repr(tcx)),
+ parent_ty.repr()),
};
let tuple_len = v.len();
for i in 0..tuple_len {
ref sty_and_variant_info => {
let msg = format!("type {} ({:?}) is not fragmentable",
- parent_ty.repr(tcx), sty_and_variant_info);
+ parent_ty.repr(), sty_and_variant_info);
let opt_span = origin_id.and_then(|id|tcx.map.opt_span(id));
tcx.sess.opt_span_bug(opt_span, &msg[..])
}
let new_lp_variant = LpExtend(parent, mc, loan_path_elem);
let new_lp = LoanPath::new(new_lp_variant, new_lp_type.unwrap());
debug!("add_fragment_sibling_core(new_lp={}, origin_lp={})",
- new_lp.repr(tcx), origin_lp.repr(tcx));
+ new_lp.repr(), origin_lp.repr());
let mp = this.move_path(tcx, Rc::new(new_lp));
// Do not worry about checking for duplicates here; we will sort
mode: euv::MatchMode) {
let tcx = bccx.tcx;
debug!("gather_match_variant(move_pat={}, cmt={}, mode={:?})",
- move_pat.id, cmt.repr(tcx), mode);
+ move_pat.id, cmt.repr(), mode);
let opt_lp = opt_loan_path(&cmt);
match opt_lp {
move_error_collector: &MoveErrorCollector<'tcx>,
move_info: GatherMoveInfo<'tcx>) {
debug!("gather_move(move_id={}, cmt={})",
- move_info.id, move_info.cmt.repr(bccx.tcx));
+ move_info.id, move_info.cmt.repr());
let potentially_illegal_move =
check_and_get_illegal_move_origin(bccx, &move_info.cmt);
match potentially_illegal_move {
Some(illegal_move_origin) => {
- debug!("illegal_move_origin={}", illegal_move_origin.repr(bccx.tcx));
+ debug!("illegal_move_origin={}", illegal_move_origin.repr());
let error = MoveError::with_move_info(illegal_move_origin,
move_info.span_path_opt);
move_error_collector.add_error(error);
//! where S is `item_scope` if `cmt` is an upvar,
//! and is scope of `cmt` otherwise.
debug!("guarantee_lifetime(cmt={}, loan_region={})",
- cmt.repr(bccx.tcx), loan_region.repr(bccx.tcx));
+ cmt.repr(), loan_region.repr());
let ctxt = GuaranteeLifetimeContext {bccx: bccx,
item_scope: item_scope,
span: span,
//! "guarantor". Reports an error if `self.loan_region` is
//! larger than scope of `cmt`.
debug!("guarantee_lifetime.check(cmt={}, loan_region={})",
- cmt.repr(self.bccx.tcx),
- self.loan_region.repr(self.bccx.tcx));
+ cmt.repr(),
+ self.loan_region.repr());
match cmt.cat {
mc::cat_rvalue(..) |
cmt: mc::cmt<'tcx>,
mode: euv::ConsumeMode) {
debug!("consume(consume_id={}, cmt={}, mode={:?})",
- consume_id, cmt.repr(self.tcx()), mode);
+ consume_id, cmt.repr(), mode);
match mode {
euv::Move(move_reason) => {
cmt: mc::cmt<'tcx>,
mode: euv::MatchMode) {
debug!("matched_pat(matched_pat={}, cmt={}, mode={:?})",
- matched_pat.repr(self.tcx()),
- cmt.repr(self.tcx()),
+ matched_pat.repr(),
+ cmt.repr(),
mode);
if let mc::cat_downcast(..) = cmt.cat {
cmt: mc::cmt<'tcx>,
mode: euv::ConsumeMode) {
debug!("consume_pat(consume_pat={}, cmt={}, mode={:?})",
- consume_pat.repr(self.tcx()),
- cmt.repr(self.tcx()),
+ consume_pat.repr(),
+ cmt.repr(),
mode);
match mode {
{
debug!("borrow(borrow_id={}, cmt={}, loan_region={:?}, \
bk={:?}, loan_cause={:?})",
- borrow_id, cmt.repr(self.tcx()), loan_region,
+ borrow_id, cmt.repr(), loan_region,
bk, loan_cause);
self.guarantee_valid(borrow_id,
{
let opt_lp = opt_loan_path(&assignee_cmt);
debug!("mutate(assignment_id={}, assignee_cmt={}) opt_lp={:?}",
- assignment_id, assignee_cmt.repr(self.tcx()), opt_lp);
+ assignment_id, assignee_cmt.repr(), opt_lp);
match opt_lp {
Some(lp) => {
debug!("guarantee_valid(borrow_id={}, cmt={}, \
req_mutbl={:?}, loan_region={:?})",
borrow_id,
- cmt.repr(self.tcx()),
+ cmt.repr(),
req_kind,
loan_region);
};
debug!("guarantee_valid(borrow_id={}), loan={}",
- borrow_id, loan.repr(self.tcx()));
+ borrow_id, loan.repr());
// let loan_path = loan.loan_path;
// let loan_gen_scope = loan.gen_scope;
-> Result<(),()> {
//! Implements the M-* rules in README.md.
debug!("check_mutability(cause={:?} cmt={} req_kind={:?}",
- cause, cmt.repr(bccx.tcx), req_kind);
+ cause, cmt.repr(), req_kind);
match req_kind {
ty::UniqueImmBorrow | ty::ImmBorrow => {
match cmt.mutbl {
pub fn gather_loans_in_static_initializer(bccx: &mut BorrowckCtxt, expr: &ast::Expr) {
- debug!("gather_loans_in_static_initializer(expr={})", expr.repr(bccx.tcx));
+ debug!("gather_loans_in_static_initializer(expr={})", expr.repr());
let mut sicx = StaticInitializerCtxt {
bccx: bccx
bccx.span_err(move_from.span,
&format!("cannot move out of type `{}`, \
a non-copy fixed-size array",
- b.ty.user_string(bccx.tcx)));
+ b.ty.user_string()));
}
}
move_from.span,
&format!("cannot move out of type `{}`, \
which defines the `Drop` trait",
- b.ty.user_string(bccx.tcx)));
+ b.ty.user_string()));
},
_ => {
bccx.span_bug(move_from.span, "this path should not cause illegal move")
impl<'a, 'tcx> RestrictionsContext<'a, 'tcx> {
fn restrict(&self,
cmt: mc::cmt<'tcx>) -> RestrictionResult<'tcx> {
- debug!("restrict(cmt={})", cmt.repr(self.bccx.tcx));
+ debug!("restrict(cmt={})", cmt.repr());
let new_lp = |v: LoanPathKind<'tcx>| Rc::new(LoanPath::new(v, cmt.ty));
which is {}",
ol,
moved_lp_msg,
- expr_ty.user_string(self.tcx),
+ expr_ty.user_string(),
suggestion));
} else {
self.tcx.sess.span_note(
&format!("`{}` moved here{} because it has type `{}`, which is {}",
ol,
moved_lp_msg,
- expr_ty.user_string(self.tcx),
+ expr_ty.user_string(),
suggestion));
}
}
which is moved by default",
ol,
moved_lp_msg,
- pat_ty.user_string(self.tcx)));
+ pat_ty.user_string()));
self.tcx.sess.fileline_help(span,
"use `ref` to override");
}
has type `{}`, which is {}",
ol,
moved_lp_msg,
- expr_ty.user_string(self.tcx),
+ expr_ty.user_string(),
suggestion));
self.tcx.sess.fileline_help(expr_span, help);
}
}
}
-impl<'tcx> Repr<'tcx> for InteriorKind {
- fn repr(&self, _tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for InteriorKind {
+ fn repr(&self) -> String {
match *self {
InteriorField(mc::NamedField(fld)) =>
format!("{}", token::get_name(fld)),
}
}
-impl<'tcx> Repr<'tcx> for Loan<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for Loan<'tcx> {
+ fn repr(&self) -> String {
format!("Loan_{}({}, {:?}, {:?}-{:?}, {})",
self.index,
- self.loan_path.repr(tcx),
+ self.loan_path.repr(),
self.kind,
self.gen_scope,
self.kill_scope,
- self.restricted_paths.repr(tcx))
+ self.restricted_paths.repr())
}
}
-impl<'tcx> Repr<'tcx> for LoanPath<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for LoanPath<'tcx> {
+ fn repr(&self) -> String {
match self.kind {
LpVar(id) => {
- format!("$({})", tcx.map.node_to_string(id))
+ format!("$({})", ty::tls::with(|tcx| tcx.map.node_to_string(id)))
}
LpUpvar(ty::UpvarId{ var_id, closure_expr_id }) => {
- let s = tcx.map.node_to_string(var_id);
+ let s = ty::tls::with(|tcx| tcx.map.node_to_string(var_id));
format!("$({} captured by id={})", s, closure_expr_id)
}
LpDowncast(ref lp, variant_def_id) => {
let variant_str = if variant_def_id.krate == ast::LOCAL_CRATE {
- ty::item_path_str(tcx, variant_def_id)
+ ty::tls::with(|tcx| ty::item_path_str(tcx, variant_def_id))
} else {
- variant_def_id.repr(tcx)
+ variant_def_id.repr()
};
- format!("({}{}{})", lp.repr(tcx), DOWNCAST_PRINTED_OPERATOR, variant_str)
+ format!("({}{}{})", lp.repr(), DOWNCAST_PRINTED_OPERATOR, variant_str)
}
LpExtend(ref lp, _, LpDeref(_)) => {
- format!("{}.*", lp.repr(tcx))
+ format!("{}.*", lp.repr())
}
LpExtend(ref lp, _, LpInterior(ref interior)) => {
- format!("{}.{}", lp.repr(tcx), interior.repr(tcx))
+ format!("{}.{}", lp.repr(), interior.repr())
}
}
}
}
-impl<'tcx> UserString<'tcx> for LoanPath<'tcx> {
- fn user_string(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> UserString for LoanPath<'tcx> {
+ fn user_string(&self) -> String {
match self.kind {
LpVar(id) => {
- format!("$({})", tcx.map.node_to_user_string(id))
+ format!("$({})", ty::tls::with(|tcx| tcx.map.node_to_user_string(id)))
}
LpUpvar(ty::UpvarId{ var_id, closure_expr_id: _ }) => {
- let s = tcx.map.node_to_user_string(var_id);
+ let s = ty::tls::with(|tcx| tcx.map.node_to_user_string(var_id));
format!("$({} captured by closure)", s)
}
LpDowncast(ref lp, variant_def_id) => {
let variant_str = if variant_def_id.krate == ast::LOCAL_CRATE {
- ty::item_path_str(tcx, variant_def_id)
+ ty::tls::with(|tcx| ty::item_path_str(tcx, variant_def_id))
} else {
- variant_def_id.repr(tcx)
+ variant_def_id.repr()
};
- format!("({}{}{})", lp.user_string(tcx), DOWNCAST_PRINTED_OPERATOR, variant_str)
+ format!("({}{}{})", lp.user_string(), DOWNCAST_PRINTED_OPERATOR, variant_str)
}
LpExtend(ref lp, _, LpDeref(_)) => {
- format!("{}.*", lp.user_string(tcx))
+ format!("{}.*", lp.user_string())
}
LpExtend(ref lp, _, LpInterior(ref interior)) => {
- format!("{}.{}", lp.user_string(tcx), interior.repr(tcx))
+ format!("{}.{}", lp.user_string(), interior.repr())
}
}
}
};
debug!("move_path(lp={}, index={:?})",
- lp.repr(tcx),
+ lp.repr(),
index);
assert_eq!(index.get(), self.paths.borrow().len() - 1);
id: ast::NodeId,
kind: MoveKind) {
debug!("add_move(lp={}, id={}, kind={:?})",
- lp.repr(tcx),
+ lp.repr(),
id,
kind);
assignee_id: ast::NodeId,
mode: euv::MutateMode) {
debug!("add_assignment(lp={}, assign_id={}, assignee_id={}",
- lp.repr(tcx), assign_id, assignee_id);
+ lp.repr(), assign_id, assignee_id);
let path_index = self.move_path(tcx, lp.clone());
if self.is_var_path(path_index) {
debug!("add_assignment[var](lp={}, assignment={}, path_index={:?})",
- lp.repr(tcx), self.var_assignments.borrow().len(), path_index);
+ lp.repr(), self.var_assignments.borrow().len(), path_index);
self.var_assignments.borrow_mut().push(assignment);
} else {
debug!("add_assignment[path](lp={}, path_index={:?})",
- lp.repr(tcx), path_index);
+ lp.repr(), path_index);
self.path_assignments.borrow_mut().push(assignment);
}
base_lp: Rc<LoanPath<'tcx>>,
mode: euv::MatchMode) {
debug!("add_variant_match(lp={}, pattern_id={})",
- lp.repr(tcx), pattern_id);
+ lp.repr(), pattern_id);
let path_index = self.move_path(tcx, lp.clone());
let base_path_index = self.move_path(tcx, base_lp.clone());
try!(pp::word(&mut s.s, "as"));
try!(pp::space(&mut s.s));
try!(pp::word(&mut s.s,
- &ty::expr_ty(self.tcx, expr).user_string(self.tcx)));
+ &ty::expr_ty(self.tcx, expr).user_string()));
s.pclose()
}
_ => Ok(())
-> Option<ast::NodeId> {
assert!(idx < names.len());
for item in &m.items {
- if item.ident.user_string(this.infcx.tcx) == names[idx] {
+ if item.ident.user_string() == names[idx] {
return search(this, &**item, idx+1, names);
}
}
}
pub fn ty_to_string(&self, a: Ty<'tcx>) -> String {
- a.user_string(self.infcx.tcx)
+ a.user_string()
}
pub fn t_fn(&self,
Ok(_) => { }
Err(ref e) => {
panic!("unexpected error computing sub({},{}): {}",
- t1.repr(self.infcx.tcx),
- t2.repr(self.infcx.tcx),
+ t1.repr(),
+ t2.repr(),
ty::type_err_to_str(self.infcx.tcx, e));
}
}
Err(_) => { }
Ok(_) => {
panic!("unexpected success computing sub({},{})",
- t1.repr(self.infcx.tcx),
- t2.repr(self.infcx.tcx));
+ t1.repr(),
+ t2.repr());
}
}
}
let t_resolve1 = env.infcx.shallow_resolve(t_infer1);
match t_resolve1.sty {
ty::TyRef(..) => { }
- _ => { panic!("t_resolve1={}", t_resolve1.repr(env.infcx.tcx)); }
+ _ => { panic!("t_resolve1={}", t_resolve1.repr()); }
}
})
}
};
debug!("subst_bound: t_source={} substs={} t_substituted={} t_expected={}",
- t_source.repr(env.infcx.tcx),
- substs.repr(env.infcx.tcx),
- t_substituted.repr(env.infcx.tcx),
- t_expected.repr(env.infcx.tcx));
+ t_source.repr(),
+ substs.repr(),
+ t_substituted.repr(),
+ t_expected.repr());
assert_eq!(t_substituted, t_expected);
})
};
debug!("subst_bound: t_source={} substs={} t_substituted={} t_expected={}",
- t_source.repr(env.infcx.tcx),
- substs.repr(env.infcx.tcx),
- t_substituted.repr(env.infcx.tcx),
- t_expected.repr(env.infcx.tcx));
+ t_source.repr(),
+ substs.repr(),
+ t_substituted.repr(),
+ t_expected.repr());
assert_eq!(t_substituted, t_expected);
})
};
debug!("subst_bound: t_source={} substs={} t_substituted={} t_expected={}",
- t_source.repr(env.infcx.tcx),
- substs.repr(env.infcx.tcx),
- t_substituted.repr(env.infcx.tcx),
- t_expected.repr(env.infcx.tcx));
+ t_source.repr(),
+ substs.repr(),
+ t_substituted.repr(),
+ t_expected.repr());
assert_eq!(t_substituted, t_expected);
})
});
if n_uniq > 0 {
- let s = ty.user_string(cx.tcx);
+ let s = ty.user_string();
let m = format!("type uses owned (Box type) pointers: {}", s);
cx.span_lint(BOX_POINTERS, span, &m[..]);
}
pub fn mangle_internal_name_by_type_and_seq<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>,
t: Ty<'tcx>,
name: &str) -> String {
- let path = [PathName(token::intern(&t.user_string(ccx.tcx()))),
+ let path = [PathName(token::intern(&t.user_string())),
gensym_name(name)];
let hash = get_symbol_hash(ccx, t);
mangle(path.iter().cloned(), Some(&hash[..]))
collector.visit_pat(&arg.pat);
let span_utils = self.span.clone();
for &(id, ref p, _, _) in &collector.collected_paths {
- let typ = self.tcx.node_types().get(&id).unwrap().user_string(self.tcx);
+ let typ = self.tcx.node_types().get(&id).unwrap().user_string();
// get the span only for the name of the variable (I hope the path is only ever a
// variable name, but who knows?)
self.fmt.formal_str(p.span,
"<mutable>".to_string()
};
let types = self.tcx.node_types();
- let typ = types.get(&id).unwrap().user_string(self.tcx);
+ let typ = types.get(&id).unwrap().user_string();
// Get the span only for the name of the variable (I hope the path
// is only ever a variable name, but who knows?).
let sub_span = self.span.span_for_last_ident(p.span);
self.tcx.map.path_to_string(parent),
name);
let typ = self.tcx.node_types().get(&field.node.id).unwrap()
- .user_string(self.tcx);
+ .user_string();
let sub_span = self.span_utils.sub_span_before_token(field.span, token::Colon);
Some(Data::VariableData(VariableData {
id: field.node.id,
use session::config::{NoDebugInfo, FullDebugInfo};
use util::common::indenter;
use util::nodemap::FnvHashMap;
-use util::ppaux::Repr;
+use util::ppaux::{self, Repr};
use std;
use std::cmp::Ordering;
pat_renaming_map: Option<&'a FnvHashMap<(NodeId, Span), NodeId>>
}
-impl<'a, 'p, 'blk, 'tcx> Repr<'tcx> for Match<'a, 'p, 'blk, 'tcx> {
- fn repr(&self, tcx: &ty::ctxt) -> String {
- if tcx.sess.verbose() {
+impl<'a, 'p, 'blk, 'tcx> Repr for Match<'a, 'p, 'blk, 'tcx> {
+ fn repr(&self) -> String {
+ if ppaux::verbose() {
// for many programs, this just take too long to serialize
- self.pats.repr(tcx)
+ self.pats.repr()
} else {
format!("{} pats", self.pats.len())
}
-> Vec<Match<'a, 'p, 'blk, 'tcx>> {
debug!("expand_nested_bindings(bcx={}, m={}, col={}, val={})",
bcx.to_str(),
- m.repr(bcx.tcx()),
+ m.repr(),
col,
bcx.val_to_string(val));
let _indenter = indenter();
{
debug!("enter_match(bcx={}, m={}, col={}, val={})",
bcx.to_str(),
- m.repr(bcx.tcx()),
+ m.repr(),
col,
bcx.val_to_string(val));
let _indenter = indenter();
-> Vec<Match<'a, 'p, 'blk, 'tcx>> {
debug!("enter_default(bcx={}, m={}, col={}, val={})",
bcx.to_str(),
- m.repr(bcx.tcx()),
+ m.repr(),
col,
bcx.val_to_string(val));
let _indenter = indenter();
-> Vec<Match<'a, 'p, 'blk, 'tcx>> {
debug!("enter_opt(bcx={}, m={}, opt={:?}, col={}, val={})",
bcx.to_str(),
- m.repr(bcx.tcx()),
+ m.repr(),
*opt,
col,
bcx.val_to_string(val));
debug!("compile_guard(bcx={}, guard_expr={}, m={}, vals=[{}])",
bcx.to_str(),
bcx.expr_to_string(guard_expr),
- m.repr(bcx.tcx()),
+ m.repr(),
vals.iter().map(|v| bcx.val_to_string(*v)).collect::<Vec<_>>().connect(", "));
let _indenter = indenter();
has_genuine_default: bool) {
debug!("compile_submatch(bcx={}, m={}, vals=[{}])",
bcx.to_str(),
- m.repr(bcx.tcx()),
+ m.repr(),
vals.iter().map(|v| bcx.val_to_string(*v)).collect::<Vec<_>>().connect(", "));
let _indenter = indenter();
let _icx = push_ctxt("match::compile_submatch");
-> Block<'blk, 'tcx> {
debug!("bind_irrefutable_pat(bcx={}, pat={})",
bcx.to_str(),
- pat.repr(bcx.tcx()));
+ pat.repr());
if bcx.sess().asm_comments() {
add_comment(bcx, &format!("bind_irrefutable_pat(pat={})",
- pat.repr(bcx.tcx())));
+ pat.repr()));
}
let _indenter = indenter();
pub fn represent_type<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>,
t: Ty<'tcx>)
-> Rc<Repr<'tcx>> {
- debug!("Representing: {}", t.repr(cx.tcx()));
+ debug!("Representing: {}", t.repr());
match cx.adt_reprs().borrow().get(&t) {
Some(repr) => return repr.clone(),
None => {}
General(ity, fields, dtor_to_init_u8(dtor))
}
_ => cx.sess().bug(&format!("adt::represent_type called on non-ADT type: {}",
- t.repr(cx.tcx())))
+ t.repr()))
}
}
}
_ => {
cx.sess().unimpl(&format!("type in iter_structural_ty: {}",
- t.repr(cx.tcx())))
+ t.repr()))
}
}
return cx;
}
_ => {
cx.sess().bug(&format!("fail-if-zero on unexpected type: {}",
- rhs_t.repr(cx.tcx())));
+ rhs_t.repr()));
}
};
let bcx = with_cond(cx, is_zero, |bcx| {
} else {
ccx.tcx().map.path_to_string(id).to_string()
},
- id, param_substs.repr(ccx.tcx()));
+ id, param_substs.repr());
let uses_outptr = match output_type {
ty::FnConverging(output_type) => {
attributes::emit_uwtable(llfndecl, true);
debug!("trans_closure(..., param_substs={})",
- param_substs.repr(ccx.tcx()));
+ param_substs.repr());
let has_env = match closure_env {
closure::ClosureEnv::Closure(_) => true,
};
for monomorphized_arg_type in &monomorphized_arg_types {
debug!("trans_closure: monomorphized_arg_type: {}",
- monomorphized_arg_type.repr(ccx.tcx()));
+ monomorphized_arg_type.repr());
}
debug!("trans_closure: function lltype: {}",
bcx.fcx.ccx.tn().val_to_string(bcx.fcx.llfn));
id: ast::NodeId,
attrs: &[ast::Attribute]) {
let _s = StatRecorder::new(ccx, ccx.tcx().map.path_to_string(id).to_string());
- debug!("trans_fn(param_substs={})", param_substs.repr(ccx.tcx()));
+ debug!("trans_fn(param_substs={})", param_substs.repr());
let _icx = push_ctxt("trans_fn");
let fn_ty = ty::node_id_to_type(ccx.tcx(), id);
let output_type = ty::erase_late_bound_regions(ccx.tcx(), &ty::ty_fn_ret(fn_ty));
_ => ccx.sess().bug(
&format!("trans_enum_variant_constructor: \
unexpected ctor return type {}",
- ctor_ty.repr(tcx)))
+ ctor_ty.repr()))
};
// Get location to store the result. If the user does not care about
_ => ccx.sess().bug(
&format!("trans_enum_variant_or_tuple_like_struct: \
unexpected ctor return type {}",
- ctor_ty.repr(ccx.tcx())))
+ ctor_ty.repr()))
};
let (arena, fcx): (TypedArena<_>, FunctionContext);
fn trans<'blk, 'tcx>(bcx: Block<'blk, 'tcx>, expr: &ast::Expr)
-> Callee<'blk, 'tcx> {
let _icx = push_ctxt("trans_callee");
- debug!("callee::trans(expr={})", expr.repr(bcx.tcx()));
+ debug!("callee::trans(expr={})", expr.repr());
// pick out special kinds of expressions that can be called:
match expr.node {
def: def::Def,
ref_expr: &ast::Expr)
-> Callee<'blk, 'tcx> {
- debug!("trans_def(def={}, ref_expr={})", def.repr(bcx.tcx()), ref_expr.repr(bcx.tcx()));
+ debug!("trans_def(def={}, ref_expr={})", def.repr(), ref_expr.repr());
let expr_ty = common::node_id_type(bcx, ref_expr.id);
match def {
def::DefFn(did, _) if {
let substs = common::node_id_substs(ccx, node, param_substs);
debug!("trans_fn_ref(def_id={}, node={:?}, substs={})",
- def_id.repr(ccx.tcx()),
+ def_id.repr(),
node,
- substs.repr(ccx.tcx()));
+ substs.repr());
trans_fn_ref_with_substs(ccx, def_id, node, param_substs, substs)
}
}
debug!("trans_fn_pointer_shim(bare_fn_ty={})",
- bare_fn_ty.repr(tcx));
+ bare_fn_ty.repr());
// Construct the "tuply" version of `bare_fn_ty`. It takes two arguments: `self`,
// which is the fn pointer, and `args`, which is the arguments tuple.
_ => {
tcx.sess.bug(&format!("trans_fn_pointer_shim invoked on invalid type: {}",
- bare_fn_ty.repr(tcx)));
+ bare_fn_ty.repr()));
}
};
let sig = ty::erase_late_bound_regions(tcx, sig);
output: sig.output,
variadic: false
})}));
- debug!("tuple_fn_ty: {}", tuple_fn_ty.repr(tcx));
+ debug!("tuple_fn_ty: {}", tuple_fn_ty.repr());
//
let function_name = link::mangle_internal_name_by_type_and_seq(ccx, bare_fn_ty,
debug!("trans_fn_ref_with_substs(def_id={}, node={:?}, \
param_substs={}, substs={})",
- def_id.repr(tcx),
+ def_id.repr(),
node,
- param_substs.repr(tcx),
- substs.repr(tcx));
+ param_substs.repr(),
+ substs.repr());
assert!(substs.types.all(|t| !ty::type_needs_infer(*t)));
assert!(substs.types.all(|t| !ty::type_has_escaping_regions(*t)));
debug!("trans_fn_with_vtables - default method: \
substs = {}, trait_subst = {}, \
first_subst = {}, new_subst = {}",
- substs.repr(tcx), trait_ref.substs.repr(tcx),
- first_subst.repr(tcx), new_substs.repr(tcx));
+ substs.repr(), trait_ref.substs.repr(),
+ first_subst.repr(), new_substs.repr());
(true, source_id, new_substs)
}
};
debug!("trans_fn_ref_with_substs({}) must_monomorphise: {}",
- def_id.repr(tcx), must_monomorphise);
+ def_id.repr(), must_monomorphise);
// Create a monomorphic version of generic functions
if must_monomorphise {
dest: expr::Dest)
-> Block<'blk, 'tcx> {
let _icx = push_ctxt("trans_method_call");
- debug!("trans_method_call(call_expr={})", call_expr.repr(bcx.tcx()));
+ debug!("trans_method_call(call_expr={})", call_expr.repr());
let method_call = MethodCall::expr(call_expr.id);
let method_ty = match bcx.tcx().method_map.borrow().get(&method_call) {
Some(method) => match method.origin {
let ccx = bcx.ccx();
debug!("trans_arg_datum({})",
- formal_arg_ty.repr(bcx.tcx()));
+ formal_arg_ty.repr());
let arg_datum_ty = arg_datum.ty;
let llformal_arg_ty = type_of::type_of_explicit_arg(ccx, formal_arg_ty);
debug!("casting actual type ({}) to match formal ({})",
bcx.val_to_string(val), bcx.llty_str(llformal_arg_ty));
- debug!("Rust types: {}; {}", arg_datum_ty.repr(bcx.tcx()),
- formal_arg_ty.repr(bcx.tcx()));
+ debug!("Rust types: {}; {}", arg_datum_ty.repr(),
+ formal_arg_ty.repr());
val = PointerCast(bcx, val, llformal_arg_ty);
}
debug!("schedule_drop_mem({:?}, val={}, ty={}) fill_on_drop={} skip_dtor={}",
cleanup_scope,
self.ccx.tn().val_to_string(val),
- ty.repr(self.ccx.tcx()),
+ ty.repr(),
drop.fill_on_drop,
drop.skip_dtor);
debug!("schedule_drop_and_fill_mem({:?}, val={}, ty={}, fill_on_drop={}, skip_dtor={})",
cleanup_scope,
self.ccx.tn().val_to_string(val),
- ty.repr(self.ccx.tcx()),
+ ty.repr(),
drop.fill_on_drop,
drop.skip_dtor);
debug!("schedule_drop_adt_contents({:?}, val={}, ty={}) fill_on_drop={} skip_dtor={}",
cleanup_scope,
self.ccx.tn().val_to_string(val),
- ty.repr(self.ccx.tcx()),
+ ty.repr(),
drop.fill_on_drop,
drop.skip_dtor);
debug!("schedule_drop_immediate({:?}, val={}, ty={:?}) fill_on_drop={} skip_dtor={}",
cleanup_scope,
self.ccx.tn().val_to_string(val),
- ty.repr(self.ccx.tcx()),
+ ty.repr(),
drop.fill_on_drop,
drop.skip_dtor);
-> ValueRef
{
debug!("trans_fn_once_adapter_shim(closure_def_id={}, substs={}, llreffn={})",
- closure_def_id.repr(ccx.tcx()),
- substs.repr(ccx.tcx()),
+ closure_def_id.repr(),
+ substs.repr(),
ccx.tn().val_to_string(llreffn));
let tcx = ccx.tcx();
sig: sig.clone() });
let llref_fn_ty = ty::mk_bare_fn(tcx, None, llref_bare_fn_ty);
debug!("trans_fn_once_adapter_shim: llref_fn_ty={}",
- llref_fn_ty.repr(tcx));
+ llref_fn_ty.repr());
// Make a version of the closure type with the same arguments, but
// with argument #0 being by value.
ty::TyTuple(ref tys) => &**tys,
_ => bcx.sess().bug(&format!("trans_fn_once_adapter_shim: not rust-call! \
closure_def_id={}",
- closure_def_id.repr(tcx)))
+ closure_def_id.repr()))
};
let llargs: Vec<_> =
input_tys.iter()
/// subtyping, but they are anonymized and normalized as well). This
/// is a stronger, caching version of `ty_fold::erase_regions`.
pub fn erase_regions<'tcx,T>(cx: &ty::ctxt<'tcx>, value: &T) -> T
- where T : TypeFoldable<'tcx> + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + Repr
{
let value1 = value.fold_with(&mut RegionEraser(cx));
debug!("erase_regions({}) = {}",
- value.repr(cx), value1.repr(cx));
+ value.repr(), value1.repr());
return value1;
struct RegionEraser<'a, 'tcx: 'a>(&'a ty::ctxt<'tcx>);
}
fn fold_binder<T>(&mut self, t: &ty::Binder<T>) -> ty::Binder<T>
- where T : TypeFoldable<'tcx> + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + Repr
{
let u = ty::anonymize_late_bound_regions(self.tcx(), t);
ty_fold::super_fold_binder(self, &u)
// destructor (e.g. zero its memory on move).
let contents = ty::type_contents(cx, ty);
- debug!("type_needs_drop ty={} contents={:?}", ty.repr(cx), contents);
+ debug!("type_needs_drop ty={} contents={:?}", ty.repr(), contents);
contents.needs_drop(cx)
}
}
pub fn monomorphize<T>(&self, value: &T) -> T
- where T : TypeFoldable<'tcx> + Repr<'tcx> + HasProjectionTypes + Clone
+ where T : TypeFoldable<'tcx> + Repr + HasProjectionTypes + Clone
{
monomorphize::apply_param_substs(self.ccx.tcx(),
self.param_substs,
}
pub fn expr_to_string(&self, e: &ast::Expr) -> String {
- e.repr(self.tcx())
+ e.repr()
}
pub fn def(&self, nid: ast::NodeId) -> def::Def {
}
pub fn ty_to_string(&self, t: Ty<'tcx>) -> String {
- t.repr(self.tcx())
+ t.repr()
}
pub fn to_str(&self) -> String {
}
pub fn monomorphize<T>(&self, value: &T) -> T
- where T : TypeFoldable<'tcx> + Repr<'tcx> + HasProjectionTypes + Clone
+ where T : TypeFoldable<'tcx> + Repr + HasProjectionTypes + Clone
{
monomorphize::apply_param_substs(self.tcx(),
self.fcx.param_substs,
// First check the cache.
match ccx.trait_cache().borrow().get(&trait_ref) {
Some(vtable) => {
- info!("Cache hit: {}", trait_ref.repr(ccx.tcx()));
+ info!("Cache hit: {}", trait_ref.repr());
return (*vtable).clone();
}
None => { }
}
debug!("trans fulfill_obligation: trait_ref={} def_id={:?}",
- trait_ref.repr(ccx.tcx()), trait_ref.def_id());
+ trait_ref.repr(), trait_ref.def_id());
ty::populate_implementations_for_trait_if_necessary(tcx, trait_ref.def_id());
let infcx = infer::new_infer_ctxt(tcx);
// where ambiguity can result.
debug!("Encountered ambiguity selecting `{}` during trans, \
presuming due to overflow",
- trait_ref.repr(tcx));
+ trait_ref.repr());
ccx.sess().span_fatal(
span,
"reached the recursion limit during monomorphization");
tcx.sess.span_bug(
span,
&format!("Encountered error `{}` selecting `{}` during trans",
- e.repr(tcx),
- trait_ref.repr(tcx)))
+ e.repr(),
+ trait_ref.repr()))
}
};
});
let vtable = drain_fulfillment_cx_or_panic(span, &infcx, &mut fulfill_cx, &vtable);
- info!("Cache miss: {}", trait_ref.repr(ccx.tcx()));
+ info!("Cache miss: {}", trait_ref.repr());
ccx.trait_cache().borrow_mut().insert(trait_ref,
vtable.clone());
-> bool
{
debug!("normalize_and_test_predicates(predicates={})",
- predicates.repr(ccx.tcx()));
+ predicates.repr());
let tcx = ccx.tcx();
let infcx = infer::new_infer_ctxt(tcx);
fulfill_cx: &mut traits::FulfillmentContext<'tcx>,
result: &T)
-> T
- where T : TypeFoldable<'tcx> + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + Repr
{
match drain_fulfillment_cx(infcx, fulfill_cx, result) {
Ok(v) => v,
infcx.tcx.sess.span_bug(
span,
&format!("Encountered errors `{}` fulfilling during trans",
- errors.repr(infcx.tcx)));
+ errors.repr()));
}
}
}
fulfill_cx: &mut traits::FulfillmentContext<'tcx>,
result: &T)
-> StdResult<T,Vec<traits::FulfillmentError<'tcx>>>
- where T : TypeFoldable<'tcx> + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + Repr
{
debug!("drain_fulfillment_cx(result={})",
- result.repr(infcx.tcx));
+ result.repr());
// In principle, we only need to do this so long as `result`
// contains unbound type parameters. It could be a slight
if substs.types.any(|t| ty::type_needs_infer(*t)) {
tcx.sess.bug(&format!("type parameters for node {:?} include inference types: {:?}",
- node, substs.repr(tcx)));
+ node, substs.repr()));
}
monomorphize::apply_param_substs(tcx,
_ => cx.sess().span_bug(lit.span,
&format!("integer literal has type {} (expected int \
or usize)",
- lit_int_ty.repr(cx.tcx())))
+ lit_int_ty.repr()))
}
}
ast::LitFloat(ref fs, t) => {
}
None => {
cx.sess().bug(&format!("unexpected dereferenceable type {}",
- ty.repr(cx.tcx())))
+ ty.repr()))
}
}
}
llvm::LLVMDumpValue(C_undef(llty));
}
cx.sess().bug(&format!("const {} of type {} has size {} instead of {}",
- e.repr(cx.tcx()), ety_adjusted.repr(cx.tcx()),
+ e.repr(), ety_adjusted.repr(),
csize, tsize));
}
(llconst, ety_adjusted)
-> ValueRef
{
debug!("const_expr_unadjusted(e={}, ety={}, param_substs={})",
- e.repr(cx.tcx()),
- ety.repr(cx.tcx()),
- param_substs.repr(cx.tcx()));
+ e.repr(),
+ ety.repr(),
+ param_substs.repr());
let map_list = |exprs: &[P<ast::Expr>]| -> Vec<ValueRef> {
exprs.iter()
let (te1, ty) = const_expr(cx, &**e1, param_substs, fn_args);
debug!("const_expr_unadjusted: te1={}, ty={}",
cx.tn().val_to_string(te1),
- ty.repr(cx.tcx()));
+ ty.repr());
let is_simd = ty::type_is_simd(cx.tcx(), ty);
let intype = if is_simd {
ty::simd_type(cx.tcx(), ty)
_ => cx.sess().span_bug(base.span,
&format!("index-expr base must be a vector \
or string type, found {}",
- bt.repr(cx.tcx())))
+ bt.repr()))
},
_ => cx.sess().span_bug(base.span,
&format!("index-expr base must be a vector \
or string type, found {}",
- bt.repr(cx.tcx())))
+ bt.repr()))
};
let len = llvm::LLVMConstIntGetZExtValue(len) as u64;
let t_cast = ety;
let llty = type_of::type_of(cx, t_cast);
let (v, t_expr) = const_expr(cx, &**base, param_substs, fn_args);
- debug!("trans_const_cast({} as {})", t_expr.repr(cx.tcx()), t_cast.repr(cx.tcx()));
+ debug!("trans_const_cast({} as {})", t_expr.repr(), t_cast.repr());
if expr::cast_is_noop(cx.tcx(), base, t_expr, t_cast) {
return v;
}
pub fn report_overbig_object(&self, obj: Ty<'tcx>) -> ! {
self.sess().fatal(
&format!("the type `{}` is too big for the current architecture",
- obj.repr(self.tcx())))
+ obj.repr()))
}
pub fn check_overflow(&self) -> bool {
-> Block<'blk, 'tcx> {
let _icx = push_ctxt("trans_stmt");
let fcx = cx.fcx;
- debug!("trans_stmt({})", s.repr(cx.tcx()));
+ debug!("trans_stmt({})", s.repr());
if cx.unreachable.get() {
return cx;
}
if cx.sess().asm_comments() {
- add_span_comment(cx, s.span, &s.repr(cx.tcx()));
+ add_span_comment(cx, s.span, &s.repr());
}
let mut bcx = cx;
pub fn to_string<'a>(&self, ccx: &CrateContext<'a, 'tcx>) -> String {
format!("Datum({}, {}, {:?})",
ccx.tn().val_to_string(self.val),
- self.ty.repr(ccx.tcx()),
+ self.ty.repr(),
self.kind)
}
metadata: DIType) {
if self.type_to_metadata.insert(type_, metadata).is_some() {
cx.sess().bug(&format!("Type metadata for Ty '{}' is already in the TypeMap!",
- type_.repr(cx.tcx())));
+ type_.repr()));
}
}
},
_ => {
cx.sess().bug(&format!("get_unique_type_id_of_type() - unexpected type: {}, {:?}",
- type_.repr(cx.tcx()), type_.sty))
+ type_.repr(), type_.sty))
}
};
type_map.find_metadata_for_type(unfinished_type).is_none() {
cx.sess().bug(&format!("Forward declaration of potentially recursive type \
'{}' was not found in TypeMap!",
- unfinished_type.repr(cx.tcx()))
+ unfinished_type.repr())
);
}
}
_ => {
cx.sess().bug(&format!("debuginfo: Unexpected trait-object type in \
trait_pointer_metadata(): {}",
- trait_type.repr(cx.tcx())));
+ trait_type.repr()));
}
};
the debuginfo::TypeMap but it \
was not. (Ty = {})",
&unique_type_id_str[..],
- t.user_string(cx.tcx()));
+ t.user_string());
cx.sess().span_bug(usage_site_span, &error_message[..]);
}
};
debuginfo::TypeMap. \
UniqueTypeId={}, Ty={}",
&unique_type_id_str[..],
- t.user_string(cx.tcx()));
+ t.user_string());
cx.sess().span_bug(usage_site_span, &error_message[..]);
}
}
ty::TyProjection(..) |
ty::TyParam(_) => {
cx.sess().bug(&format!("debuginfo: Trying to create type name for \
- unexpected type: {}", t.repr(cx.tcx())));
+ unexpected type: {}", t.repr()));
}
}
pub fn declare_rust_fn<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>, name: &str,
fn_type: ty::Ty<'tcx>) -> ValueRef {
debug!("declare_rust_fn(name={:?}, fn_type={})", name,
- fn_type.repr(ccx.tcx()));
+ fn_type.repr());
let fn_type = monomorphize::normalize_associated_type(ccx.tcx(), &fn_type);
debug!("declare_rust_fn (after normalised associated types) fn_type={}",
- fn_type.repr(ccx.tcx()));
+ fn_type.repr());
let function_type; // placeholder so that the memory ownership works out ok
let (sig, abi, env) = match fn_type.sty {
let self_type = base::self_type_for_closure(ccx, closure_did, fn_type);
let llenvironment_type = type_of::type_of_explicit_arg(ccx, self_type);
debug!("declare_rust_fn function_type={} self_type={}",
- function_type.repr(ccx.tcx()), self_type.repr(ccx.tcx()));
+ function_type.repr(), self_type.repr());
(&function_type.sig, abi::RustCall, Some(llenvironment_type))
}
_ => ccx.sess().bug("expected closure or fn")
};
let sig = ty::Binder(ty::erase_late_bound_regions(ccx.tcx(), sig));
- debug!("declare_rust_fn (after region erasure) sig={}", sig.repr(ccx.tcx()));
+ debug!("declare_rust_fn (after region erasure) sig={}", sig.repr());
let llfty = type_of::type_of_rust_fn(ccx, env, &sig, abi);
debug!("declare_rust_fn llfty={}", ccx.tn().type_to_string(llfty));
}
}
- debug!("trans_into() expr={}", expr.repr(bcx.tcx()));
+ debug!("trans_into() expr={}", expr.repr());
let cleanup_debug_loc = debuginfo::get_cleanup_debug_loc_for_ast_node(bcx.ccx(),
expr.id,
Type::vtable_ptr(ccx))
}
_ => ccx.sess().bug(&format!("unsized_info: invalid unsizing {} -> {}",
- source.repr(ccx.tcx()),
- target.repr(ccx.tcx())))
+ source.repr(),
+ target.repr()))
}
}
Some(adj) => { adj }
};
debug!("unadjusted datum for expr {}: {} adjustment={:?}",
- expr.repr(bcx.tcx()),
+ expr.repr(),
datum.to_string(bcx.ccx()),
adjustment);
match adjustment {
}
vtable => {
bcx.sess().span_bug(span, &format!("invalid CoerceUnsized vtable: {}",
- vtable.repr(bcx.tcx())));
+ vtable.repr()));
}
};
}
}
_ => bcx.sess().bug(&format!("coerce_unsized: invalid coercion {} -> {}",
- source.ty.repr(bcx.tcx()),
- target.ty.repr(bcx.tcx())))
+ source.ty.repr(),
+ target.ty.repr()))
}
bcx
}
ccx.tcx().sess.span_bug(ref_expr.span, &format!(
"trans_def_fn_unadjusted invoked on: {:?} for {}",
def,
- ref_expr.repr(ccx.tcx())));
+ ref_expr.repr()));
}
}
}
tcx.sess.bug(&format!(
"cannot get field types from the enum type {} \
without a node ID",
- ty.repr(tcx)));
+ ty.repr()));
}
Some(node_id) => {
let def = tcx.def_map.borrow().get(&node_id).unwrap().full_def();
_ => {
tcx.sess.bug(&format!(
"cannot get field types from the type {}",
- ty.repr(tcx)));
+ ty.repr()));
}
}
}
let t_in = expr_ty_adjusted(bcx, expr);
let t_out = node_id_type(bcx, id);
- debug!("trans_cast({} as {})", t_in.repr(bcx.tcx()), t_out.repr(bcx.tcx()));
+ debug!("trans_cast({} as {})", t_in.repr(), t_out.repr());
let mut ll_t_in = type_of::arg_type_of(ccx, t_in);
let ll_t_out = type_of::arg_type_of(ccx, t_out);
// Convert the value to be cast into a ValueRef, either by-ref or
_ => ccx.sess().span_bug(expr.span,
&format!("translating unsupported cast: \
{} -> {}",
- t_in.repr(bcx.tcx()),
- t_out.repr(bcx.tcx()))
+ t_in.repr(),
+ t_out.repr())
)
};
return immediate_rvalue_bcx(bcx, newval, t_out).to_expr_datumblock();
let ccx = bcx.ccx();
debug!("deref_once(expr={}, datum={}, method_call={:?})",
- expr.repr(bcx.tcx()),
+ expr.repr(),
datum.to_string(ccx),
method_call);
bcx.tcx().sess.span_bug(
expr.span,
&format!("deref invoked on expr of illegal type {}",
- datum.ty.repr(bcx.tcx())));
+ datum.ty.repr()));
}
};
debug!("register_foreign_item_fn(abi={}, \
ty={}, \
name={})",
- abi.repr(ccx.tcx()),
- fty.repr(ccx.tcx()),
+ abi.repr(),
+ fty.repr(),
name);
let cc = llvm_calling_convention(ccx, abi);
debug!("trans_native_call(callee_ty={}, \
llfn={}, \
llretptr={})",
- callee_ty.repr(tcx),
+ callee_ty.repr(),
ccx.tn().val_to_string(llfn),
ccx.tn().val_to_string(llretptr));
ccx.sess().bug(&format!("build_rust_fn: extern fn {} has ty {}, \
expected a bare fn ty",
ccx.tcx().map.path_to_string(id),
- t.repr(tcx)));
+ t.repr()));
}
};
debug!("build_rust_fn: path={} id={} t={}",
ccx.tcx().map.path_to_string(id),
- id, t.repr(tcx));
+ id, t.repr());
let llfn = declare::define_internal_rust_fn(ccx, &ps[..], t).unwrap_or_else(||{
ccx.sess().bug(&format!("symbol `{}` already defined", ps));
debug!("build_wrap_fn(llrustfn={}, llwrapfn={}, t={})",
ccx.tn().val_to_string(llrustfn),
ccx.tn().val_to_string(llwrapfn),
- t.repr(ccx.tcx()));
+ t.repr());
// Avoid all the Rust generation stuff and just generate raw
// LLVM here.
return_ty={}",
ccx.tn().val_to_string(slot),
ccx.tn().type_to_string(llrust_ret_ty),
- tys.fn_sig.output.repr(tcx));
+ tys.fn_sig.output.repr());
llrust_args.push(slot);
return_alloca = Some(slot);
}
// Perform the call itself
debug!("calling llrustfn = {}, t = {}",
- ccx.tn().val_to_string(llrustfn), t.repr(ccx.tcx()));
+ ccx.tn().val_to_string(llrustfn), t.repr());
let attributes = attributes::from_fn_type(ccx, t);
let llrust_ret_val = builder.call(llrustfn, &llrust_args, Some(attributes));
llsig={} -> {}, \
fn_ty={} -> {}, \
ret_def={}",
- ty.repr(ccx.tcx()),
+ ty.repr(),
ccx.tn().types_to_str(&llsig.llarg_tys),
ccx.tn().type_to_string(llsig.llret_ty),
ccx.tn().types_to_str(&fn_ty.arg_tys.iter().map(|t| t.ty).collect::<Vec<_>>()),
debug_loc: DebugLoc,
skip_dtor: bool) -> Block<'blk, 'tcx> {
// NB: v is an *alias* of type t here, not a direct value.
- debug!("drop_ty_core(t={}, skip_dtor={})", t.repr(bcx.tcx()), skip_dtor);
+ debug!("drop_ty_core(t={}, skip_dtor={})", t.repr(), skip_dtor);
let _icx = push_ctxt("drop_ty");
if bcx.fcx.type_needs_drop(t) {
let ccx = bcx.ccx();
fn to_string<'a>(&self, ccx: &CrateContext<'a, 'tcx>) -> String {
match *self {
DropGlueKind::Ty(ty) => {
- format!("DropGlueKind::Ty({})", ty.repr(ccx.tcx()))
+ format!("DropGlueKind::Ty({})", ty.repr())
}
DropGlueKind::TyContents(ty) => {
- format!("DropGlueKind::TyContents({})", ty.repr(ccx.tcx()))
+ format!("DropGlueKind::TyContents({})", ty.repr())
}
}
}
});
ccx.available_drop_glues().borrow_mut().insert(g, fn_nm);
- let _s = StatRecorder::new(ccx, format!("drop {}", t.repr(ccx.tcx())));
+ let _s = StatRecorder::new(ccx, format!("drop {}", t.repr()));
let empty_substs = ccx.tcx().mk_substs(Substs::trans_empty());
let (arena, fcx): (TypedArena<_>, FunctionContext);
continue;
}
- debug!("transmute_restriction: {}", transmute_restriction.repr(ccx.tcx()));
+ debug!("transmute_restriction: {}", transmute_restriction.repr());
assert!(!ty::type_has_params(transmute_restriction.substituted_from));
assert!(!ty::type_has_params(transmute_restriction.substituted_to));
transmute_restriction.span,
&format!("transmute called on types with potentially different sizes: \
{} (could be {} bit{}) to {} (could be {} bit{})",
- transmute_restriction.original_from.user_string(ccx.tcx()),
+ transmute_restriction.original_from.user_string(),
from_type_size as usize,
if from_type_size == 1 {""} else {"s"},
- transmute_restriction.original_to.user_string(ccx.tcx()),
+ transmute_restriction.original_to.user_string(),
to_type_size as usize,
if to_type_size == 1 {""} else {"s"}));
} else {
transmute_restriction.span,
&format!("transmute called on types with different sizes: \
{} ({} bit{}) to {} ({} bit{})",
- transmute_restriction.original_from.user_string(ccx.tcx()),
+ transmute_restriction.original_from.user_string(),
from_type_size as usize,
if from_type_size == 1 {""} else {"s"},
- transmute_restriction.original_to.user_string(ccx.tcx()),
+ transmute_restriction.original_to.user_string(),
to_type_size as usize,
if to_type_size == 1 {""} else {"s"}));
}
}
(_, "type_name") => {
let tp_ty = *substs.types.get(FnSpace, 0);
- let ty_name = token::intern_and_get_ident(&tp_ty.user_string(ccx.tcx()));
+ let ty_name = token::intern_and_get_ident(&tp_ty.user_string());
C_str_slice(ccx, ty_name)
}
(_, "type_id") => {
let _icx = push_ctxt("meth::trans_impl");
let tcx = ccx.tcx();
- debug!("trans_impl(name={}, id={})", name.repr(tcx), id);
+ debug!("trans_impl(name={}, id={})", name.repr(), id);
let mut v = TransItemVisitor { ccx: ccx };
let span = bcx.tcx().map.span(method_call.expr_id);
debug!("method_call={:?} trait_ref={} trait_ref id={:?} substs={:?}",
method_call,
- trait_ref.repr(bcx.tcx()),
+ trait_ref.repr(),
trait_ref.0.def_id,
trait_ref.0.substs);
let origin = fulfill_obligation(bcx.ccx(),
span,
trait_ref.clone());
- debug!("origin = {}", origin.repr(bcx.tcx()));
+ debug!("origin = {}", origin.repr());
trans_monomorphized_callee(bcx,
method_call,
trait_ref.def_id(),
rcvr_self,
Vec::new()));
let trait_substs = tcx.mk_substs(trait_substs);
- debug!("trait_substs={}", trait_substs.repr(tcx));
+ debug!("trait_substs={}", trait_substs.repr());
let trait_ref = ty::Binder(ty::TraitRef { def_id: trait_id,
substs: trait_substs });
let vtbl = fulfill_obligation(ccx,
}
_ => {
tcx.sess.bug(&format!("static call to invalid vtable: {}",
- vtbl.repr(tcx)));
+ vtbl.repr()));
}
}
}
traits::VtableParam(..) => {
bcx.sess().bug(
&format!("resolved vtable bad vtable {} in trans",
- vtable.repr(bcx.tcx())));
+ vtable.repr()));
}
}
}
let node_substs = node_id_substs(ccx, node, bcx.fcx.param_substs);
- debug!("rcvr_substs={}", rcvr_substs.repr(ccx.tcx()));
- debug!("node_substs={}", node_substs.repr(ccx.tcx()));
+ debug!("rcvr_substs={}", rcvr_substs.repr());
+ debug!("node_substs={}", node_substs.repr());
// Break apart the type parameters from the node and type
// parameters from the receiver.
// Load the data pointer from the object.
debug!("trans_trait_callee_from_llval(callee_ty={}, vtable_index={}, llpair={})",
- callee_ty.repr(ccx.tcx()),
+ callee_ty.repr(),
vtable_index,
bcx.val_to_string(llpair));
let llboxptr = GEPi(bcx, llpair, &[0, abi::FAT_PTR_ADDR]);
let trait_id = upcast_trait_ref.def_id();
debug!("trans_object_shim(object_ty={}, upcast_trait_ref={}, method_offset_in_trait={})",
- object_ty.repr(tcx),
- upcast_trait_ref.repr(tcx),
+ object_ty.repr(),
+ upcast_trait_ref.repr(),
method_offset_in_trait);
let object_trait_ref =
}
_ => {
tcx.sess.bug(&format!("trans_object_shim() called on non-object: {}",
- object_ty.repr(tcx)));
+ object_ty.repr()));
}
};
// Upcast to the trait in question and extract out the substitutions.
let upcast_trait_ref = ty::erase_late_bound_regions(tcx, &upcast_trait_ref);
let object_substs = upcast_trait_ref.substs.clone().erase_regions();
- debug!("trans_object_shim: object_substs={}", object_substs.repr(tcx));
+ debug!("trans_object_shim: object_substs={}", object_substs.repr());
// Lookup the type of this method as declared in the trait and apply substitutions.
let method_ty = match ty::trait_item(tcx, trait_id, method_offset_in_trait) {
let fty = monomorphize::apply_param_substs(tcx, &object_substs, &method_ty.fty);
let fty = tcx.mk_bare_fn(fty);
let method_ty = opaque_method_ty(tcx, fty);
- debug!("trans_object_shim: fty={} method_ty={}", fty.repr(tcx), method_ty.repr(tcx));
+ debug!("trans_object_shim: fty={} method_ty={}", fty.repr(), method_ty.repr());
//
let shim_fn_ty = ty::mk_bare_fn(tcx, None, fty);
_ => {
bcx.sess().bug(
&format!("rust-call expects a tuple not {}",
- sig.inputs[1].repr(tcx)));
+ sig.inputs[1].repr()));
}
}
}
let tcx = ccx.tcx();
let _icx = push_ctxt("meth::get_vtable");
- debug!("get_vtable(trait_ref={})", trait_ref.repr(tcx));
+ debug!("get_vtable(trait_ref={})", trait_ref.repr());
// Check the cache.
match ccx.vtables().borrow().get(&trait_ref) {
// cannot cast an unsized type into a trait object
tcx.sess.bug(
&format!("cannot get vtable for an object type: {}",
- data.repr(tcx)));
+ data.repr()));
}
traits::VtableParam(..) => {
tcx.sess.bug(
&format!("resolved vtable for {} to bad vtable {} in trans",
- trait_ref.repr(tcx),
- vtable.repr(tcx)));
+ trait_ref.repr(),
+ vtable.repr()));
}
}
});
let tcx = ccx.tcx();
debug!("emit_vtable_methods(impl_id={}, substs={}, param_substs={})",
- impl_id.repr(tcx),
- substs.repr(tcx),
- param_substs.repr(tcx));
+ impl_id.repr(),
+ substs.repr(),
+ param_substs.repr());
let trt_id = match ty::impl_trait_ref(tcx, impl_id) {
Some(t_id) => t_id.def_id,
// null.
.map(|trait_method_def_id| {
debug!("emit_vtable_methods: trait_method_def_id={}",
- trait_method_def_id.repr(tcx));
+ trait_method_def_id.repr());
let trait_method_type = match ty::impl_or_trait_item(tcx, trait_method_def_id) {
ty::MethodTraitItem(m) => m,
}
debug!("emit_vtable_methods: trait_method_type={}",
- trait_method_type.repr(tcx));
+ trait_method_type.repr());
// The substitutions we have are on the impl, so we grab
// the method type from the impl to substitute into.
};
debug!("emit_vtable_methods: impl_method_type={}",
- impl_method_type.repr(tcx));
+ impl_method_type.repr());
// If this is a default method, it's possible that it
// relies on where clauses that do not hold for this
fn_id={}, \
real_substs={}, \
ref_id={:?})",
- fn_id.repr(ccx.tcx()),
- psubsts.repr(ccx.tcx()),
+ fn_id.repr(),
+ psubsts.repr(),
ref_id);
assert!(psubsts.types.all(|t| {
let item_ty = ty::lookup_item_type(ccx.tcx(), fn_id).ty;
- debug!("monomorphic_fn about to subst into {}", item_ty.repr(ccx.tcx()));
+ debug!("monomorphic_fn about to subst into {}", item_ty.repr());
let mono_ty = item_ty.subst(ccx.tcx(), psubsts);
match ccx.monomorphized().borrow().get(&hash_id) {
fn_id={}, \
psubsts={}, \
hash_id={:?})",
- fn_id.repr(ccx.tcx()),
- psubsts.repr(ccx.tcx()),
+ fn_id.repr(),
+ psubsts.repr(),
hash_id);
}
}
- debug!("mono_ty = {} (post-substitution)", mono_ty.repr(ccx.tcx()));
+ debug!("mono_ty = {} (post-substitution)", mono_ty.repr());
let mono_ty = normalize_associated_type(ccx.tcx(), &mono_ty);
- debug!("mono_ty = {} (post-normalization)", mono_ty.repr(ccx.tcx()));
+ debug!("mono_ty = {} (post-normalization)", mono_ty.repr());
ccx.stats().n_monos.set(ccx.stats().n_monos.get() + 1);
param_substs: &Substs<'tcx>,
value: &T)
-> T
- where T : TypeFoldable<'tcx> + Repr<'tcx> + HasProjectionTypes + Clone
+ where T : TypeFoldable<'tcx> + Repr + HasProjectionTypes + Clone
{
let substituted = value.subst(tcx, param_substs);
normalize_associated_type(tcx, &substituted)
/// and hence we can be sure that all associated types will be
/// completely normalized away.
pub fn normalize_associated_type<'tcx,T>(tcx: &ty::ctxt<'tcx>, value: &T) -> T
- where T : TypeFoldable<'tcx> + Repr<'tcx> + HasProjectionTypes + Clone
+ where T : TypeFoldable<'tcx> + Repr + HasProjectionTypes + Clone
{
- debug!("normalize_associated_type(t={})", value.repr(tcx));
+ debug!("normalize_associated_type(t={})", value.repr());
let value = erase_regions(tcx, value);
traits::normalize(&mut selcx, cause, &value);
debug!("normalize_associated_type: result={} obligations={}",
- result.repr(tcx),
- obligations.repr(tcx));
+ result.repr(),
+ obligations.repr());
let mut fulfill_cx = traits::FulfillmentContext::new(true);
for obligation in obligations {
impl<'tcx> VecTypes<'tcx> {
pub fn to_string<'a>(&self, ccx: &CrateContext<'a, 'tcx>) -> String {
format!("VecTypes {{unit_ty={}, llunit_ty={}}}",
- self.unit_ty.user_string(ccx.tcx()),
+ self.unit_ty.user_string(),
ccx.tn().type_to_string(self.llunit_ty))
}
}
-> Type
{
debug!("type_of_rust_fn(sig={},abi={:?})",
- sig.repr(cx.tcx()),
+ sig.repr(),
abi);
let sig = ty::erase_late_bound_regions(cx.tcx(), sig);
ty::TyProjection(..) | ty::TyInfer(..) | ty::TyParam(..) | ty::TyError(..) => {
cx.sess().bug(&format!("fictitious type {} in sizing_type_of()",
- t.repr(cx.tcx())))
+ t.repr()))
}
ty::TySlice(_) | ty::TyTrait(..) | ty::TyStr => unreachable!()
};
None => ()
}
- debug!("type_of {} {:?}", t.repr(cx.tcx()), t.sty);
+ debug!("type_of {} {:?}", t.repr(), t.sty);
assert!(!t.has_escaping_regions());
if t != t_norm {
let llty = in_memory_type_of(cx, t_norm);
debug!("--> normalized {} {:?} to {} {:?} llty={}",
- t.repr(cx.tcx()),
+ t.repr(),
t,
- t_norm.repr(cx.tcx()),
+ t_norm.repr(),
t_norm,
cx.tn().type_to_string(llty));
cx.lltypes().borrow_mut().insert(t, llty);
ty::TyTrait(_) => Type::vtable_ptr(cx),
_ => panic!("Unexpected type returned from \
struct_tail: {} for ty={}",
- unsized_part.repr(cx.tcx()), ty.repr(cx.tcx()))
+ unsized_part.repr(), ty.repr())
};
Type::struct_(cx, &[ptr_ty, info_ty], false)
}
};
debug!("--> mapped t={} {:?} to llty={}",
- t.repr(cx.tcx()),
+ t.repr(),
t,
cx.tn().type_to_string(llty));
tps: &[Ty<'tcx>])
-> String {
let base = ty::item_path_str(cx.tcx(), did);
- let strings: Vec<String> = tps.iter().map(|t| t.repr(cx.tcx())).collect();
+ let strings: Vec<String> = tps.iter().map(|t| t.repr()).collect();
let tstr = if strings.is_empty() {
base
} else {
};
debug!("ast_region_to_region(lifetime={} id={}) yields {}",
- lifetime.repr(tcx),
+ lifetime.repr(),
lifetime.id,
- r.repr(tcx));
+ r.repr());
r
}
};
debug!("opt_ast_region_to_region(opt_lifetime={}) yields {}",
- opt_lifetime.repr(this.tcx()),
- r.repr(this.tcx()));
+ opt_lifetime.repr(),
+ r.repr());
r
}
debug!("create_substs_for_ast_path(decl_generics={}, self_ty={}, \
types_provided={}, region_substs={}",
- decl_generics.repr(tcx), self_ty.repr(tcx), types_provided.repr(tcx),
- region_substs.repr(tcx));
+ decl_generics.repr(), self_ty.repr(), types_provided.repr(),
+ region_substs.repr());
assert_eq!(region_substs.regions().len(TypeSpace), decl_generics.regions.len(TypeSpace));
assert!(region_substs.types.is_empty());
"the type parameter `{}` must be explicitly specified \
in an object type because its default value `{}` references \
the type `Self`",
- param.name.user_string(tcx),
- default.user_string(tcx));
+ param.name.user_string(),
+ default.user_string());
substs.types.push(TypeSpace, tcx.types.err);
} else {
// This is a default type parameter.
def::DefTrait(trait_def_id) => trait_def_id,
_ => {
span_fatal!(this.tcx().sess, path.span, E0245, "`{}` is not a trait",
- path.user_string(this.tcx()));
+ path.user_string());
}
}
}
let candidate = try!(one_bound_for_assoc_type(tcx,
candidates,
- &trait_ref.user_string(tcx),
+ &trait_ref.user_string(),
&token::get_name(binding.item_name),
binding.span));
let result = make_object_type(this, span, trait_ref, existential_bounds);
debug!("trait_ref_to_object_type: result={}",
- result.repr(this.tcx()));
+ result.repr());
result
}
for (trait_def_id, name) in associated_types {
span_err!(tcx.sess, span, E0191,
"the value of the associated type `{}` (from the trait `{}`) must be specified",
- name.user_string(tcx),
+ name.user_string(),
ty::item_path_str(tcx, trait_def_id));
}
span_note!(tcx.sess, span,
"associated type `{}` could derive from `{}`",
ty_param_name,
- bound.user_string(tcx));
+ bound.user_string());
}
}
let tcx = this.tcx();
let assoc_name = item_segment.identifier.name;
- debug!("associated_path_def_to_ty: {}::{}", ty.repr(tcx), token::get_name(assoc_name));
+ debug!("associated_path_def_to_ty: {}::{}", ty.repr(), token::get_name(assoc_name));
check_path_args(tcx, slice::ref_slice(item_segment), NO_TPS | NO_REGIONS);
_ => {
report_ambiguous_associated_type(tcx,
span,
- &ty.user_string(tcx),
+ &ty.user_string(),
"Trait",
&token::get_name(assoc_name));
return (tcx.types.err, ty_path_def);
return tcx.types.err;
};
- debug!("qpath_to_ty: self_type={}", self_ty.repr(tcx));
+ debug!("qpath_to_ty: self_type={}", self_ty.repr());
let trait_ref = ast_path_to_mono_trait_ref(this,
rscope,
Some(self_ty),
trait_segment);
- debug!("qpath_to_ty: trait_ref={}", trait_ref.repr(tcx));
+ debug!("qpath_to_ty: trait_ref={}", trait_ref.repr());
this.projected_ty(span, trait_ref, item_segment.identifier.name)
}
-> Ty<'tcx>
{
debug!("ast_ty_to_ty(ast_ty={})",
- ast_ty.repr(this.tcx()));
+ ast_ty.repr());
let tcx = this.tcx();
}
ast::TyRptr(ref region, ref mt) => {
let r = opt_ast_region_to_region(this, rscope, ast_ty.span, region);
- debug!("TyRef r={}", r.repr(this.tcx()));
+ debug!("TyRef r={}", r.repr());
let rscope1 =
&ObjectLifetimeDefaultRscope::new(
rscope,
}
} else {
tcx.sess.span_bug(ast_ty.span,
- &format!("unbound path {}", ast_ty.repr(tcx)))
+ &format!("unbound path {}", ast_ty.repr()))
};
let def = path_res.base_def;
let base_ty_end = path.segments.len() - path_res.depth;
debug!("determine_explicit_self_category(self_info.untransformed_self_ty={} \
explicit_type={} \
modifiers=({},{})",
- self_info.untransformed_self_ty.repr(this.tcx()),
- explicit_type.repr(this.tcx()),
+ self_info.untransformed_self_ty.repr(),
+ explicit_type.repr(),
impl_modifiers,
method_modifiers);
-> ty::ClosureTy<'tcx>
{
debug!("ty_of_closure(expected_sig={})",
- expected_sig.repr(this.tcx()));
+ expected_sig.repr());
// new region names that appear inside of the fn decl are bound to
// that function type
ast::NoReturn(..) => ty::FnDiverging
};
- debug!("ty_of_closure: input_tys={}", input_tys.repr(this.tcx()));
- debug!("ty_of_closure: output_ty={}", output_ty.repr(this.tcx()));
+ debug!("ty_of_closure: input_tys={}", input_tys.repr());
+ debug!("ty_of_closure: output_ty={}", output_ty.repr());
ty::ClosureTy {
unsafety: unsafety,
debug!("compute_opt_region_bound(explicit_region_bounds={:?}, \
principal_trait_ref={}, builtin_bounds={})",
explicit_region_bounds,
- principal_trait_ref.repr(tcx),
- builtin_bounds.repr(tcx));
+ principal_trait_ref.repr(),
+ builtin_bounds.repr());
if explicit_region_bounds.len() > 1 {
span_err!(tcx.sess, explicit_region_bounds[1].span, E0226,
let tcx = pcx.fcx.ccx.tcx;
debug!("check_pat(pat={},expected={})",
- pat.repr(tcx),
- expected.repr(tcx));
+ pat.repr(),
+ expected.repr());
match pat.node {
ast::PatWild(_) => {
}
} else {
tcx.sess.span_bug(pat.span,
- &format!("unbound path {}", pat.repr(tcx)))
+ &format!("unbound path {}", pat.repr()))
};
if let Some((opt_ty, segments, def)) =
resolve_ty_and_def_ufcs(fcx, path_res, Some(self_ty),
body_id: ast::NodeId,
value: &T)
-> T
- where T : TypeFoldable<'tcx> + HasProjectionTypes + Clone + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + HasProjectionTypes + Clone + Repr
{
- debug!("normalize_associated_types_in(value={})", value.repr(infcx.tcx));
+ debug!("normalize_associated_types_in(value={})", value.repr());
let mut selcx = SelectionContext::new(infcx, typer);
let cause = ObligationCause::new(span, body_id, MiscObligation);
let Normalized { value: result, obligations } = traits::normalize(&mut selcx, cause, value);
debug!("normalize_associated_types_in: result={} predicates={}",
- result.repr(infcx.tcx),
- obligations.repr(infcx.tcx));
+ result.repr(),
+ obligations.repr());
for obligation in obligations {
fulfillment_cx.register_predicate_obligation(infcx, obligation);
}
-> Option<CallStep<'tcx>>
{
debug!("try_overloaded_call_step(call_expr={}, adjusted_ty={}, autoderefs={})",
- call_expr.repr(fcx.tcx()),
- adjusted_ty.repr(fcx.tcx()),
+ call_expr.repr(),
+ adjusted_ty.repr(),
autoderefs);
// If the callee is a bare function or a closure, then we're all set.
closure_def_id: ast::DefId,
}
-impl<'tcx> Repr<'tcx> for CallResolution<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for CallResolution<'tcx> {
+ fn repr(&self) -> String {
format!("CallResolution(call_expr={}, callee_expr={}, adjusted_ty={}, \
autoderefs={}, fn_sig={}, closure_def_id={})",
- self.call_expr.repr(tcx),
- self.callee_expr.repr(tcx),
- self.adjusted_ty.repr(tcx),
+ self.call_expr.repr(),
+ self.callee_expr.repr(),
+ self.adjusted_ty.repr(),
self.autoderefs,
- self.fn_sig.repr(tcx),
- self.closure_def_id.repr(tcx))
+ self.fn_sig.repr(),
+ self.closure_def_id.repr())
}
}
impl<'tcx> DeferredCallResolution<'tcx> for CallResolution<'tcx> {
fn resolve<'a>(&mut self, fcx: &FnCtxt<'a,'tcx>) {
debug!("DeferredCallResolution::resolve() {}",
- self.repr(fcx.tcx()));
+ self.repr());
// we should not be invoked until the closure kind has been
// determined by upvar inference
ty::ty_fn_sig(method_callee.ty)).unwrap();
debug!("attempt_resolution: method_callee={}",
- method_callee.repr(fcx.tcx()));
+ method_callee.repr());
for (&method_arg_ty, &self_arg_ty) in
method_sig.inputs[1..].iter().zip(&self.fn_sig.inputs)
self.expr_ty = structurally_resolved_type(fcx, self.span, self.expr_ty);
self.cast_ty = structurally_resolved_type(fcx, self.span, self.cast_ty);
- debug!("check_cast({}, {} as {})", self.expr.id, self.expr_ty.repr(fcx.tcx()),
- self.cast_ty.repr(fcx.tcx()));
+ debug!("check_cast({}, {} as {})", self.expr.id, self.expr_ty.repr(),
+ self.cast_ty.repr());
if ty::type_is_error(self.expr_ty) || ty::type_is_error(self.cast_ty) {
// No sense in giving duplicate error messages
-> Result<CastKind, CastError>
{
debug!("check_ptr_ptr_cast m_expr={} m_cast={}",
- m_expr.repr(fcx.tcx()), m_cast.repr(fcx.tcx()));
+ m_expr.repr(), m_cast.repr());
// ptr-ptr cast. vtables must match.
// Cast to sized is OK
body: &'tcx ast::Block,
expected: Expectation<'tcx>) {
debug!("check_expr_closure(expr={},expected={})",
- expr.repr(fcx.tcx()),
- expected.repr(fcx.tcx()));
+ expr.repr(),
+ expected.repr());
// It's always helpful for inference if we know the kind of
// closure sooner rather than later, so first examine the expected
debug!("check_closure opt_kind={:?} expected_sig={}",
opt_kind,
- expected_sig.repr(fcx.tcx()));
+ expected_sig.repr());
let mut fn_ty = astconv::ty_of_closure(
fcx,
fn_ty.sig.0.inputs = vec![ty::mk_tup(fcx.tcx(), fn_ty.sig.0.inputs)];
debug!("closure for {} --> sig={} opt_kind={:?}",
- expr_def_id.repr(fcx.tcx()),
- fn_ty.sig.repr(fcx.tcx()),
+ expr_def_id.repr(),
+ fn_ty.sig.repr(),
opt_kind);
fcx.inh.closure_tys.borrow_mut().insert(expr_def_id, fn_ty);
-> (Option<ty::FnSig<'tcx>>,Option<ty::ClosureKind>)
{
debug!("deduce_expectations_from_expected_type(expected_ty={})",
- expected_ty.repr(fcx.tcx()));
+ expected_ty.repr());
match expected_ty.sty {
ty::TyTrait(ref object_type) => {
.iter()
.filter_map(|obligation| {
debug!("deduce_expectations_from_obligations: obligation.predicate={}",
- obligation.predicate.repr(fcx.tcx()));
+ obligation.predicate.repr());
match obligation.predicate {
// Given a Projection predicate, we can potentially infer
let tcx = fcx.tcx();
debug!("deduce_sig_from_projection({})",
- projection.repr(tcx));
+ projection.repr());
let trait_ref = projection.to_poly_trait_ref();
let arg_param_ty = *trait_ref.substs().types.get(subst::TypeSpace, 0);
let arg_param_ty = fcx.infcx().resolve_type_vars_if_possible(&arg_param_ty);
- debug!("deduce_sig_from_projection: arg_param_ty {}", arg_param_ty.repr(tcx));
+ debug!("deduce_sig_from_projection: arg_param_ty {}", arg_param_ty.repr());
let input_tys = match arg_param_ty.sty {
ty::TyTuple(ref tys) => { (*tys).clone() }
_ => { return None; }
};
- debug!("deduce_sig_from_projection: input_tys {}", input_tys.repr(tcx));
+ debug!("deduce_sig_from_projection: input_tys {}", input_tys.repr());
let ret_param_ty = projection.0.ty;
let ret_param_ty = fcx.infcx().resolve_type_vars_if_possible(&ret_param_ty);
- debug!("deduce_sig_from_projection: ret_param_ty {}", ret_param_ty.repr(tcx));
+ debug!("deduce_sig_from_projection: ret_param_ty {}", ret_param_ty.repr());
let fn_sig = ty::FnSig {
inputs: input_tys,
output: ty::FnConverging(ret_param_ty),
variadic: false
};
- debug!("deduce_sig_from_projection: fn_sig {}", fn_sig.repr(tcx));
+ debug!("deduce_sig_from_projection: fn_sig {}", fn_sig.repr());
Some(fn_sig)
}
{
let self_ty = fcx.infcx().shallow_resolve(trait_ref.self_ty());
debug!("self_type_matches_expected_vid(trait_ref={}, self_ty={})",
- trait_ref.repr(fcx.tcx()),
- self_ty.repr(fcx.tcx()));
+ trait_ref.repr(),
+ self_ty.repr());
match self_ty.sty {
ty::TyInfer(ty::TyVar(v)) if expected_vid == v => Some(trait_ref),
_ => None,
b: Ty<'tcx>)
-> CoerceResult<'tcx> {
debug!("Coerce.tys({} => {})",
- a.repr(self.tcx()),
- b.repr(self.tcx()));
+ a.repr(),
+ b.repr());
// Consider coercing the subtype to a DST
let unsize = self.unpack_actual_value(a, |a| {
mutbl_b: ast::Mutability)
-> CoerceResult<'tcx> {
debug!("coerce_borrowed_pointer(a={}, b={})",
- a.repr(self.tcx()),
- b.repr(self.tcx()));
+ a.repr(),
+ b.repr());
// If we have a parameter of type `&M T_a` and the value
// provided is `expr`, we will be adding an implicit borrow,
target: Ty<'tcx>)
-> CoerceResult<'tcx> {
debug!("coerce_unsized(source={}, target={})",
- source.repr(self.tcx()),
- target.repr(self.tcx()));
+ source.repr(),
+ target.repr());
let traits = (self.tcx().lang_items.unsize_trait(),
self.tcx().lang_items.coerce_unsized_trait());
// inference might unify those two inner type variables later.
let traits = [coerce_unsized_did, unsize_did];
while let Some(obligation) = queue.pop_front() {
- debug!("coerce_unsized resolve step: {}", obligation.repr(self.tcx()));
+ debug!("coerce_unsized resolve step: {}", obligation.repr());
let trait_ref = match obligation.predicate {
ty::Predicate::Trait(ref tr) if traits.contains(&tr.def_id()) => {
tr.clone()
autoref: reborrow,
unsize: Some(target)
};
- debug!("Success, coerced with {}", adjustment.repr(self.tcx()));
+ debug!("Success, coerced with {}", adjustment.repr());
Ok(Some(AdjustDerefRef(adjustment)))
}
self.unpack_actual_value(b, |b| {
debug!("coerce_from_fn_pointer(a={}, b={})",
- a.repr(self.tcx()), b.repr(self.tcx()));
+ a.repr(), b.repr());
if let ty::TyBareFn(None, fn_ty_b) = b.sty {
match (fn_ty_a.unsafety, fn_ty_b.unsafety) {
self.unpack_actual_value(b, |b| {
debug!("coerce_from_fn_item(a={}, b={})",
- a.repr(self.tcx()), b.repr(self.tcx()));
+ a.repr(), b.repr());
match b.sty {
ty::TyBareFn(None, _) => {
mutbl_b: ast::Mutability)
-> CoerceResult<'tcx> {
debug!("coerce_unsafe_ptr(a={}, b={})",
- a.repr(self.tcx()),
- b.repr(self.tcx()));
+ a.repr(),
+ b.repr());
let (is_ref, mt_a) = match a.sty {
ty::TyRef(_, mt) => (true, mt),
a: Ty<'tcx>,
b: Ty<'tcx>)
-> RelateResult<'tcx, ()> {
- debug!("mk_assignty({} -> {})", a.repr(fcx.tcx()), b.repr(fcx.tcx()));
+ debug!("mk_assignty({} -> {})", a.repr(), b.repr());
let mut unsizing_obligations = vec![];
let adjustment = try!(indent(|| {
fcx.infcx().commit_if_ok(|_| {
}
if let Some(adjustment) = adjustment {
- debug!("Success, coerced with {}", adjustment.repr(fcx.tcx()));
+ debug!("Success, coerced with {}", adjustment.repr());
fcx.write_adjustment(expr.id, adjustment);
}
Ok(())
trait_m: &ty::Method<'tcx>,
impl_trait_ref: &ty::TraitRef<'tcx>) {
debug!("compare_impl_method(impl_trait_ref={})",
- impl_trait_ref.repr(tcx));
+ impl_trait_ref.repr());
debug!("compare_impl_method: impl_trait_ref (liberated) = {}",
- impl_trait_ref.repr(tcx));
+ impl_trait_ref.repr());
let infcx = infer::new_infer_ctxt(tcx);
let mut fulfillment_cx = traits::FulfillmentContext::new(true);
"method `{}` has a `{}` declaration in the impl, \
but not in the trait",
token::get_name(trait_m.name),
- impl_m.explicit_self.repr(tcx));
+ impl_m.explicit_self.repr());
return;
}
(_, &ty::StaticExplicitSelfCategory) => {
"method `{}` has a `{}` declaration in the trait, \
but not in the impl",
token::get_name(trait_m.name),
- trait_m.explicit_self.repr(tcx));
+ trait_m.explicit_self.repr());
return;
}
_ => {
.with_method(impl_to_skol_substs.types.get_slice(subst::FnSpace).to_vec(),
impl_to_skol_substs.regions().get_slice(subst::FnSpace).to_vec());
debug!("compare_impl_method: trait_to_skol_substs={}",
- trait_to_skol_substs.repr(tcx));
+ trait_to_skol_substs.repr());
// Check region bounds. FIXME(@jroesch) refactor this away when removing
// ParamBounds.
infer::HigherRankedType,
&ty::Binder(impl_bounds));
debug!("compare_impl_method: impl_bounds={}",
- impl_bounds.repr(tcx));
+ impl_bounds.repr());
// Normalize the associated types in the trait_bounds.
let trait_bounds = trait_m.predicates.instantiate(tcx, &trait_to_skol_substs);
normalize_cause.clone());
debug!("compare_impl_method: trait_bounds={}",
- trait_param_env.caller_bounds.repr(tcx));
+ trait_param_env.caller_bounds.repr());
let mut selcx = traits::SelectionContext::new(&infcx, &trait_param_env);
abi: impl_m.fty.abi,
sig: ty::Binder(impl_sig) }));
debug!("compare_impl_method: impl_fty={}",
- impl_fty.repr(tcx));
+ impl_fty.repr());
let (trait_sig, skol_map) =
infcx.skolemize_late_bound_regions(&trait_m.fty.sig, snapshot);
sig: ty::Binder(trait_sig) }));
debug!("compare_impl_method: trait_fty={}",
- trait_fty.repr(tcx));
+ trait_fty.repr());
try!(infer::mk_subty(&infcx, false, origin, impl_fty, trait_fty));
Ok(()) => { }
Err(terr) => {
debug!("checking trait method for compatibility: impl ty {}, trait ty {}",
- impl_fty.repr(tcx),
- trait_fty.repr(tcx));
+ impl_fty.repr(),
+ trait_fty.repr());
span_err!(tcx.sess, impl_m_span, E0053,
"method `{}` has an incompatible type for trait: {}",
token::get_name(trait_m.name),
impl_generics={} \
trait_to_skol_substs={} \
impl_to_skol_substs={}",
- trait_generics.repr(tcx),
- impl_generics.repr(tcx),
- trait_to_skol_substs.repr(tcx),
- impl_to_skol_substs.repr(tcx));
+ trait_generics.repr(),
+ impl_generics.repr(),
+ trait_to_skol_substs.repr(),
+ impl_to_skol_substs.repr());
// Must have same number of early-bound lifetime parameters.
// Unfortunately, if the user screws up the bounds, then this
trait_c: &ty::AssociatedConst<'tcx>,
impl_trait_ref: &ty::TraitRef<'tcx>) {
debug!("compare_const_impl(impl_trait_ref={})",
- impl_trait_ref.repr(tcx));
+ impl_trait_ref.repr());
let infcx = infer::new_infer_ctxt(tcx);
let mut fulfillment_cx = traits::FulfillmentContext::new(true);
.with_method(impl_to_skol_substs.types.get_slice(subst::FnSpace).to_vec(),
impl_to_skol_substs.regions().get_slice(subst::FnSpace).to_vec());
debug!("compare_const_impl: trait_to_skol_substs={}",
- trait_to_skol_substs.repr(tcx));
+ trait_to_skol_substs.repr());
// Compute skolemized form of impl and trait const tys.
let impl_ty = impl_c.ty.subst(tcx, impl_to_skol_substs);
0,
&impl_ty);
debug!("compare_const_impl: impl_ty={}",
- impl_ty.repr(tcx));
+ impl_ty.repr());
let trait_ty =
assoc::normalize_associated_types_in(&infcx,
0,
&trait_ty);
debug!("compare_const_impl: trait_ty={}",
- trait_ty.repr(tcx));
+ trait_ty.repr());
infer::mk_subty(&infcx, false, origin, impl_ty, trait_ty)
});
Ok(()) => { }
Err(terr) => {
debug!("checking associated const for compatibility: impl ty {}, trait ty {}",
- impl_ty.repr(tcx),
- trait_ty.repr(tcx));
+ impl_ty.repr(),
+ trait_ty.repr());
span_err!(tcx.sess, impl_c_span, E0326,
"implemented const `{}` has an incompatible type for \
trait: {}",
expr: &ast::Expr) {
let expr_ty = fcx.expr_ty(expr);
debug!("demand::coerce(expected = {}, expr_ty = {})",
- expected.repr(fcx.ccx.tcx),
- expr_ty.repr(fcx.ccx.tcx));
+ expected.repr(),
+ expr_ty.repr());
let expr_ty = fcx.resolve_type_vars_if_possible(expr_ty);
let expected = fcx.resolve_type_vars_if_possible(expected);
match coercion::mk_assignty(fcx, expr, expr_ty, expected) {
let span = tcx.map.def_id_span(drop_impl_did, codemap::DUMMY_SP);
tcx.sess.span_bug(
span, &format!("should have been rejected by coherence check: {}",
- dtor_self_type.repr(tcx)));
+ dtor_self_type.repr()));
}
}
}
if !assumptions_in_impl_context.contains(&predicate) {
let item_span = tcx.map.span(self_type_did.node);
- let req = predicate.user_string(tcx);
+ let req = predicate.user_string();
span_err!(tcx.sess, drop_impl_span, E0367,
"The requirement `{}` is added only by the Drop impl.", req);
tcx.sess.span_note(item_span,
span: Span,
scope: region::CodeExtent) {
debug!("check_safety_of_destructor_if_necessary typ: {} scope: {:?}",
- typ.repr(rcx.tcx()), scope);
+ typ.repr(), scope);
// types that have been traversed so far by `traverse_type_if_unseen`
let mut breadcrumbs: Vec<Ty<'tcx>> = Vec::new();
let tcx = rcx.tcx();
span_err!(tcx.sess, span, E0320,
"overflow while adding drop-check rules for {}",
- typ.user_string(rcx.tcx()));
+ typ.user_string());
match *ctxt {
TypeContext::Root => {
// no need for an additional note if the overflow
ty::item_path_str(tcx, def_id),
variant,
arg_index,
- detected_on_typ.user_string(rcx.tcx()));
+ detected_on_typ.user_string());
}
TypeContext::Struct { def_id, field } => {
span_note!(
"overflowed on struct {} field {} type: {}",
ty::item_path_str(tcx, def_id),
field,
- detected_on_typ.user_string(rcx.tcx()));
+ detected_on_typ.user_string());
}
}
}
.opt_get(subst::TypeSpace, 0).unwrap();
let new_typ = substs.type_for_def(tp_def);
debug!("replacing phantom {} with {}",
- typ.repr(rcx.tcx()), new_typ.repr(rcx.tcx()));
+ typ.repr(), new_typ.repr());
(new_typ, xref_depth_orig + 1)
} else {
(typ, xref_depth_orig)
// puts us into the previous case.
ty::TyBox(new_typ) => {
debug!("replacing TyBox {} with {}",
- typ.repr(rcx.tcx()), new_typ.repr(rcx.tcx()));
+ typ.repr(), new_typ.repr());
(new_typ, xref_depth_orig + 1)
}
debug!("iterate_over_potentially_unsafe_regions_in_type \
{}typ: {} scope: {:?} xref: {}",
(0..depth).map(|_| ' ').collect::<String>(),
- typ.repr(rcx.tcx()), scope, xref_depth);
+ typ.repr(), scope, xref_depth);
// If `typ` has a destructor, then we must ensure that all
// borrowed data reachable via `typ` must outlive the parent
match typ.sty {
ty::TyStruct(struct_did, substs) => {
debug!("typ: {} is struct; traverse structure and not type-expression",
- typ.repr(rcx.tcx()));
+ typ.repr());
// Don't recurse; we extract type's substructure,
// so do not process subparts of type expression.
walker.skip_current_subtree();
ty::TyEnum(enum_did, substs) => {
debug!("typ: {} is enum; traverse structure and not type-expression",
- typ.repr(rcx.tcx()));
+ typ.repr());
// Don't recurse; we extract type's substructure,
// so do not process subparts of type expression.
walker.skip_current_subtree();
DtorKind::PureRecur => {
has_dtor_of_interest = false;
debug!("typ: {} has no dtor, and thus is uninteresting",
- typ.repr(tcx));
+ typ.repr());
}
DtorKind::Unknown(bounds) => {
match bounds.region_bound {
ty::ReStatic => {
debug!("trait: {} has 'static bound, and thus is uninteresting",
- typ.repr(tcx));
+ typ.repr());
has_dtor_of_interest = false;
}
ty::ReEmpty => {
debug!("trait: {} has empty region bound, and thus is uninteresting",
- typ.repr(tcx));
+ typ.repr());
has_dtor_of_interest = false;
}
r => {
debug!("trait: {} has non-static bound: {}; assumed interesting",
- typ.repr(tcx), r.repr(tcx));
+ typ.repr(), r.repr());
has_dtor_of_interest = true;
}
}
if result {
has_pred_of_interest = true;
debug!("typ: {} has interesting dtor due to generic preds, e.g. {}",
- typ.repr(tcx), pred.repr(tcx));
+ typ.repr(), pred.repr());
break 'items;
}
}
if has_dtor_of_interest {
debug!("typ: {} has interesting dtor, due to \
region params: {} or pred: {}",
- typ.repr(tcx),
+ typ.repr(),
has_region_param_of_interest,
has_pred_of_interest);
} else {
debug!("typ: {} has dtor, but it is uninteresting",
- typ.repr(tcx));
+ typ.repr());
}
}
}
-> MethodCallee<'tcx>
{
debug!("confirm(unadjusted_self_ty={}, pick={}, supplied_method_types={})",
- unadjusted_self_ty.repr(fcx.tcx()),
- pick.repr(fcx.tcx()),
- supplied_method_types.repr(fcx.tcx()));
+ unadjusted_self_ty.repr(),
+ pick.repr(),
+ supplied_method_types.repr());
let mut confirm_cx = ConfirmContext::new(fcx, span, self_expr, call_expr);
confirm_cx.confirm(unadjusted_self_ty, pick, supplied_method_types)
let (method_types, method_regions) =
self.instantiate_method_substs(&pick, supplied_method_types);
let all_substs = rcvr_substs.with_method(method_types, method_regions);
- debug!("all_substs={}", all_substs.repr(self.tcx()));
+ debug!("all_substs={}", all_substs.repr());
// Create the final signature for the method, replacing late-bound regions.
let InstantiatedMethodSig {
let upcast_trait_ref =
this.replace_late_bound_regions_with_fresh_var(&upcast_poly_trait_ref);
debug!("original_poly_trait_ref={} upcast_trait_ref={} target_trait={}",
- original_poly_trait_ref.repr(this.tcx()),
- upcast_trait_ref.repr(this.tcx()),
- trait_def_id.repr(this.tcx()));
+ original_poly_trait_ref.repr(),
+ upcast_trait_ref.repr(),
+ trait_def_id.repr());
let substs = upcast_trait_ref.substs.clone();
let origin = MethodTraitObject(MethodObject {
trait_ref: upcast_trait_ref,
self.tcx().sess.span_bug(
self.span,
&format!("self-type `{}` for ObjectPick never dereferenced to an object",
- self_ty.repr(self.tcx())))
+ self_ty.repr()))
}
}
}
self.span,
&format!(
"{} was a subtype of {} but now is not?",
- self_ty.repr(self.tcx()),
- method_self_ty.repr(self.tcx())));
+ self_ty.repr(),
+ method_self_ty.repr()));
}
}
}
-> InstantiatedMethodSig<'tcx>
{
debug!("instantiate_method_sig(pick={}, all_substs={})",
- pick.repr(self.tcx()),
- all_substs.repr(self.tcx()));
+ pick.repr(),
+ all_substs.repr());
// Instantiate the bounds on the method with the
// type/early-bound-regions substitutions performed. There can
&method_predicates);
debug!("method_predicates after subst = {}",
- method_predicates.repr(self.tcx()));
+ method_predicates.repr());
// Instantiate late-bound regions and substitute the trait
// parameters into the method type to get the actual method type.
let method_sig = self.replace_late_bound_regions_with_fresh_var(
&pick.item.as_opt_method().unwrap().fty.sig);
debug!("late-bound lifetimes from method instantiated, method_sig={}",
- method_sig.repr(self.tcx()));
+ method_sig.repr());
let method_sig = self.fcx.instantiate_type_scheme(self.span, &all_substs, &method_sig);
debug!("type scheme substituted, method_sig={}",
- method_sig.repr(self.tcx()));
+ method_sig.repr());
InstantiatedMethodSig {
method_sig: method_sig,
all_substs: &subst::Substs<'tcx>,
method_predicates: &ty::InstantiatedPredicates<'tcx>) {
debug!("add_obligations: pick={} all_substs={} method_predicates={}",
- pick.repr(self.tcx()),
- all_substs.repr(self.tcx()),
- method_predicates.repr(self.tcx()));
+ pick.repr(),
+ all_substs.repr(),
+ method_predicates.repr());
self.fcx.add_obligations_for_parameters(
traits::ObligationCause::misc(self.span, self.fcx.body_id),
}
debug!("fixup_derefs_on_method_receiver_if_necessary: exprs={}",
- exprs.repr(self.tcx()));
+ exprs.repr());
// Fix up autoderefs and derefs.
for (i, &expr) in exprs.iter().rev().enumerate() {
};
debug!("fixup_derefs_on_method_receiver_if_necessary: i={} expr={} autoderef_count={}",
- i, expr.repr(self.tcx()), autoderef_count);
+ i, expr.repr(), autoderef_count);
if autoderef_count > 0 {
check::autoderef(self.fcx,
self.tcx().sess.span_bug(
base_expr.span,
&format!("unexpected adjustment autoref {}",
- adr.repr(self.tcx())));
+ adr.repr()));
}
},
None => (0, None),
self.tcx().sess.span_bug(
self.span,
&format!("cannot uniquely upcast `{}` to `{}`: `{}`",
- source_trait_ref.repr(self.tcx()),
- target_trait_def_id.repr(self.tcx()),
- upcast_trait_refs.repr(self.tcx())));
+ source_trait_ref.repr(),
+ target_trait_def_id.repr(),
+ upcast_trait_refs.repr()));
}
upcast_trait_refs.into_iter().next().unwrap()
}
fn replace_late_bound_regions_with_fresh_var<T>(&self, value: &ty::Binder<T>) -> T
- where T : TypeFoldable<'tcx> + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + Repr
{
self.infcx().replace_late_bound_regions_with_fresh_var(
self.span, infer::FnCall, value).0
-> Result<ty::MethodCallee<'tcx>, MethodError>
{
debug!("lookup(method_name={}, self_ty={}, call_expr={}, self_expr={})",
- method_name.repr(fcx.tcx()),
- self_ty.repr(fcx.tcx()),
- call_expr.repr(fcx.tcx()),
- self_expr.repr(fcx.tcx()));
+ method_name.repr(),
+ self_ty.repr(),
+ call_expr.repr(),
+ self_expr.repr());
let mode = probe::Mode::MethodCall;
let self_ty = fcx.infcx().resolve_type_vars_if_possible(&self_ty);
-> Option<ty::MethodCallee<'tcx>>
{
debug!("lookup_in_trait_adjusted(self_ty={}, self_expr={}, m_name={}, trait_def_id={})",
- self_ty.repr(fcx.tcx()),
- self_expr.repr(fcx.tcx()),
- m_name.repr(fcx.tcx()),
- trait_def_id.repr(fcx.tcx()));
+ self_ty.repr(),
+ self_expr.repr(),
+ m_name.repr(),
+ trait_def_id.repr());
let trait_def = ty::lookup_trait_def(fcx.tcx(), trait_def_id);
assert_eq!(method_ty.generics.regions.len(subst::FnSpace), 0);
debug!("lookup_in_trait_adjusted: method_num={} method_ty={}",
- method_num, method_ty.repr(fcx.tcx()));
+ method_num, method_ty.repr());
// Instantiate late-bound regions and substitute the trait
// parameters into the method type to get the actual method type.
}));
debug!("lookup_in_trait_adjusted: matched method fty={} obligation={}",
- fty.repr(fcx.tcx()),
- obligation.repr(fcx.tcx()));
+ fty.repr(),
+ obligation.repr());
// Register obligations for the parameters. This will include the
// `Self` parameter, which in turn has a bound of the main trait,
span,
&format!(
"trait method is &self but first arg is: {}",
- transformed_self_ty.repr(fcx.tcx())));
+ transformed_self_ty.repr()));
}
}
}
substs: trait_ref.substs.clone()
};
- debug!("callee = {}", callee.repr(fcx.tcx()));
+ debug!("callee = {}", callee.repr());
Some(callee)
}
-> PickResult<'tcx>
{
debug!("probe(self_ty={}, item_name={}, scope_expr_id={})",
- self_ty.repr(fcx.tcx()),
+ self_ty.repr(),
item_name,
scope_expr_id);
};
debug!("ProbeContext: steps for self_ty={} are {}",
- self_ty.repr(fcx.tcx()),
- steps.repr(fcx.tcx()));
+ self_ty.repr(),
+ steps.repr());
// this creates one big transaction so that all type variables etc
// that we create during the probe process are removed later
fn assemble_probe(&mut self, self_ty: Ty<'tcx>) {
debug!("assemble_probe: self_ty={}",
- self_ty.repr(self.tcx()));
+ self_ty.repr());
match self_ty.sty {
ty::TyTrait(box ref data) => {
let traits::Normalized { value: xform_self_ty, obligations } =
traits::normalize(selcx, cause, &xform_self_ty);
debug!("assemble_inherent_impl_probe: xform_self_ty = {:?}",
- xform_self_ty.repr(self.tcx()));
+ xform_self_ty.repr());
self.inherent_candidates.push(Candidate {
xform_self_ty: xform_self_ty,
self_ty: Ty<'tcx>,
data: &ty::TraitTy<'tcx>) {
debug!("assemble_inherent_candidates_from_object(self_ty={})",
- self_ty.repr(self.tcx()));
+ self_ty.repr());
let tcx = self.tcx();
if let Some(ref m) = item.as_opt_method() {
debug!("found match: trait_ref={} substs={} m={}",
- trait_ref.repr(this.tcx()),
- trait_ref.substs.repr(this.tcx()),
- m.repr(this.tcx()));
+ trait_ref.repr(),
+ trait_ref.substs.repr(),
+ m.repr());
assert_eq!(m.generics.types.get_slice(subst::TypeSpace).len(),
trait_ref.substs.types.get_slice(subst::TypeSpace).len());
assert_eq!(m.generics.regions.get_slice(subst::TypeSpace).len(),
usize,
),
{
- debug!("elaborate_bounds(bounds={})", bounds.repr(self.tcx()));
+ debug!("elaborate_bounds(bounds={})", bounds.repr());
let tcx = self.tcx();
for bound_trait_ref in traits::transitive_bounds(tcx, bounds) {
-> Result<(),MethodError>
{
debug!("assemble_extension_candidates_for_trait(trait_def_id={})",
- trait_def_id.repr(self.tcx()));
+ trait_def_id.repr());
// Check whether `trait_def_id` defines a method with suitable name:
let trait_items =
// FIXME(arielb1): can we use for_each_relevant_impl here?
trait_def.for_each_impl(self.tcx(), |impl_def_id| {
debug!("assemble_extension_candidates_for_trait_impl: trait_def_id={} impl_def_id={}",
- trait_def_id.repr(self.tcx()),
- impl_def_id.repr(self.tcx()));
+ trait_def_id.repr(),
+ impl_def_id.repr());
if !self.impl_can_possibly_match(impl_def_id) {
return;
let (_, impl_substs) = self.impl_ty_and_substs(impl_def_id);
- debug!("impl_substs={}", impl_substs.repr(self.tcx()));
+ debug!("impl_substs={}", impl_substs.repr());
let impl_trait_ref =
ty::impl_trait_ref(self.tcx(), impl_def_id)
.unwrap() // we know this is a trait impl
.subst(self.tcx(), &impl_substs);
- debug!("impl_trait_ref={}", impl_trait_ref.repr(self.tcx()));
+ debug!("impl_trait_ref={}", impl_trait_ref.repr());
// Determine the receiver type that the method itself expects.
let xform_self_ty =
let traits::Normalized { value: xform_self_ty, obligations } =
traits::normalize(selcx, cause, &xform_self_ty);
- debug!("xform_self_ty={}", xform_self_ty.repr(self.tcx()));
+ debug!("xform_self_ty={}", xform_self_ty.repr());
self.extension_candidates.push(Candidate {
xform_self_ty: xform_self_ty,
trait_def_id={}, \
item={}, \
item_index={})",
- trait_def_id.repr(self.tcx()),
- item.repr(self.tcx()),
+ trait_def_id.repr(),
+ item.repr(),
item_index);
for step in self.steps.iter() {
debug!("assemble_projection_candidates: step={}",
- step.repr(self.tcx()));
+ step.repr());
let projection_trait_ref = match step.self_ty.sty {
ty::TyProjection(ref data) => &data.trait_ref,
};
debug!("assemble_projection_candidates: projection_trait_ref={}",
- projection_trait_ref.repr(self.tcx()));
+ projection_trait_ref.repr());
let trait_predicates = ty::lookup_predicates(self.tcx(),
projection_trait_ref.def_id);
let bounds = trait_predicates.instantiate(self.tcx(), projection_trait_ref.substs);
let predicates = bounds.predicates.into_vec();
debug!("assemble_projection_candidates: predicates={}",
- predicates.repr(self.tcx()));
+ predicates.repr());
for poly_bound in
traits::elaborate_predicates(self.tcx(), predicates)
.filter_map(|p| p.to_opt_poly_trait_ref())
let bound = self.erase_late_bound_regions(&poly_bound);
debug!("assemble_projection_candidates: projection_trait_ref={} bound={}",
- projection_trait_ref.repr(self.tcx()),
- bound.repr(self.tcx()));
+ projection_trait_ref.repr(),
+ bound.repr());
if self.infcx().can_equate(&step.self_ty, &bound.self_ty()).is_ok() {
let xform_self_ty = self.xform_self_ty(&item,
bound.substs);
debug!("assemble_projection_candidates: bound={} xform_self_ty={}",
- bound.repr(self.tcx()),
- xform_self_ty.repr(self.tcx()));
+ bound.repr(),
+ xform_self_ty.repr());
self.extension_candidates.push(Candidate {
xform_self_ty: xform_self_ty,
item_index: usize)
{
debug!("assemble_where_clause_candidates(trait_def_id={})",
- trait_def_id.repr(self.tcx()));
+ trait_def_id.repr());
let caller_predicates = self.fcx.inh.param_env.caller_bounds.clone();
for poly_bound in traits::elaborate_predicates(self.tcx(), caller_predicates)
bound.substs);
debug!("assemble_where_clause_candidates: bound={} xform_self_ty={}",
- bound.repr(self.tcx()),
- xform_self_ty.repr(self.tcx()));
+ bound.repr(),
+ xform_self_ty.repr());
self.extension_candidates.push(Candidate {
xform_self_ty: xform_self_ty,
}
fn pick_step(&mut self, step: &CandidateStep<'tcx>) -> Option<PickResult<'tcx>> {
- debug!("pick_step: step={}", step.repr(self.tcx()));
+ debug!("pick_step: step={}", step.repr());
if ty::type_is_error(step.self_ty) {
return None;
.filter(|&probe| self.consider_probe(self_ty, probe))
.collect();
- debug!("applicable_candidates: {}", applicable_candidates.repr(self.tcx()));
+ debug!("applicable_candidates: {}", applicable_candidates.repr());
if applicable_candidates.len() > 1 {
match self.collapse_candidates_to_trait_pick(&applicable_candidates[..]) {
fn consider_probe(&self, self_ty: Ty<'tcx>, probe: &Candidate<'tcx>) -> bool {
debug!("consider_probe: self_ty={} probe={}",
- self_ty.repr(self.tcx()),
- probe.repr(self.tcx()));
+ self_ty.repr(),
+ probe.repr());
self.infcx().probe(|_| {
// First check that the self type can be related.
traits::predicates_for_generics(self.tcx(),
cause.clone(),
&impl_bounds);
- debug!("impl_obligations={}", obligations.repr(self.tcx()));
+ debug!("impl_obligations={}", obligations.repr());
// Evaluate those obligations to see if they might possibly hold.
obligations.iter()
-> Ty<'tcx>
{
debug!("xform_self_ty(impl_ty={}, self_ty={}, substs={})",
- impl_ty.repr(self.tcx()),
- method.fty.sig.0.inputs.get(0).repr(self.tcx()),
- substs.repr(self.tcx()));
+ impl_ty.repr(),
+ method.fty.sig.0.inputs.get(0).repr(),
+ substs.repr());
assert!(!substs.has_escaping_regions());
/// and/or tracking the substitution and
/// so forth.
fn erase_late_bound_regions<T>(&self, value: &ty::Binder<T>) -> T
- where T : TypeFoldable<'tcx> + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + Repr
{
ty::erase_late_bound_regions(self.tcx(), value)
}
}
}
-impl<'tcx> Repr<'tcx> for Candidate<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for Candidate<'tcx> {
+ fn repr(&self) -> String {
format!("Candidate(xform_self_ty={}, kind={})",
- self.xform_self_ty.repr(tcx),
- self.kind.repr(tcx))
+ self.xform_self_ty.repr(),
+ self.kind.repr())
}
}
-impl<'tcx> Repr<'tcx> for CandidateKind<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for CandidateKind<'tcx> {
+ fn repr(&self) -> String {
match *self {
InherentImplCandidate(ref a, ref b, ref c) =>
- format!("InherentImplCandidate({},{},{})", a.repr(tcx), b.repr(tcx),
- c.repr(tcx)),
+ format!("InherentImplCandidate({},{},{})", a.repr(), b.repr(),
+ c.repr()),
ObjectCandidate(a, b, c) =>
- format!("ObjectCandidate({},{},{})", a.repr(tcx), b, c),
+ format!("ObjectCandidate({},{},{})", a.repr(), b, c),
ExtensionImplCandidate(ref a, ref b, ref c, ref d, ref e) =>
- format!("ExtensionImplCandidate({},{},{},{},{})", a.repr(tcx), b.repr(tcx),
- c.repr(tcx), d, e.repr(tcx)),
+ format!("ExtensionImplCandidate({},{},{},{},{})", a.repr(), b.repr(),
+ c.repr(), d, e.repr()),
ClosureCandidate(ref a, ref b) =>
- format!("ClosureCandidate({},{})", a.repr(tcx), b),
+ format!("ClosureCandidate({},{})", a.repr(), b),
WhereClauseCandidate(ref a, ref b) =>
- format!("WhereClauseCandidate({},{})", a.repr(tcx), b),
+ format!("WhereClauseCandidate({},{})", a.repr(), b),
ProjectionCandidate(ref a, ref b) =>
- format!("ProjectionCandidate({},{})", a.repr(tcx), b),
+ format!("ProjectionCandidate({},{})", a.repr(), b),
}
}
}
-impl<'tcx> Repr<'tcx> for CandidateStep<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for CandidateStep<'tcx> {
+ fn repr(&self) -> String {
format!("CandidateStep({}, autoderefs={}, unsize={})",
- self.self_ty.repr(tcx),
+ self.self_ty.repr(),
self.autoderefs,
self.unsize)
}
}
-impl<'tcx> Repr<'tcx> for PickKind<'tcx> {
- fn repr(&self, _tcx: &ty::ctxt) -> String {
+impl<'tcx> Repr for PickKind<'tcx> {
+ fn repr(&self) -> String {
format!("{:?}", self)
}
}
-impl<'tcx> Repr<'tcx> for Pick<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for Pick<'tcx> {
+ fn repr(&self) -> String {
format!("Pick(item={}, autoderefs={},
autoref={}, unsize={}, kind={:?})",
- self.item.repr(tcx),
+ self.item.repr(),
self.autoderefs,
- self.autoref.repr(tcx),
- self.unsize.repr(tcx),
+ self.autoref.repr(),
+ self.unsize.repr(),
self.kind)
}
}
match error {
MethodError::NoMatch(static_sources, out_of_scope_traits, mode) => {
let cx = fcx.tcx();
- let item_ustring = item_name.user_string(cx);
+ let item_ustring = item_name.user_string();
fcx.type_error_message(
span,
let msg = format!("the `{}` method from the `{}` trait cannot be explicitly \
invoked on this closure as we have not yet inferred what \
kind of closure it is",
- item_name.user_string(fcx.tcx()),
+ item_name.user_string(),
ty::item_path_str(fcx.tcx(), trait_def_id));
let msg = if let Some(callee) = rcvr_expr {
format!("{}; use overloaded call notation instead (e.g., `{}()`)",
"candidate #{} is defined in an impl{} for the type `{}`",
idx + 1,
insertion,
- impl_ty.user_string(fcx.tcx()));
+ impl_ty.user_string());
}
CandidateSource::TraitSource(trait_did) => {
let (_, item) = trait_item(fcx.tcx(), trait_did, item_name).unwrap();
valid_out_of_scope_traits: Vec<ast::DefId>)
{
let tcx = fcx.tcx();
- let item_ustring = item_name.user_string(tcx);
+ let item_ustring = item_name.user_string();
if !valid_out_of_scope_traits.is_empty() {
let mut candidates = valid_out_of_scope_traits;
body_id: ast::NodeId,
value: &T)
-> T
- where T : TypeFoldable<'tcx> + Clone + HasProjectionTypes + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + Clone + HasProjectionTypes + Repr
{
let mut fulfillment_cx = self.fulfillment_cx.borrow_mut();
assoc::normalize_associated_types_in(&self.infcx,
token::get_ident(path1.node),
self.fcx.infcx().ty_to_string(
self.fcx.inh.locals.borrow().get(&p.id).unwrap().clone()),
- var_ty.repr(self.fcx.tcx()));
+ var_ty.repr());
}
}
visit::walk_pat(self, p);
let ret_ty = fn_sig.output;
debug!("check_fn(arg_tys={}, ret_ty={}, fn_id={})",
- arg_tys.repr(tcx),
- ret_ty.repr(tcx),
+ arg_tys.repr(),
+ ret_ty.repr(),
fn_id);
// Create the function context. This is either derived from scratch or,
debug!("fn-sig-map: fn_id={} fn_sig_tys={}",
fn_id,
- fn_sig_tys.repr(tcx));
+ fn_sig_tys.repr());
inherited.fn_sig_map.borrow_mut().insert(fn_id, fn_sig_tys);
body: &'tcx ast::Block,
id: ast::NodeId, span: Span) {
debug!("check_method_body(item_generics={}, id={})",
- item_generics.repr(ccx.tcx), id);
+ item_generics.repr(), id);
let param_env = ParameterEnvironment::for_item(ccx.tcx, id);
let fty = ty::node_id_to_type(ccx.tcx, id);
- debug!("check_method_body: fty={}", fty.repr(ccx.tcx));
+ debug!("check_method_body: fty={}", fty.repr());
check_bare_fn(ccx, &sig.decl, body, id, span, fty, param_env);
}
"item `{}` is an associated const, \
which doesn't match its trait `{}`",
token::get_name(impl_const_ty.name()),
- impl_trait_ref.repr(tcx))
+ impl_trait_ref.repr())
}
}
}
"associated const `{}` is not a member of \
trait `{}`",
token::get_name(impl_const_ty.name()),
- impl_trait_ref.repr(tcx)));
+ impl_trait_ref.repr()));
}
}
}
"item `{}` is an associated method, \
which doesn't match its trait `{}`",
token::get_name(impl_item_ty.name()),
- impl_trait_ref.repr(tcx))
+ impl_trait_ref.repr())
}
}
}
impl_item.span,
&format!("method `{}` is not a member of trait `{}`",
token::get_name(impl_item_ty.name()),
- impl_trait_ref.repr(tcx)));
+ impl_trait_ref.repr()));
}
}
}
"item `{}` is an associated type, \
which doesn't match its trait `{}`",
token::get_name(typedef_ty.name()),
- impl_trait_ref.repr(tcx))
+ impl_trait_ref.repr())
}
}
}
"associated type `{}` is not a member of \
trait `{}`",
token::get_name(typedef_ty.name()),
- impl_trait_ref.repr(tcx)));
+ impl_trait_ref.repr()));
}
}
}
/// version, this version will also select obligations if it seems
/// useful, in an effort to get more type information.
fn resolve_type_vars_if_possible(&self, mut ty: Ty<'tcx>) -> Ty<'tcx> {
- debug!("resolve_type_vars_if_possible(ty={})", ty.repr(self.tcx()));
+ debug!("resolve_type_vars_if_possible(ty={})", ty.repr());
// No ty::infer()? Nothing needs doing.
if !ty::type_has_ty_infer(ty) {
- debug!("resolve_type_vars_if_possible: ty={}", ty.repr(self.tcx()));
+ debug!("resolve_type_vars_if_possible: ty={}", ty.repr());
return ty;
}
// If `ty` is a type variable, see whether we already know what it is.
ty = self.infcx().resolve_type_vars_if_possible(&ty);
if !ty::type_has_ty_infer(ty) {
- debug!("resolve_type_vars_if_possible: ty={}", ty.repr(self.tcx()));
+ debug!("resolve_type_vars_if_possible: ty={}", ty.repr());
return ty;
}
self.select_new_obligations();
ty = self.infcx().resolve_type_vars_if_possible(&ty);
if !ty::type_has_ty_infer(ty) {
- debug!("resolve_type_vars_if_possible: ty={}", ty.repr(self.tcx()));
+ debug!("resolve_type_vars_if_possible: ty={}", ty.repr());
return ty;
}
self.select_obligations_where_possible();
ty = self.infcx().resolve_type_vars_if_possible(&ty);
- debug!("resolve_type_vars_if_possible: ty={}", ty.repr(self.tcx()));
+ debug!("resolve_type_vars_if_possible: ty={}", ty.repr());
ty
}
#[inline]
pub fn write_ty(&self, node_id: ast::NodeId, ty: Ty<'tcx>) {
debug!("write_ty({}, {}) in fcx {}",
- node_id, ty.repr(self.tcx()), self.tag());
+ node_id, ty.repr(), self.tag());
self.inh.node_types.borrow_mut().insert(node_id, ty);
}
if !substs.substs.is_noop() {
debug!("write_substs({}, {}) in fcx {}",
node_id,
- substs.repr(self.tcx()),
+ substs.repr(),
self.tag());
self.inh.item_substs.borrow_mut().insert(node_id, substs);
pub fn write_adjustment(&self,
node_id: ast::NodeId,
adj: ty::AutoAdjustment<'tcx>) {
- debug!("write_adjustment(node_id={}, adj={})", node_id, adj.repr(self.tcx()));
+ debug!("write_adjustment(node_id={}, adj={})", node_id, adj.repr());
if adj.is_identity() {
return;
substs: &Substs<'tcx>,
value: &T)
-> T
- where T : TypeFoldable<'tcx> + Clone + HasProjectionTypes + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + Clone + HasProjectionTypes + Repr
{
let value = value.subst(self.tcx(), substs);
let result = self.normalize_associated_types_in(span, &value);
debug!("instantiate_type_scheme(value={}, substs={}) = {}",
- value.repr(self.tcx()),
- substs.repr(self.tcx()),
- result.repr(self.tcx()));
+ value.repr(),
+ substs.repr(),
+ result.repr());
result
}
fn normalize_associated_types_in<T>(&self, span: Span, value: &T) -> T
- where T : TypeFoldable<'tcx> + Clone + HasProjectionTypes + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + Clone + HasProjectionTypes + Repr
{
self.inh.normalize_associated_types_in(self, span, self.body_id, value)
}
obligation: traits::PredicateObligation<'tcx>)
{
debug!("register_predicate({})",
- obligation.repr(self.tcx()));
+ obligation.repr());
self.inh.fulfillment_cx
.borrow_mut()
.register_predicate_obligation(self.infcx(), obligation);
}
pub fn pat_to_string(&self, pat: &ast::Pat) -> String {
- pat.repr(self.tcx())
+ pat.repr()
}
pub fn expr_ty(&self, ex: &ast::Expr) -> Ty<'tcx> {
assert!(!predicates.has_escaping_regions());
debug!("add_obligations_for_parameters(predicates={})",
- predicates.repr(self.tcx()));
+ predicates.repr());
for obligation in traits::predicates_for_generics(self.tcx(),
cause,
where F: FnMut(Ty<'tcx>, usize) -> Option<T>,
{
debug!("autoderef(base_ty={}, opt_expr={}, lvalue_pref={:?})",
- base_ty.repr(fcx.tcx()),
- opt_expr.repr(fcx.tcx()),
+ base_ty.repr(),
+ opt_expr.repr(),
lvalue_pref);
let mut t = base_ty;
// We've reached the recursion limit, error gracefully.
span_err!(fcx.tcx().sess, sp, E0055,
"reached the recursion limit while auto-dereferencing {}",
- base_ty.repr(fcx.tcx()));
+ base_ty.repr());
(fcx.tcx().types.err, 0, None)
}
let tcx = fcx.tcx();
debug!("try_index_step(expr={}, base_expr.id={}, adjusted_ty={}, \
autoderefs={}, unsize={}, index_ty={})",
- expr.repr(tcx),
- base_expr.repr(tcx),
- adjusted_ty.repr(tcx),
+ expr.repr(),
+ base_expr.repr(),
+ adjusted_ty.repr(),
autoderefs,
unsize,
- index_ty.repr(tcx));
+ index_ty.repr());
let input_ty = fcx.infcx().next_ty_var();
}
}).unwrap_or(vec![]);
debug!("expected_types_for_fn_args(formal={} -> {}, expected={} -> {})",
- formal_args.repr(fcx.tcx()), formal_ret.repr(fcx.tcx()),
- expected_args.repr(fcx.tcx()), expected_ret.repr(fcx.tcx()));
+ formal_args.repr(), formal_ret.repr(),
+ expected_args.repr(), expected_ret.repr());
expected_args
}
F: FnOnce(),
{
debug!(">> typechecking: expr={} expected={}",
- expr.repr(fcx.tcx()), expected.repr(fcx.tcx()));
+ expr.repr(), expected.repr());
// Checks a method call.
fn check_method_call<'a, 'tcx>(fcx: &FnCtxt<'a, 'tcx>,
|base_t, _| {
match base_t.sty {
ty::TyStruct(base_id, substs) => {
- debug!("struct named {}", base_t.repr(tcx));
+ debug!("struct named {}", base_t.repr());
let fields = ty::lookup_struct_fields(tcx, base_id);
fcx.lookup_field_ty(expr.span, base_id, &fields[..],
field.node.name, &(*substs))
ty::TyStruct(base_id, substs) => {
tuple_like = ty::is_tuple_struct(tcx, base_id);
if tuple_like {
- debug!("tuple struct named {}", base_t.repr(tcx));
+ debug!("tuple struct named {}", base_t.repr());
let fields = ty::lookup_struct_fields(tcx, base_id);
fcx.lookup_tup_field_ty(expr.span, base_id, &fields[..],
idx.node, &(*substs))
}
} else {
tcx.sess.span_bug(expr.span,
- &format!("unbound path {}", expr.repr(tcx)))
+ &format!("unbound path {}", expr.repr()))
};
if let Some((opt_ty, segments, def)) =
debug!("type of expr({}) {} is...", expr.id,
syntax::print::pprust::expr_to_string(expr));
debug!("... {}, expected is {}",
- fcx.expr_ty(expr).repr(tcx),
- expected.repr(tcx));
+ fcx.expr_ty(expr).repr(),
+ expected.repr());
unifier();
}
}
}
-impl<'tcx> Repr<'tcx> for Expectation<'tcx> {
- fn repr(&self, tcx: &ty::ctxt<'tcx>) -> String {
+impl<'tcx> Repr for Expectation<'tcx> {
+ fn repr(&self) -> String {
match *self {
NoExpectation => format!("NoExpectation"),
ExpectHasType(t) => format!("ExpectHasType({})",
- t.repr(tcx)),
+ t.repr()),
ExpectCastableToType(t) => format!("ExpectCastableToType({})",
- t.repr(tcx)),
+ t.repr()),
ExpectRvalueLikeUnsized(t) => format!("ExpectRvalueLikeUnsized({})",
- t.repr(tcx)),
+ t.repr()),
}
}
}
"this type cannot be instantiated without an \
instance of itself");
fileline_help!(tcx.sess, sp, "consider using `Option<{}>`",
- item_ty.repr(tcx));
+ item_ty.repr());
false
} else {
true
node_id: ast::NodeId) {
debug!("instantiate_path(path={:?}, def={}, node_id={}, type_scheme={})",
segments,
- def.repr(fcx.tcx()),
+ def.repr(),
node_id,
- type_scheme.repr(fcx.tcx()));
+ type_scheme.repr());
// We need to extract the type parameters supplied by the user in
// the path `path`. Due to the current setup, this is a bit of a
fcx.tcx().sess.span_bug(span,
&format!(
"instantiate_path: (UFCS) {} was a subtype of {} but now is not?",
- self_ty.repr(fcx.tcx()),
- impl_ty.repr(fcx.tcx())));
+ self_ty.repr(),
+ impl_ty.repr()));
}
}
}
assert_eq!(substs.types.len(space), desired.len());
- debug!("Final substs: {}", substs.repr(fcx.tcx()));
+ debug!("Final substs: {}", substs.repr());
}
fn adjust_region_parameters(
tps: &OwnedSlice<ast::TyParam>,
ty: Ty<'tcx>) {
debug!("check_bounds_are_used(n_tps={}, ty={})",
- tps.len(), ty.repr(ccx.tcx));
+ tps.len(), ty.repr());
// make a vector of booleans initially false, set to true when used
if tps.is_empty() { return; }
fty,
|| {
format!("intrinsic has wrong type: expected `{}`",
- fty.user_string(ccx.tcx))
+ fty.user_string())
});
}
}
span_err!(tcx.sess, lhs_expr.span, E0368,
"binary assignment operation `{}=` cannot be applied to types `{}` and `{}`",
ast_util::binop_to_string(op.node),
- lhs_ty.user_string(fcx.tcx()),
- rhs_ty.user_string(fcx.tcx()));
+ lhs_ty.user_string(),
+ rhs_ty.user_string());
fcx.write_error(expr.id);
}
debug!("check_binop(expr.id={}, expr={}, op={:?}, lhs_expr={}, rhs_expr={})",
expr.id,
- expr.repr(tcx),
+ expr.repr(),
op,
- lhs_expr.repr(tcx),
- rhs_expr.repr(tcx));
+ lhs_expr.repr(),
+ rhs_expr.repr());
check_expr(fcx, lhs_expr);
let lhs_ty = fcx.resolve_type_vars_if_possible(fcx.expr_ty(lhs_expr));
if ty::type_is_simd(tcx, lhs_ty) {
let unit_ty = ty::simd_type(tcx, lhs_ty);
debug!("enforce_builtin_binop_types: lhs_ty={} unit_ty={}",
- lhs_ty.repr(tcx),
- unit_ty.repr(tcx));
+ lhs_ty.repr(),
+ unit_ty.repr());
if !ty::type_is_integral(unit_ty) {
tcx.sess.span_err(
lhs_expr.span,
&format!("binary comparison operation `{}` not supported \
for floating point SIMD vector `{}`",
ast_util::binop_to_string(op.node),
- lhs_ty.user_string(tcx)));
+ lhs_ty.user_string()));
tcx.types.err
} else {
lhs_ty
{
debug!("check_overloaded_binop(expr.id={}, lhs_ty={})",
expr.id,
- lhs_ty.repr(fcx.tcx()));
+ lhs_ty.repr());
let (name, trait_def_id) = name_and_trait_def_id(fcx, op);
span_err!(fcx.tcx().sess, lhs_expr.span, E0369,
"binary operation `{}` cannot be applied to type `{}`",
ast_util::binop_to_string(op.node),
- lhs_ty.user_string(fcx.tcx()));
+ lhs_ty.user_string());
}
fcx.tcx().types.err
}
-> Result<Ty<'tcx>,()>
{
debug!("lookup_op_method(expr={}, lhs_ty={}, opname={:?}, trait_did={}, lhs_expr={})",
- expr.repr(fcx.tcx()),
- lhs_ty.repr(fcx.tcx()),
+ expr.repr(),
+ lhs_ty.repr(),
opname,
- trait_did.repr(fcx.tcx()),
- lhs_expr.repr(fcx.tcx()));
+ trait_did.repr(),
+ lhs_expr.repr());
let method = match trait_did {
Some(trait_did) => {
for r_o in ®ion_obligations {
debug!("visit_region_obligations: r_o={}",
- r_o.repr(self.tcx()));
+ r_o.repr());
let sup_type = self.resolve_type(r_o.sup_type);
let origin = infer::RelateParamBound(r_o.cause.span, sup_type);
type_must_outlive(self, origin, sup_type, r_o.sub_region);
for &ty in fn_sig_tys {
let ty = self.resolve_type(ty);
- debug!("relate_free_regions(t={})", ty.repr(tcx));
+ debug!("relate_free_regions(t={})", ty.repr());
let body_scope = CodeExtent::from_node_id(body_id);
let body_scope = ty::ReScope(body_scope);
let implications = implicator::implications(self.fcx.infcx(), self.fcx, body_id,
// that don't go into the free-region-map but which we use
// here.
for implication in implications {
- debug!("implication: {}", implication.repr(tcx));
+ debug!("implication: {}", implication.repr());
match implication {
implicator::Implication::RegionSubRegion(_,
ty::ReFree(free_a),
}
implicator::Implication::RegionSubGeneric(_, r_a, ref generic_b) => {
debug!("RegionSubGeneric: {} <= {}",
- r_a.repr(tcx), generic_b.repr(tcx));
+ r_a.repr(), generic_b.repr());
self.region_bound_pairs.push((r_a, generic_b.clone()));
}
fn constrain_bindings_in_pat(pat: &ast::Pat, rcx: &mut Rcx) {
let tcx = rcx.fcx.tcx();
- debug!("regionck::visit_pat(pat={})", pat.repr(tcx));
+ debug!("regionck::visit_pat(pat={})", pat.repr());
pat_util::pat_bindings(&tcx.def_map, pat, |_, id, span, _| {
// If we have a variable that contains region'd data, that
// data will be accessible from anywhere that the variable is
fn visit_expr(rcx: &mut Rcx, expr: &ast::Expr) {
debug!("regionck::visit_expr(e={}, repeating_scope={})",
- expr.repr(rcx.fcx.tcx()), rcx.repeating_scope);
+ expr.repr(), rcx.repeating_scope);
// No matter what, the type of each expression must outlive the
// scope of that expression. This also guarantees basic WF.
source_expr: &ast::Expr)
{
debug!("constrain_cast(cast_expr={}, source_expr={})",
- cast_expr.repr(rcx.tcx()),
- source_expr.repr(rcx.tcx()));
+ cast_expr.repr(),
+ source_expr.repr());
let source_ty = rcx.resolve_node_type(source_expr.id);
let target_ty = rcx.resolve_node_type(cast_expr.id);
from_ty: Ty<'tcx>,
to_ty: Ty<'tcx>) {
debug!("walk_cast(from_ty={}, to_ty={})",
- from_ty.repr(rcx.tcx()),
- to_ty.repr(rcx.tcx()));
+ from_ty.repr(),
+ to_ty.repr());
match (&from_ty.sty, &to_ty.sty) {
/*From:*/ (&ty::TyRef(from_r, ref from_mt),
/*To: */ &ty::TyRef(to_r, ref to_mt)) => {
//
// tcx.sess.span_bug(
// callee_expr.span,
- // format!("Calling non-function: {}", callee_ty.repr(tcx)));
+ // format!("Calling non-function: {}", callee_ty.repr()));
}
}
}
debug!("constrain_call(call_expr={}, \
receiver={}, \
implicitly_ref_args={})",
- call_expr.repr(tcx),
- receiver.repr(tcx),
+ call_expr.repr(),
+ receiver.repr(),
implicitly_ref_args);
// `callee_region` is the scope representing the time in which the
let callee_scope = CodeExtent::from_node_id(call_expr.id);
let callee_region = ty::ReScope(callee_scope);
- debug!("callee_region={}", callee_region.repr(tcx));
+ debug!("callee_region={}", callee_region.repr());
for arg_expr in arg_exprs {
- debug!("Argument: {}", arg_expr.repr(tcx));
+ debug!("Argument: {}", arg_expr.repr());
// ensure that any regions appearing in the argument type are
// valid for at least the lifetime of the function:
// as loop above, but for receiver
if let Some(r) = receiver {
- debug!("receiver: {}", r.repr(tcx));
+ debug!("receiver: {}", r.repr());
type_of_node_must_outlive(
rcx, infer::CallRcvr(r.span),
r.id, callee_region);
mut derefd_ty: Ty<'tcx>)
{
debug!("constrain_autoderefs(deref_expr={}, derefs={}, derefd_ty={})",
- deref_expr.repr(rcx.tcx()),
+ deref_expr.repr(),
derefs,
- derefd_ty.repr(rcx.tcx()));
+ derefd_ty.repr());
let r_deref_expr = ty::ReScope(CodeExtent::from_node_id(deref_expr.id));
for i in 0..derefs {
derefd_ty = match rcx.fcx.inh.method_map.borrow().get(&method_call) {
Some(method) => {
debug!("constrain_autoderefs: #{} is overloaded, method={}",
- i, method.repr(rcx.tcx()));
+ i, method.repr());
// Treat overloaded autoderefs as if an AutoRef adjustment
// was applied on the base type, as that is always the case.
rcx.tcx().sess.span_bug(
deref_expr.span,
&format!("bad overloaded deref type {}",
- method.ty.repr(rcx.tcx())))
+ method.ty.repr()))
}
};
debug!("constrain_autoderefs: receiver r={:?} m={:?}",
- r.repr(rcx.tcx()), m);
+ r.repr(), m);
{
let mc = mc::MemCategorizationContext::new(rcx.fcx);
let self_cmt = ignore_err!(mc.cat_expr_autoderefd(deref_expr, i));
debug!("constrain_autoderefs: self_cmt={:?}",
- self_cmt.repr(rcx.tcx()));
+ self_cmt.repr());
link_region(rcx, deref_expr.span, r,
ty::BorrowKind::from_mutbl(m), self_cmt);
}
.span_bug(span,
&format!("unexpected rvalue region in rvalue \
destructor safety checking: `{}`",
- region.repr(rcx.tcx())));
+ region.repr()));
}
}
}
|method_call| rcx.resolve_method_type(method_call));
debug!("constrain_regions_in_type_of_node(\
ty={}, ty0={}, id={}, minimum_lifetime={:?})",
- ty.user_string(tcx), ty0.user_string(tcx),
+ ty.user_string(), ty0.user_string(),
id, minimum_lifetime);
type_must_outlive(rcx, origin, ty, minimum_lifetime);
}
/// resulting pointer is linked to the lifetime of its guarantor (if any).
fn link_addr_of(rcx: &mut Rcx, expr: &ast::Expr,
mutability: ast::Mutability, base: &ast::Expr) {
- debug!("link_addr_of(expr={}, base={})", expr.repr(rcx.tcx()), base.repr(rcx.tcx()));
+ debug!("link_addr_of(expr={}, base={})", expr.repr(), base.repr());
let cmt = {
let mc = mc::MemCategorizationContext::new(rcx.fcx);
ignore_err!(mc.cat_expr(base))
};
- debug!("link_addr_of: cmt={}", cmt.repr(rcx.tcx()));
+ debug!("link_addr_of: cmt={}", cmt.repr());
link_region_from_node_type(rcx, expr.span, expr.id, mutability, cmt);
}
debug!("regionck::for_match()");
let mc = mc::MemCategorizationContext::new(rcx.fcx);
let discr_cmt = ignore_err!(mc.cat_expr(discr));
- debug!("discr_cmt={}", discr_cmt.repr(rcx.tcx()));
+ debug!("discr_cmt={}", discr_cmt.repr());
for arm in arms {
for root_pat in &arm.pats {
link_pattern(rcx, mc, discr_cmt.clone(), &**root_pat);
let re_scope = ty::ReScope(body_scope);
let arg_cmt = mc.cat_rvalue(arg.id, arg.ty.span, re_scope, arg_ty);
debug!("arg_ty={} arg_cmt={}",
- arg_ty.repr(rcx.tcx()),
- arg_cmt.repr(rcx.tcx()));
+ arg_ty.repr(),
+ arg_cmt.repr());
link_pattern(rcx, mc, arg_cmt, &*arg.pat);
}
}
discr_cmt: mc::cmt<'tcx>,
root_pat: &ast::Pat) {
debug!("link_pattern(discr_cmt={}, root_pat={})",
- discr_cmt.repr(rcx.tcx()),
- root_pat.repr(rcx.tcx()));
+ discr_cmt.repr(),
+ root_pat.repr());
let _ = mc.cat_pattern(discr_cmt, root_pat, |mc, sub_cmt, sub_pat| {
match sub_pat.node {
// `ref x` pattern
debug!("link_autoref(autoref={:?})", autoref);
let mc = mc::MemCategorizationContext::new(rcx.fcx);
let expr_cmt = ignore_err!(mc.cat_expr_autoderefd(expr, autoderefs));
- debug!("expr_cmt={}", expr_cmt.repr(rcx.tcx()));
+ debug!("expr_cmt={}", expr_cmt.repr());
match *autoref {
ty::AutoPtr(r, m) => {
callee_scope: CodeExtent) {
let tcx = rcx.tcx();
debug!("link_by_ref(expr={}, callee_scope={:?})",
- expr.repr(tcx), callee_scope);
+ expr.repr(), callee_scope);
let mc = mc::MemCategorizationContext::new(rcx.fcx);
let expr_cmt = ignore_err!(mc.cat_expr(expr));
let borrow_region = ty::ReScope(callee_scope);
mutbl: ast::Mutability,
cmt_borrowed: mc::cmt<'tcx>) {
debug!("link_region_from_node_type(id={:?}, mutbl={:?}, cmt_borrowed={})",
- id, mutbl, cmt_borrowed.repr(rcx.tcx()));
+ id, mutbl, cmt_borrowed.repr());
let rptr_ty = rcx.resolve_node_type(id);
if !ty::type_is_error(rptr_ty) {
let tcx = rcx.fcx.ccx.tcx;
- debug!("rptr_ty={}", rptr_ty.user_string(tcx));
+ debug!("rptr_ty={}", rptr_ty.user_string());
let r = ty::ty_region(tcx, span, rptr_ty);
link_region(rcx, span, &r, ty::BorrowKind::from_mutbl(mutbl),
cmt_borrowed);
loop {
debug!("link_region(borrow_region={}, borrow_kind={}, borrow_cmt={})",
- borrow_region.repr(rcx.tcx()),
- borrow_kind.repr(rcx.tcx()),
- borrow_cmt.repr(rcx.tcx()));
+ borrow_region.repr(),
+ borrow_kind.repr(),
+ borrow_cmt.repr());
match borrow_cmt.cat.clone() {
mc::cat_deref(ref_cmt, _,
mc::Implicit(ref_kind, ref_region)) |
rcx.tcx().sess.span_bug(
span,
&format!("Illegal upvar id: {}",
- upvar_id.repr(rcx.tcx())));
+ upvar_id.repr()));
}
}
}
};
debug!("link_reborrowed_region: {} <= {}",
- borrow_region.repr(rcx.tcx()),
- ref_region.repr(rcx.tcx()));
+ borrow_region.repr(),
+ ref_region.repr());
rcx.fcx.mk_subr(cause, *borrow_region, ref_region);
// If we end up needing to recurse and establish a region link
region: ty::Region)
{
debug!("type_must_outlive(ty={}, region={})",
- ty.repr(rcx.tcx()),
- region.repr(rcx.tcx()));
+ ty.repr(),
+ region.repr());
let implications = implicator::implications(rcx.fcx.infcx(), rcx.fcx, rcx.body_id,
ty, region, origin.span());
for implication in implications {
- debug!("implication: {}", implication.repr(rcx.tcx()));
+ debug!("implication: {}", implication.repr());
match implication {
implicator::Implication::RegionSubRegion(None, r_a, r_b) => {
rcx.fcx.mk_subr(origin.clone(), r_a, r_b);
def_id: ast::DefId,
substs: &'tcx Substs<'tcx>) {
debug!("closure_must_outlive(region={}, def_id={}, substs={})",
- region.repr(rcx.tcx()), def_id.repr(rcx.tcx()), substs.repr(rcx.tcx()));
+ region.repr(), def_id.repr(), substs.repr());
let upvars = rcx.fcx.closure_upvars(def_id, substs).unwrap();
for upvar in upvars {
let param_env = &rcx.fcx.inh.param_env;
debug!("param_must_outlive(region={}, generic={})",
- region.repr(rcx.tcx()),
- generic.repr(rcx.tcx()));
+ region.repr(),
+ generic.repr());
// To start, collect bounds from user:
let mut param_bounds =
// don't know that this holds from first principles.
for &(ref r, ref p) in &rcx.region_bound_pairs {
debug!("generic={} p={}",
- generic.repr(rcx.tcx()),
- p.repr(rcx.tcx()));
+ generic.repr(),
+ p.repr());
if generic == p {
param_bounds.push(*r);
}
let infcx = fcx.infcx();
debug!("projection_bounds(projection_ty={})",
- projection_ty.repr(tcx));
+ projection_ty.repr());
let ty = ty::mk_projection(tcx, projection_ty.trait_ref.clone(), projection_ty.item_name);
};
debug!("projection_bounds: outlives={} (1)",
- outlives.repr(tcx));
+ outlives.repr());
// apply the substitutions (and normalize any projected types)
let outlives = fcx.instantiate_type_scheme(span,
&outlives);
debug!("projection_bounds: outlives={} (2)",
- outlives.repr(tcx));
+ outlives.repr());
let region_result = infcx.commit_if_ok(|_| {
let (outlives, _) =
&outlives);
debug!("projection_bounds: outlives={} (3)",
- outlives.repr(tcx));
+ outlives.repr());
// check whether this predicate applies to our current projection
match infer::mk_eqty(infcx, false, infer::Misc(span), ty, outlives.0) {
});
debug!("projection_bounds: region_result={}",
- region_result.repr(tcx));
+ region_result.repr());
region_result.ok()
})
self.closures_with_inferred_kinds.insert(expr.id);
self.fcx.inh.closure_kinds.borrow_mut().insert(closure_def_id, ty::FnClosureKind);
debug!("check_closure: adding closure_id={} to closures_with_inferred_kinds",
- closure_def_id.repr(self.tcx()));
+ closure_def_id.repr());
}
ty::with_freevars(self.tcx(), expr.id, |freevars| {
mode: euv::ConsumeMode)
{
debug!("adjust_upvar_borrow_kind_for_consume(cmt={}, mode={:?})",
- cmt.repr(self.tcx()), mode);
+ cmt.repr(), mode);
// we only care about moves
match mode {
// by value instead
let guarantor = cmt.guarantor();
debug!("adjust_upvar_borrow_kind_for_consume: guarantor={}",
- guarantor.repr(self.tcx()));
+ guarantor.repr());
match guarantor.cat {
mc::cat_deref(_, _, mc::BorrowedPtr(..)) |
mc::cat_deref(_, _, mc::Implicit(..)) => {
/// those upvars must be borrowed using an `&mut` borrow.
fn adjust_upvar_borrow_kind_for_mut(&mut self, cmt: mc::cmt<'tcx>) {
debug!("adjust_upvar_borrow_kind_for_mut(cmt={})",
- cmt.repr(self.tcx()));
+ cmt.repr());
match cmt.cat.clone() {
mc::cat_deref(base, _, mc::Unique) |
fn adjust_upvar_borrow_kind_for_unique(&self, cmt: mc::cmt<'tcx>) {
debug!("adjust_upvar_borrow_kind_for_unique(cmt={})",
- cmt.repr(self.tcx()));
+ cmt.repr());
match cmt.cat.clone() {
mc::cat_deref(base, _, mc::Unique) |
cmt: mc::cmt<'tcx>,
mode: euv::ConsumeMode)
{
- debug!("consume(cmt={},mode={:?})", cmt.repr(self.tcx()), mode);
+ debug!("consume(cmt={},mode={:?})", cmt.repr(), mode);
self.adjust_upvar_borrow_kind_for_consume(cmt, mode);
}
cmt: mc::cmt<'tcx>,
mode: euv::ConsumeMode)
{
- debug!("consume_pat(cmt={},mode={:?})", cmt.repr(self.tcx()), mode);
+ debug!("consume_pat(cmt={},mode={:?})", cmt.repr(), mode);
self.adjust_upvar_borrow_kind_for_consume(cmt, mode);
}
_loan_cause: euv::LoanCause)
{
debug!("borrow(borrow_id={}, cmt={}, bk={:?})",
- borrow_id, cmt.repr(self.tcx()), bk);
+ borrow_id, cmt.repr(), bk);
match bk {
ty::ImmBorrow => { }
_mode: euv::MutateMode)
{
debug!("mutate(assignee_cmt={})",
- assignee_cmt.repr(self.tcx()));
+ assignee_cmt.repr());
self.adjust_upvar_borrow_kind_for_mut(assignee_cmt);
}
param_name: ast::Name)
{
span_err!(self.tcx().sess, span, E0392,
- "parameter `{}` is never used", param_name.user_string(self.tcx()));
+ "parameter `{}` is never used", param_name.user_string());
let suggested_marker_id = self.tcx().lang_items.phantom_data();
match suggested_marker_id {
self.tcx().sess.fileline_help(
span,
&format!("consider removing `{}` or using a marker such as `{}`",
- param_name.user_string(self.tcx()),
+ param_name.user_string(),
ty::item_path_str(self.tcx(), def_id)));
}
None => {
"cannot bound type `{}`, where clause \
bounds may only be attached to types involving \
type parameters",
- bounded_ty.repr(tcx))
+ bounded_ty.repr())
}
fn is_ty_param(ty: ty::Ty) -> bool {
}
fn fold_binder<T>(&mut self, binder: &ty::Binder<T>) -> ty::Binder<T>
- where T : TypeFoldable<'tcx> + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + Repr
{
self.binding_count += 1;
let value = liberate_late_bound_regions(
region::DestructionScopeData::new(self.scope),
binder);
debug!("BoundsChecker::fold_binder: late-bound regions replaced: {} at scope: {:?}",
- value.repr(self.tcx()), self.scope);
+ value.repr(), self.scope);
let value = value.fold_with(self);
self.binding_count -= 1;
ty::Binder(value)
fn fold_ty(&mut self, t: Ty<'tcx>) -> Ty<'tcx> {
debug!("BoundsChecker t={}",
- t.repr(self.tcx()));
+ t.repr());
match self.cache {
Some(ref mut cache) => {
debug!("Type for pattern binding {} (id {}) resolved to {}",
pat_to_string(p),
p.id,
- ty::node_id_to_type(self.tcx(), p.id).repr(self.tcx()));
+ ty::node_id_to_type(self.tcx(), p.id).repr());
visit::walk_pat(self, p);
}
}
};
debug!("Upvar capture for {} resolved to {}",
- upvar_id.repr(self.tcx()),
- new_upvar_capture.repr(self.tcx()));
+ upvar_id.repr(),
+ new_upvar_capture.repr());
self.fcx.tcx().upvar_capture_map.borrow_mut().insert(*upvar_id, new_upvar_capture);
}
}
let n_ty = self.fcx.node_ty(id);
let n_ty = self.resolve(&n_ty, reason);
write_ty_to_tcx(self.tcx(), id, n_ty);
- debug!("Node {} has type {}", id, n_ty.repr(self.tcx()));
+ debug!("Node {} has type {}", id, n_ty.repr());
// Resolve any substitutions
self.fcx.opt_node_ty_substs(id, |item_substs| {
Some(method) => {
debug!("writeback::resolve_method_map_entry(call={:?}, entry={})",
method_call,
- method.repr(self.tcx()));
+ method.repr());
let new_method = MethodCallee {
origin: self.resolve(&method.origin, reason),
ty: self.resolve(&method.ty, reason),
Ok(t) => t,
Err(e) => {
debug!("Resolver::fold_ty: input type `{}` not fully resolvable",
- t.repr(self.tcx));
+ t.repr());
self.report_error(e);
self.tcx().types.err
}
inference_context.tcx.sess.span_bug(
span,
&format!("coherence encountered unexpected type searching for base type: {}",
- ty.repr(inference_context.tcx)));
+ ty.repr()));
}
}
}
if let Some(trait_ref) = ty::impl_trait_ref(self.crate_context.tcx,
impl_did) {
debug!("(checking implementation) adding impl for trait '{}', item '{}'",
- trait_ref.repr(self.crate_context.tcx),
+ trait_ref.repr(),
token::get_ident(item.ident));
enforce_trait_manually_implementable(self.crate_context.tcx,
all_impl_items: &mut Vec<ImplOrTraitItemId>) {
let tcx = self.crate_context.tcx;
debug!("instantiate_default_methods(impl_id={:?}, trait_ref={})",
- impl_id, trait_ref.repr(tcx));
+ impl_id, trait_ref.repr());
let impl_type_scheme = ty::lookup_item_type(tcx, impl_id);
let new_id = tcx.sess.next_node_id();
let new_did = local_def(new_id);
- debug!("new_did={:?} trait_method={}", new_did, trait_method.repr(tcx));
+ debug!("new_did={:?} trait_method={}", new_did, trait_method.repr());
// Create substitutions for the various trait parameters.
let new_method_ty =
&**trait_method,
Some(trait_method.def_id)));
- debug!("new_method_ty={}", new_method_ty.repr(tcx));
+ debug!("new_method_ty={}", new_method_ty.repr());
all_impl_items.push(MethodTraitItemId(new_did));
// construct the polytype for the method based on the
ty: ty::mk_bare_fn(tcx, Some(new_did),
tcx.mk_bare_fn(new_method_ty.fty.clone()))
};
- debug!("new_polytype={}", new_polytype.repr(tcx));
+ debug!("new_polytype={}", new_polytype.repr());
tcx.tcache.borrow_mut().insert(new_did, new_polytype);
tcx.predicates.borrow_mut().insert(new_did, new_method_ty.predicates.clone());
copy_trait.for_each_impl(tcx, |impl_did| {
debug!("check_implementations_of_copy: impl_did={}",
- impl_did.repr(tcx));
+ impl_did.repr());
if impl_did.krate != ast::LOCAL_CRATE {
debug!("check_implementations_of_copy(): impl not in this \
let self_type = ty::lookup_item_type(tcx, impl_did);
debug!("check_implementations_of_copy: self_type={} (bound)",
- self_type.repr(tcx));
+ self_type.repr());
let span = tcx.map.span(impl_did.node);
let param_env = ParameterEnvironment::for_item(tcx, impl_did.node);
assert!(!self_type.has_escaping_regions());
debug!("check_implementations_of_copy: self_type={} (free)",
- self_type.repr(tcx));
+ self_type.repr());
match ty::can_type_implement_copy(¶m_env, span, self_type) {
Ok(()) => {}
trait_def.for_each_impl(tcx, |impl_did| {
debug!("check_implementations_of_coerce_unsized: impl_did={}",
- impl_did.repr(tcx));
+ impl_did.repr());
if impl_did.krate != ast::LOCAL_CRATE {
debug!("check_implementations_of_coerce_unsized(): impl not \
impl_did).unwrap();
let target = *trait_ref.substs.types.get(subst::TypeSpace, 0);
debug!("check_implementations_of_coerce_unsized: {} -> {} (bound)",
- source.repr(tcx), target.repr(tcx));
+ source.repr(), target.repr());
let span = tcx.map.span(impl_did.node);
let param_env = ParameterEnvironment::for_item(tcx, impl_did.node);
assert!(!source.has_escaping_regions());
debug!("check_implementations_of_coerce_unsized: {} -> {} (free)",
- source.repr(tcx), target.repr(tcx));
+ source.repr(), target.repr());
let infcx = new_infer_ctxt(tcx);
} else {
token::get_name(name).to_string()
},
- a.repr(tcx),
- b.repr(tcx))
+ a.repr(),
+ b.repr())
}).collect::<Vec<_>>().connect(", "));
return;
}
let combined_substs = ty::make_substs_for_receiver_types(tcx, trait_ref, method);
debug!("subst_receiver_types_in_method_ty: combined_substs={}",
- combined_substs.repr(tcx));
+ combined_substs.repr());
let method_predicates = method.predicates.subst(tcx, &combined_substs);
let mut method_generics = method.generics.subst(tcx, &combined_substs);
}
debug!("subst_receiver_types_in_method_ty: method_generics={}",
- method_generics.repr(tcx));
+ method_generics.repr());
let method_fty = method.fty.subst(tcx, &combined_substs);
debug!("subst_receiver_types_in_method_ty: method_ty={}",
- method.fty.repr(tcx));
+ method.fty.repr());
ty::Method::new(
method.name,
ast::ItemImpl(_, _, _, None, _, _) => {
// For inherent impls, self type must be a nominal type
// defined in this crate.
- debug!("coherence2::orphan check: inherent impl {}", item.repr(self.tcx));
+ debug!("coherence2::orphan check: inherent impl {}", item.repr());
let self_ty = ty::lookup_item_type(self.tcx, def_id).ty;
match self_ty.sty {
ty::TyEnum(def_id, _) |
}
ast::ItemImpl(_, _, _, Some(_), _, _) => {
// "Trait" impl
- debug!("coherence2::orphan check: trait impl {}", item.repr(self.tcx));
+ debug!("coherence2::orphan check: trait impl {}", item.repr());
let trait_ref = ty::impl_trait_ref(self.tcx, def_id).unwrap();
let trait_def_id = trait_ref.def_id;
match traits::orphan_check(self.tcx, def_id) {
"type parameter `{}` must be used as the type parameter for \
some local type (e.g. `MyStruct<T>`); only traits defined in \
the current crate can be implemented for a type parameter",
- param_ty.user_string(self.tcx));
+ param_ty.user_string());
return;
}
}
// rules, but it invalidates the reasoning from
// `two_foos` above.
debug!("trait_ref={} trait_def_id={} trait_has_default_impl={}",
- trait_ref.repr(self.tcx),
- trait_def_id.repr(self.tcx),
+ trait_ref.repr(),
+ trait_def_id.repr(),
ty::trait_has_default_impl(self.tcx, trait_def_id));
if
ty::trait_has_default_impl(self.tcx, trait_def_id) &&
can only be implemented for a struct/enum type, \
not `{}`",
ty::item_path_str(self.tcx, trait_def_id),
- self_ty.user_string(self.tcx)))
+ self_ty.user_string()))
}
};
}
ast::ItemDefaultImpl(..) => {
// "Trait" impl
- debug!("coherence2::orphan check: default trait impl {}", item.repr(self.tcx));
+ debug!("coherence2::orphan check: default trait impl {}", item.repr());
let trait_ref = ty::impl_trait_ref(self.tcx, def_id).unwrap();
if trait_ref.def_id.krate != ast::LOCAL_CRATE {
span_err!(self.tcx.sess, item.span, E0318,
trait_def: &'tcx ty::TraitDef<'tcx>)
{
debug!("check_for_overlapping_impls_of_trait(trait_def={})",
- trait_def.repr(self.tcx));
+ trait_def.repr());
// We should already know all impls of this trait, so these
// borrows are safe.
impl1_def_id, impl2_def_id)
{
debug!("check_if_impls_overlap({}, {}, {})",
- trait_def_id.repr(self.tcx),
- impl1_def_id.repr(self.tcx),
- impl2_def_id.repr(self.tcx));
+ trait_def_id.repr(),
+ impl1_def_id.repr(),
+ impl2_def_id.repr());
let infcx = infer::new_infer_ctxt(self.tcx);
if traits::overlapping_impls(&infcx, impl1_def_id, impl2_def_id) {
span_err!(self.tcx.sess, item.span, E0371,
"the object type `{}` automatically \
implements the trait `{}`",
- trait_ref.self_ty().user_string(self.tcx),
+ trait_ref.self_ty().user_string(),
ty::item_path_str(self.tcx, trait_def_id));
}
}
(ast::Unsafety::Normal, ast::Unsafety::Unsafe, _) => {
span_err!(self.tcx.sess, item.span, E0199,
"implementing the trait `{}` is not unsafe",
- trait_ref.user_string(self.tcx));
+ trait_ref.user_string());
}
(ast::Unsafety::Unsafe,
ast::Unsafety::Normal, ast::ImplPolarity::Positive) => {
span_err!(self.tcx.sess, item.span, E0200,
"the trait `{}` requires an `unsafe impl` declaration",
- trait_ref.user_string(self.tcx));
+ trait_ref.user_string());
}
(ast::Unsafety::Unsafe,
tcx.sess.note(
&format!("the cycle begins when computing the bounds \
for type parameter `{}`...",
- def.name.user_string(tcx)));
+ def.name.user_string()));
}
}
tcx.sess.note(
&format!("...which then requires computing the bounds \
for type parameter `{}`...",
- def.name.user_string(tcx)));
+ def.name.user_string()));
}
}
}
tcx.sess.note(
&format!("...which then again requires computing the bounds \
for type parameter `{}`, completing the cycle.",
- def.name.user_string(tcx)));
+ def.name.user_string()));
}
}
}
let item = match tcx.map.get(trait_id.node) {
ast_map::NodeItem(item) => item,
- _ => tcx.sess.bug(&format!("get_trait_def({}): not an item", trait_id.repr(tcx)))
+ _ => tcx.sess.bug(&format!("get_trait_def({}): not an item", trait_id.repr()))
};
trait_def_of_item(self, &*item)
-> Result<(), ErrorReported>
{
debug!("ensure_super_predicates(trait_def_id={})",
- trait_def_id.repr(self.tcx()));
+ trait_def_id.repr());
self.ccx.ensure_super_predicates(span, trait_def_id)
}
let fty = ty::mk_bare_fn(ccx.tcx, Some(def_id),
ccx.tcx.mk_bare_fn(ty_method.fty.clone()));
debug!("method {} (id {}) has type {}",
- ident.repr(ccx.tcx), id, fty.repr(ccx.tcx));
+ ident.repr(), id, fty.repr());
ccx.tcx.tcache.borrow_mut().insert(def_id,TypeScheme {
generics: ty_method.generics.clone(),
ty: fty
write_ty_to_tcx(ccx.tcx, id, fty);
debug!("writing method type: def_id={:?} mty={}",
- def_id, ty_method.repr(ccx.tcx));
+ def_id, ty_method.repr());
ccx.tcx.impl_or_trait_items.borrow_mut().insert(def_id,
ty::MethodTraitItem(Rc::new(ty_method)));
where I: Iterator<Item=(&'i ast::MethodSig, ast::NodeId, ast::Ident, ast::Visibility, Span)>
{
debug!("convert_methods(untransformed_rcvr_ty={}, rcvr_ty_generics={}, rcvr_ty_predicates={})",
- untransformed_rcvr_ty.repr(ccx.tcx),
- rcvr_ty_generics.repr(ccx.tcx),
- rcvr_ty_predicates.repr(ccx.tcx));
+ untransformed_rcvr_ty.repr(),
+ rcvr_ty_generics.repr(),
+ rcvr_ty_predicates.repr());
let tcx = ccx.tcx;
let mut seen_methods = FnvHashSet();
{
let tcx = ccx.tcx;
- debug!("ensure_super_predicates_step(trait_def_id={})", trait_def_id.repr(tcx));
+ debug!("ensure_super_predicates_step(trait_def_id={})", trait_def_id.repr());
if trait_def_id.krate != ast::LOCAL_CRATE {
// If this trait comes from an external crate, then all of the
predicates: VecPerParamSpace::new(superbounds, vec![], vec![])
};
debug!("superpredicates for trait {} = {}",
- local_def(item.id).repr(ccx.tcx),
- superpredicates.repr(ccx.tcx));
+ local_def(item.id).repr(),
+ superpredicates.repr());
tcx.super_predicates.borrow_mut().insert(trait_def_id, superpredicates.clone());
.map(|tr| tr.def_id())
.collect();
- debug!("ensure_super_predicates_step: def_ids={}", def_ids.repr(tcx));
+ debug!("ensure_super_predicates_step: def_ids={}", def_ids.repr());
def_ids
}
scheme.generics.types.iter()
.map(|t| match t.object_lifetime_default {
Some(ty::ObjectLifetimeDefault::Specific(r)) =>
- r.user_string(tcx),
+ r.user_string(),
d =>
- d.repr(ccx.tcx),
+ d.repr(),
})
.collect::<Vec<String>>()
.connect(",");
-> ty::Generics<'tcx>
{
debug!("ty_generics_for_trait(trait_id={}, substs={})",
- local_def(trait_id).repr(ccx.tcx), substs.repr(ccx.tcx));
+ local_def(trait_id).repr(), substs.repr());
let mut generics = ty_generics_for_type_or_impl(ccx, ast_generics);
debug!("required_type={} required_type_free={} \
base_type={} base_type_free={}",
- required_type.repr(tcx),
- required_type_free.repr(tcx),
- base_type.repr(tcx),
- base_type_free.repr(tcx));
+ required_type.repr(),
+ required_type_free.repr(),
+ base_type.repr(),
+ base_type_free.repr());
let infcx = infer::new_infer_ctxt(tcx);
drop(::require_same_types(tcx,
required_type_free,
|| {
format!("mismatched self type: expected `{}`",
- required_type.user_string(tcx))
+ required_type.user_string())
}));
// We could conceviably add more free-region relations here,
scope: region::DestructionScopeData,
value: &T)
-> T
- where T : TypeFoldable<'tcx> + Repr<'tcx>
+ where T : TypeFoldable<'tcx> + Repr
{
/*!
* Convert early-bound regions into free regions; normally this is done by
idx: index as u32,
name: ty_param.ident.name };
if !input_parameters.contains(&ctp::Parameter::Type(param_ty)) {
- report_unused_parameter(tcx, ty_param.span, "type", ¶m_ty.user_string(tcx));
+ report_unused_parameter(tcx, ty_param.span, "type", ¶m_ty.user_string());
}
}
!input_parameters.contains(&ctp::Parameter::Region(region))
{
report_unused_parameter(tcx, lifetime_def.lifetime.span,
- "lifetime", ®ion.name.user_string(tcx));
+ "lifetime", ®ion.name.user_string());
}
}
// Functions that write types into the node type table
fn write_ty_to_tcx<'tcx>(tcx: &ty::ctxt<'tcx>, node_id: ast::NodeId, ty: Ty<'tcx>) {
- debug!("write_ty_to_tcx({}, {})", node_id, ty.repr(tcx));
+ debug!("write_ty_to_tcx({}, {})", node_id, ty.repr());
assert!(!ty::type_needs_infer(ty));
tcx.node_type_insert(node_id, ty);
}
if !item_substs.is_noop() {
debug!("write_substs_to_tcx({}, {})",
node_id,
- item_substs.repr(tcx));
+ item_substs.repr());
assert!(item_substs.substs.types.all(|t| !ty::type_needs_infer(*t)));
require_same_types(tcx, None, false, main_span, main_t, se_ty,
|| {
format!("main function expects type: `{}`",
- se_ty.user_string(ccx.tcx))
+ se_ty.user_string())
});
}
_ => {
tcx.sess.span_bug(main_span,
&format!("main has a non-function type: found \
`{}`",
- main_t.repr(tcx)));
+ main_t.repr()));
}
}
}
require_same_types(tcx, None, false, start_span, start_t, se_ty,
|| {
format!("start function expects type: `{}`",
- se_ty.user_string(ccx.tcx))
+ se_ty.user_string())
});
}
tcx.sess.span_bug(start_span,
&format!("start has a non-function type: found \
`{}`",
- start_t.repr(tcx)));
+ start_t.repr()));
}
}
}
impl<'a, 'tcx, 'v> Visitor<'v> for TermsContext<'a, 'tcx> {
fn visit_item(&mut self, item: &ast::Item) {
- debug!("add_inferreds for item {}", item.repr(self.tcx));
+ debug!("add_inferreds for item {}", item.repr());
match item.node {
ast::ItemEnum(_, ref generics) |
let tcx = self.terms_cx.tcx;
debug!("visit_item item={}",
- item.repr(tcx));
+ item.repr());
match item.node {
ast::ItemEnum(ref enum_definition, _) => {
trait_ref: ty::TraitRef<'tcx>,
variance: VarianceTermPtr<'a>) {
debug!("add_constraints_from_trait_ref: trait_ref={} variance={:?}",
- trait_ref.repr(self.tcx()),
+ trait_ref.repr(),
variance);
let trait_def = ty::lookup_trait_def(self.tcx(), trait_ref.def_id);
ty: Ty<'tcx>,
variance: VarianceTermPtr<'a>) {
debug!("add_constraints_from_ty(ty={}, variance={:?})",
- ty.repr(self.tcx()),
+ ty.repr(),
variance);
match ty.sty {
self.tcx().sess.bug(
&format!("unexpected type encountered in \
variance inference: {}",
- ty.repr(self.tcx())));
+ ty.repr()));
}
}
}
substs: &subst::Substs<'tcx>,
variance: VarianceTermPtr<'a>) {
debug!("add_constraints_from_substs(def_id={}, substs={}, variance={:?})",
- def_id.repr(self.tcx()),
- substs.repr(self.tcx()),
+ def_id.repr(),
+ substs.repr(),
variance);
for p in type_param_defs {
.sess
.bug(&format!("unexpected region encountered in variance \
inference: {}",
- region.repr(self.tcx())));
+ region.repr()));
}
}
}
};
debug!("item_id={} item_variances={}",
item_id,
- item_variances.repr(tcx));
+ item_variances.repr());
let item_def_id = ast_util::local_def(item_id);
// For unit testing: check for a special "rustc_variance"
// attribute and report an error with various results if found.
if ty::has_attr(tcx, item_def_id, "rustc_variance") {
- let found = item_variances.repr(tcx);
+ let found = item_variances.repr();
span_err!(tcx.sess, tcx.map.span(item_id), E0208, "{}", &found[..]);
}
projects / rust.git / commitdiff