Skip to content

Commit c534a14

Browse files
committed
fix stale method names
1 parent 49c6281 commit c534a14

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
@@ -1024,14 +1024,14 @@ fn confirm_object_candidate<'cx,'tcx>(
10241024
{
10251025
let self_ty = obligation_trait_ref.self_ty();
10261026
let object_ty = selcx.infcx().shallow_resolve(self_ty);
1027-
debug!("assemble_candidates_from_object_type(object_ty={:?})",
1027+
debug!("confirm_object_candidate(object_ty={:?})",
10281028
object_ty);
10291029
let data = match object_ty.sty {
10301030
ty::TyTrait(ref data) => data,
10311031
_ => {
10321032
span_bug!(
10331033
obligation.cause.span,
1034-
"assemble_candidates_from_object_type called with non-object: {:?}",
1034+
"confirm_object_candidate called with non-object: {:?}",
10351035
object_ty);
10361036
}
10371037
};

src/librustc_typeck/astconv.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -930,10 +930,10 @@ fn ast_type_binding_to_poly_projection_predicate<'tcx>(
930930
let br_name = match *br {
931931
ty::BrNamed(_, name) => name,
932932
_ => {
933-
this.tcx().sess.span_bug(
933+
span_bug!(
934934
binding.span,
935-
&format!("anonymous bound region {:?} in binding but not trait ref",
936-
br));
935+
"anonymous bound region {:?} in binding but not trait ref",
936+
br);
937937
}
938938
};
939939
this.tcx().sess.add_lint(
@@ -1709,11 +1709,10 @@ pub fn ast_ty_to_ty<'tcx>(this: &AstConv<'tcx>,
17091709
let br_name = match *br {
17101710
ty::BrNamed(_, name) => name,
17111711
_ => {
1712-
this.tcx().sess.span_bug(
1712+
span_bug!(
17131713
bf.decl.output.span(),
1714-
&format!("anonymous bound region {:?} in \
1715-
return but not args",
1716-
br));
1714+
"anonymous bound region {:?} in return but not args",
1715+
br);
17171716
}
17181717
};
17191718
this.tcx().sess.add_lint(

0 commit comments

Comments
 (0)