diff options
| author | varkor <github@varkor.com> | 2019-09-16 18:59:31 +0100 |
|---|---|---|
| committer | varkor <github@varkor.com> | 2019-09-25 15:48:51 +0100 |
| commit | 2808a46a497959f00fcca87d7874118616356a18 (patch) | |
| tree | 7d670370c5d1d697b5e43d0df594e68e89a5b0fb | |
| parent | acf7b50c737cfb8f4003477559305bedf3c316fe (diff) | |
| download | rust-2808a46a497959f00fcca87d7874118616356a18.tar.gz rust-2808a46a497959f00fcca87d7874118616356a18.zip | |
Rename non-`TyS` uses of `sty`
| -rw-r--r-- | src/librustc/traits/specialize/specialization_graph.rs | 4 | ||||
| -rw-r--r-- | src/librustc_mir/interpret/cast.rs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/librustc/traits/specialize/specialization_graph.rs b/src/librustc/traits/specialize/specialization_graph.rs index c9a40db41df..885d4b4cb02 100644 --- a/src/librustc/traits/specialize/specialization_graph.rs +++ b/src/librustc/traits/specialize/specialization_graph.rs @@ -249,8 +249,8 @@ impl<'tcx> Children { self.blanket_impls.iter().chain(nonblanket).cloned() } - fn filtered(&mut self, sty: SimplifiedType) -> impl Iterator<Item = DefId> + '_ { - let nonblanket = self.nonblanket_impls.entry(sty).or_default().iter(); + fn filtered(&mut self, st: SimplifiedType) -> impl Iterator<Item = DefId> + '_ { + let nonblanket = self.nonblanket_impls.entry(st).or_default().iter(); self.blanket_impls.iter().chain(nonblanket).cloned() } } diff --git a/src/librustc_mir/interpret/cast.rs b/src/librustc_mir/interpret/cast.rs index 210647ac1e9..2797766f217 100644 --- a/src/librustc_mir/interpret/cast.rs +++ b/src/librustc_mir/interpret/cast.rs @@ -244,12 +244,12 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> { src: OpTy<'tcx, M::PointerTag>, dest: PlaceTy<'tcx, M::PointerTag>, // The pointee types - sty: Ty<'tcx>, - dty: Ty<'tcx>, + source_ty: Ty<'tcx>, + dest_ty: Ty<'tcx>, ) -> InterpResult<'tcx> { // A<Struct> -> A<Trait> conversion let (src_pointee_ty, dest_pointee_ty) = - self.tcx.struct_lockstep_tails_erasing_lifetimes(sty, dty, self.param_env); + self.tcx.struct_lockstep_tails_erasing_lifetimes(source_ty, dest_ty, self.param_env); match (&src_pointee_ty.sty, &dest_pointee_ty.sty) { (&ty::Array(_, length), &ty::Slice(_)) => { |
