Skip to content

Commit b70d1c6

Browse files
borsbors
committed
Auto merge of #26415 - jroesch:rename-as-predicate, r=nikomatsakis
@nikomatsakis and I ran into this earlier and I figured we should rename the trait and method to match the typical naming convention.
2 parents 912ab64 + 44bccd8 commit b70d1c6

File tree

11 files changed

+57
-57
lines changed

11 files changed

+57
-57
lines changed

‎src/librustc/metadata/tydecode.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub use self::DefIdSource::*;
2121
use middle::region;
2222
use middle::subst;
2323
use middle::subst::VecPerParamSpace;
24-
use middle::ty::{self, AsPredicate, Ty};
24+
use middle::ty::{self, ToPredicate, Ty};
2525

2626
use std::str;
2727
use syntax::abi;
@@ -775,14 +775,14 @@ fn parse_predicate_<'a,'tcx, F>(st: &mut PState<'a, 'tcx>,
775775
F: FnMut(DefIdSource, ast::DefId) -> ast::DefId,
776776
{
777777
match next(st) {
778-
't' => ty::Binder(parse_trait_ref_(st, conv)).as_predicate(),
778+
't' => ty::Binder(parse_trait_ref_(st, conv)).to_predicate(),
779779
'e' => ty::Binder(ty::EquatePredicate(parse_ty_(st, conv),
780-
parse_ty_(st, conv))).as_predicate(),
780+
parse_ty_(st, conv))).to_predicate(),
781781
'r' => ty::Binder(ty::OutlivesPredicate(parse_region_(st, conv),
782-
parse_region_(st, conv))).as_predicate(),
782+
parse_region_(st, conv))).to_predicate(),
783783
'o' => ty::Binder(ty::OutlivesPredicate(parse_ty_(st, conv),
784-
parse_region_(st, conv))).as_predicate(),
785-
'p' => ty::Binder(parse_projection_predicate_(st, conv)).as_predicate(),
784+
parse_region_(st, conv))).to_predicate(),
785+
'p' => ty::Binder(parse_projection_predicate_(st, conv)).to_predicate(),
786786
c => panic!("Encountered invalid character in metadata: {}", c)
787787
}
788788
}

‎src/librustc/middle/implicator.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
use middle::infer::{InferCtxt, GenericKind};
1414
use middle::subst::Substs;
1515
use middle::traits;
16-
use middle::ty::{self, RegionEscape, ToPolyTraitRef, AsPredicate, Ty};
16+
use middle::ty::{self, RegionEscape, ToPolyTraitRef, ToPredicate, Ty};
1717
use middle::ty_fold::{TypeFoldable, TypeFolder};
1818

1919
use syntax::ast;
@@ -445,7 +445,7 @@ pub fn object_region_bounds<'tcx>(
445445
let trait_refs = vec!(ty::Binder(ty::TraitRef::new(principal.0.def_id, substs)));
446446

447447
let mut predicates = others.to_predicates(tcx, open_ty);
448-
predicates.extend(trait_refs.iter().map(|t| t.as_predicate()));
448+
predicates.extend(trait_refs.iter().map(|t| t.to_predicate()));
449449

450450
ty::required_region_bounds(tcx, open_ty, predicates)
451451
}

‎src/librustc/middle/traits/error_reporting.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use super::{
2525

2626
use fmt_macros::{Parser, Piece, Position};
2727
use middle::infer::InferCtxt;
28-
use middle::ty::{self, AsPredicate, ReferencesError, ToPolyTraitRef, TraitRef};
28+
use middle::ty::{self, ToPredicate, ReferencesError, ToPolyTraitRef, TraitRef};
2929
use middle::ty_fold::TypeFoldable;
3030
use std::collections::HashMap;
3131
use std::fmt;
@@ -464,7 +464,7 @@ fn note_obligation_cause_code<'a, 'tcx, T>(infcx: &InferCtxt<'a, 'tcx>,
464464
span_note!(tcx.sess, cause_span,
465465
"required because it appears within the type `{}`",
466466
parent_trait_ref.0.self_ty());
467-
let parent_predicate = parent_trait_ref.as_predicate();
467+
let parent_predicate = parent_trait_ref.to_predicate();
468468
note_obligation_cause_code(infcx, &parent_predicate, cause_span, &*data.parent_code);
469469
}
470470
ObligationCauseCode::ImplDerivedObligation(ref data) => {
@@ -473,7 +473,7 @@ fn note_obligation_cause_code<'a, 'tcx, T>(infcx: &InferCtxt<'a, 'tcx>,
473473
"required because of the requirements on the impl of `{}` for `{}`",
474474
parent_trait_ref,
475475
parent_trait_ref.0.self_ty());
476-
let parent_predicate = parent_trait_ref.as_predicate();
476+
let parent_predicate = parent_trait_ref.to_predicate();
477477
note_obligation_cause_code(infcx, &parent_predicate, cause_span, &*data.parent_code);
478478
}
479479
ObligationCauseCode::CompareImplMethodObligation => {

‎src/librustc/middle/traits/project.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use super::util;
2323

2424
use middle::infer;
2525
use middle::subst::Subst;
26-
use middle::ty::{self, AsPredicate, ReferencesError, RegionEscape,
26+
use middle::ty::{self, ToPredicate, ReferencesError, RegionEscape,
2727
HasProjectionTypes, ToPolyTraitRef, Ty};
2828
use middle::ty_fold::{self, TypeFoldable, TypeFolder};
2929
use syntax::parse::token;
@@ -336,7 +336,7 @@ pub fn normalize_projection_type<'a,'b,'tcx>(
336336
projection_ty: projection_ty,
337337
ty: ty_var
338338
});
339-
let obligation = Obligation::with_depth(cause, depth+1, projection.as_predicate());
339+
let obligation = Obligation::with_depth(cause, depth+1, projection.to_predicate());
340340
Normalized {
341341
value: ty_var,
342342
obligations: vec!(obligation)
@@ -432,7 +432,7 @@ fn normalize_to_error<'a,'tcx>(selcx: &mut SelectionContext<'a,'tcx>,
432432
let trait_ref = projection_ty.trait_ref.to_poly_trait_ref();
433433
let trait_obligation = Obligation { cause: cause,
434434
recursion_depth: depth,
435-
predicate: trait_ref.as_predicate() };
435+
predicate: trait_ref.to_predicate() };
436436
Normalized {
437437
value: selcx.tcx().types.err,
438438
obligations: vec!(trait_obligation)
@@ -646,7 +646,7 @@ fn assemble_candidates_from_object_type<'cx,'tcx>(
646646
};
647647
let projection_bounds = data.projection_bounds_with_self_ty(selcx.tcx(), object_ty);
648648
let env_predicates = projection_bounds.iter()
649-
.map(|p| p.as_predicate())
649+
.map(|p| p.to_predicate())
650650
.collect();
651651
let env_predicates = elaborate_predicates(selcx.tcx(), env_predicates);
652652
assemble_candidates_from_predicates(selcx, obligation, obligation_trait_ref,

‎src/librustc/middle/traits/select.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ use super::util;
3838

3939
use middle::fast_reject;
4040
use middle::subst::{Subst, Substs, TypeSpace};
41-
use middle::ty::{self, AsPredicate, RegionEscape, ToPolyTraitRef, Ty};
41+
use middle::ty::{self, ToPredicate, RegionEscape, ToPolyTraitRef, Ty};
4242
use middle::infer;
4343
use middle::infer::{InferCtxt, TypeFreshener};
4444
use middle::ty_fold::TypeFoldable;
@@ -2465,7 +2465,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
24652465
data_b.bounds.region_bound);
24662466
nested.push(Obligation::with_depth(cause,
24672467
obligation.recursion_depth + 1,
2468-
ty::Binder(outlives).as_predicate()));
2468+
ty::Binder(outlives).to_predicate()));
24692469
}
24702470

24712471
// T -> Trait.
@@ -2485,7 +2485,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
24852485
};
24862486

24872487
// Create the obligation for casting from T to Trait.
2488-
push(data.principal_trait_ref_with_self_ty(tcx, source).as_predicate());
2488+
push(data.principal_trait_ref_with_self_ty(tcx, source).to_predicate());
24892489

24902490
// We can only make objects from sized types.
24912491
let mut builtin_bounds = data.bounds.builtin_bounds;
@@ -2497,22 +2497,22 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
24972497
// for the Send check.)
24982498
for bound in &builtin_bounds {
24992499
if let Ok(tr) = util::trait_ref_for_builtin_bound(tcx, bound, source) {
2500-
push(tr.as_predicate());
2500+
push(tr.to_predicate());
25012501
} else {
25022502
return Err(Unimplemented);
25032503
}
25042504
}
25052505

25062506
// Create obligations for the projection predicates.
25072507
for bound in data.projection_bounds_with_self_ty(tcx, source) {
2508-
push(bound.as_predicate());
2508+
push(bound.to_predicate());
25092509
}
25102510

25112511
// If the type is `Foo+'a`, ensures that the type
25122512
// being cast to `Foo+'a` outlives `'a`:
25132513
let outlives = ty::OutlivesPredicate(source,
25142514
data.bounds.region_bound);
2515-
push(ty::Binder(outlives).as_predicate());
2515+
push(ty::Binder(outlives).to_predicate());
25162516
}
25172517

25182518
// [T; n] -> [T].

‎src/librustc/middle/traits/util.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
use middle::subst::Substs;
1212
use middle::infer::InferCtxt;
13-
use middle::ty::{self, Ty, AsPredicate, ToPolyTraitRef};
13+
use middle::ty::{self, Ty, ToPredicate, ToPolyTraitRef};
1414
use std::fmt;
1515
use syntax::ast;
1616
use syntax::codemap::Span;
@@ -83,7 +83,7 @@ pub fn elaborate_trait_ref<'cx, 'tcx>(
8383
trait_ref: ty::PolyTraitRef<'tcx>)
8484
-> Elaborator<'cx, 'tcx>
8585
{
86-
elaborate_predicates(tcx, vec![trait_ref.as_predicate()])
86+
elaborate_predicates(tcx, vec![trait_ref.to_predicate()])
8787
}
8888

8989
pub fn elaborate_trait_refs<'cx, 'tcx>(
@@ -92,7 +92,7 @@ pub fn elaborate_trait_refs<'cx, 'tcx>(
9292
-> Elaborator<'cx, 'tcx>
9393
{
9494
let predicates = trait_refs.iter()
95-
.map(|trait_ref| trait_ref.as_predicate())
95+
.map(|trait_ref| trait_ref.to_predicate())
9696
.collect();
9797
elaborate_predicates(tcx, predicates)
9898
}
@@ -347,7 +347,7 @@ pub fn predicate_for_trait_ref<'tcx>(
347347
Obligation {
348348
cause: cause,
349349
recursion_depth: recursion_depth,
350-
predicate: trait_ref.as_predicate(),
350+
predicate: trait_ref.to_predicate(),
351351
}
352352
}
353353

‎src/librustc/middle/ty.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1873,7 +1873,7 @@ impl BuiltinBounds {
18731873
self_ty: Ty<'tcx>) -> Vec<Predicate<'tcx>> {
18741874
self.iter().filter_map(|builtin_bound|
18751875
match traits::trait_ref_for_builtin_bound(tcx, builtin_bound, self_ty) {
1876-
Ok(trait_ref) => Some(trait_ref.as_predicate()),
1876+
Ok(trait_ref) => Some(trait_ref.to_predicate()),
18771877
Err(ErrorReported) => { None }
18781878
}
18791879
).collect()
@@ -2390,12 +2390,12 @@ impl<'tcx> ToPolyTraitRef<'tcx> for PolyProjectionPredicate<'tcx> {
23902390
}
23912391
}
23922392

2393-
pub trait AsPredicate<'tcx> {
2394-
fn as_predicate(&self) -> Predicate<'tcx>;
2393+
pub trait ToPredicate<'tcx> {
2394+
fn to_predicate(&self) -> Predicate<'tcx>;
23952395
}
23962396

2397-
impl<'tcx> AsPredicate<'tcx> for TraitRef<'tcx> {
2398-
fn as_predicate(&self) -> Predicate<'tcx> {
2397+
impl<'tcx> ToPredicate<'tcx> for TraitRef<'tcx> {
2398+
fn to_predicate(&self) -> Predicate<'tcx> {
23992399
// we're about to add a binder, so let's check that we don't
24002400
// accidentally capture anything, or else that might be some
24012401
// weird debruijn accounting.
@@ -2407,32 +2407,32 @@ impl<'tcx> AsPredicate<'tcx> for TraitRef<'tcx> {
24072407
}
24082408
}
24092409

2410-
impl<'tcx> AsPredicate<'tcx> for PolyTraitRef<'tcx> {
2411-
fn as_predicate(&self) -> Predicate<'tcx> {
2410+
impl<'tcx> ToPredicate<'tcx> for PolyTraitRef<'tcx> {
2411+
fn to_predicate(&self) -> Predicate<'tcx> {
24122412
ty::Predicate::Trait(self.to_poly_trait_predicate())
24132413
}
24142414
}
24152415

2416-
impl<'tcx> AsPredicate<'tcx> for PolyEquatePredicate<'tcx> {
2417-
fn as_predicate(&self) -> Predicate<'tcx> {
2416+
impl<'tcx> ToPredicate<'tcx> for PolyEquatePredicate<'tcx> {
2417+
fn to_predicate(&self) -> Predicate<'tcx> {
24182418
Predicate::Equate(self.clone())
24192419
}
24202420
}
24212421

2422-
impl<'tcx> AsPredicate<'tcx> for PolyRegionOutlivesPredicate {
2423-
fn as_predicate(&self) -> Predicate<'tcx> {
2422+
impl<'tcx> ToPredicate<'tcx> for PolyRegionOutlivesPredicate {
2423+
fn to_predicate(&self) -> Predicate<'tcx> {
24242424
Predicate::RegionOutlives(self.clone())
24252425
}
24262426
}
24272427

2428-
impl<'tcx> AsPredicate<'tcx> for PolyTypeOutlivesPredicate<'tcx> {
2429-
fn as_predicate(&self) -> Predicate<'tcx> {
2428+
impl<'tcx> ToPredicate<'tcx> for PolyTypeOutlivesPredicate<'tcx> {
2429+
fn to_predicate(&self) -> Predicate<'tcx> {
24302430
Predicate::TypeOutlives(self.clone())
24312431
}
24322432
}
24332433

2434-
impl<'tcx> AsPredicate<'tcx> for PolyProjectionPredicate<'tcx> {
2435-
fn as_predicate(&self) -> Predicate<'tcx> {
2434+
impl<'tcx> ToPredicate<'tcx> for PolyProjectionPredicate<'tcx> {
2435+
fn to_predicate(&self) -> Predicate<'tcx> {
24362436
Predicate::Projection(self.clone())
24372437
}
24382438
}

‎src/librustc_typeck/astconv.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ use middle::resolve_lifetime as rl;
5656
use middle::privacy::{AllPublic, LastMod};
5757
use middle::subst::{FnSpace, TypeSpace, SelfSpace, Subst, Substs};
5858
use middle::traits;
59-
use middle::ty::{self, RegionEscape, Ty, AsPredicate};
59+
use middle::ty::{self, RegionEscape, Ty, ToPredicate};
6060
use middle::ty_fold;
6161
use rscope::{self, UnelidableRscope, RegionScope, ElidableRscope, ExplicitRscope,
6262
ObjectLifetimeDefaultRscope, ShiftedRscope, BindingRscope};
@@ -2213,7 +2213,7 @@ impl<'tcx> Bounds<'tcx> {
22132213

22142214
for builtin_bound in &self.builtin_bounds {
22152215
match traits::trait_ref_for_builtin_bound(tcx, builtin_bound, param_ty) {
2216-
Ok(trait_ref) => { vec.push(trait_ref.as_predicate()); }
2216+
Ok(trait_ref) => { vec.push(trait_ref.to_predicate()); }
22172217
Err(ErrorReported) => { }
22182218
}
22192219
}
@@ -2222,15 +2222,15 @@ impl<'tcx> Bounds<'tcx> {
22222222
// account for the binder being introduced below; no need to shift `param_ty`
22232223
// because, at present at least, it can only refer to early-bound regions
22242224
let region_bound = ty_fold::shift_region(region_bound, 1);
2225-
vec.push(ty::Binder(ty::OutlivesPredicate(param_ty, region_bound)).as_predicate());
2225+
vec.push(ty::Binder(ty::OutlivesPredicate(param_ty, region_bound)).to_predicate());
22262226
}
22272227

22282228
for bound_trait_ref in &self.trait_bounds {
2229-
vec.push(bound_trait_ref.as_predicate());
2229+
vec.push(bound_trait_ref.to_predicate());
22302230
}
22312231

22322232
for projection in &self.projection_bounds {
2233-
vec.push(projection.as_predicate());
2233+
vec.push(projection.to_predicate());
22342234
}
22352235

22362236
vec

‎src/librustc_typeck/check/method/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use middle::def;
1616
use middle::privacy::{AllPublic, DependsOn, LastPrivate, LastMod};
1717
use middle::subst;
1818
use middle::traits;
19-
use middle::ty::{self, AsPredicate, ToPolyTraitRef, TraitRef};
19+
use middle::ty::{self, ToPredicate, ToPolyTraitRef, TraitRef};
2020
use middle::infer;
2121

2222
use syntax::ast::DefId;
@@ -192,7 +192,7 @@ pub fn lookup_in_trait_adjusted<'a, 'tcx>(fcx: &FnCtxt<'a, 'tcx>,
192192
let poly_trait_ref = trait_ref.to_poly_trait_ref();
193193
let obligation = traits::Obligation::misc(span,
194194
fcx.body_id,
195-
poly_trait_ref.as_predicate());
195+
poly_trait_ref.to_predicate());
196196

197197
// Now we want to know if this can be matched
198198
let mut selcx = traits::SelectionContext::new(fcx.infcx(), fcx);

‎src/librustc_typeck/check/method/suggest.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use CrateCtxt;
1515

1616
use astconv::AstConv;
1717
use check::{self, FnCtxt};
18-
use middle::ty::{self, Ty, ToPolyTraitRef, AsPredicate};
18+
use middle::ty::{self, Ty, ToPolyTraitRef, ToPredicate};
1919
use middle::def;
2020
use middle::lang_items::FnOnceTraitLangItem;
2121
use middle::subst::Substs;
@@ -101,7 +101,7 @@ pub fn report_error<'a, 'tcx>(fcx: &FnCtxt<'a, 'tcx>,
101101
let poly_trait_ref = trait_ref.to_poly_trait_ref();
102102
let obligation = Obligation::misc(span,
103103
fcx.body_id,
104-
poly_trait_ref.as_predicate());
104+
poly_trait_ref.to_predicate());
105105
let mut selcx = SelectionContext::new(infcx, fcx);
106106

107107
if selcx.evaluate_obligation(&obligation) {

0 commit comments

Comments
 (0)