Skip to content

Commit cf12a79

Browse files
committed
fix stale method names
1 parent beae6c7 commit cf12a79

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

src/librustc/traits/project.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,14 +1034,14 @@ fn confirm_object_candidate<'cx,'tcx>(
10341034
{
10351035
let self_ty = obligation_trait_ref.self_ty();
10361036
let object_ty = selcx.infcx().shallow_resolve(self_ty);
1037-
debug!("assemble_candidates_from_object_type(object_ty={:?})",
1037+
debug!("confirm_object_candidate(object_ty={:?})",
10381038
object_ty);
10391039
let data = match object_ty.sty {
10401040
ty::TyTrait(ref data) => data,
10411041
_ => {
10421042
span_bug!(
10431043
obligation.cause.span,
1044-
"assemble_candidates_from_object_type called with non-object: {:?}",
1044+
"confirm_object_candidate called with non-object: {:?}",
10451045
object_ty);
10461046
}
10471047
};

src/librustc_typeck/astconv.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -931,10 +931,10 @@ fn ast_type_binding_to_poly_projection_predicate<'tcx>(
931931
let br_name = match *br {
932932
ty::BrNamed(_, name) => name,
933933
_ => {
934-
this.tcx().sess.span_bug(
934+
span_bug!(
935935
binding.span,
936-
&format!("anonymous bound region {:?} in binding but not trait ref",
937-
br));
936+
"anonymous bound region {:?} in binding but not trait ref",
937+
br);
938938
}
939939
};
940940
this.tcx().sess.add_lint(
@@ -1710,11 +1710,10 @@ pub fn ast_ty_to_ty<'tcx>(this: &AstConv<'tcx>,
17101710
let br_name = match *br {
17111711
ty::BrNamed(_, name) => name,
17121712
_ => {
1713-
this.tcx().sess.span_bug(
1713+
span_bug!(
17141714
bf.decl.output.span(),
1715-
&format!("anonymous bound region {:?} in \
1716-
return but not args",
1717-
br));
1715+
"anonymous bound region {:?} in return but not args",
1716+
br);
17181717
}
17191718
};
17201719
this.tcx().sess.add_lint(

0 commit comments

Comments
 (0)