rustc: rename {Fn,Arg}TypeExt to {Fn,Arg}AbiExt.
This commit is contained in:
parent
6567154ede
commit
89c8f3abca
6 changed files with 9 additions and 9 deletions
|
@ -2487,7 +2487,7 @@ impl<'a, 'tcx> HashStable<StableHashingContext<'a>> for LayoutError<'tcx> {
|
|||
}
|
||||
}
|
||||
|
||||
pub trait FnTypeExt<'tcx, C>
|
||||
pub trait FnAbiExt<'tcx, C>
|
||||
where
|
||||
C: LayoutOf<Ty = Ty<'tcx>, TyLayout = TyLayout<'tcx>>
|
||||
+ HasDataLayout
|
||||
|
@ -2507,7 +2507,7 @@ where
|
|||
fn adjust_for_abi(&mut self, cx: &C, abi: SpecAbi);
|
||||
}
|
||||
|
||||
impl<'tcx, C> FnTypeExt<'tcx, C> for call::FnAbi<'tcx, Ty<'tcx>>
|
||||
impl<'tcx, C> FnAbiExt<'tcx, C> for call::FnAbi<'tcx, Ty<'tcx>>
|
||||
where
|
||||
C: LayoutOf<Ty = Ty<'tcx>, TyLayout = TyLayout<'tcx>>
|
||||
+ HasDataLayout
|
||||
|
@ -2528,7 +2528,7 @@ where
|
|||
}
|
||||
|
||||
fn new_vtable(cx: &C, sig: ty::FnSig<'tcx>, extra_args: &[Ty<'tcx>]) -> Self {
|
||||
FnTypeExt::new_internal(cx, sig, extra_args, |ty, arg_idx| {
|
||||
FnAbiExt::new_internal(cx, sig, extra_args, |ty, arg_idx| {
|
||||
let mut layout = cx.layout_of(ty);
|
||||
// Don't pass the vtable, it's not an argument of the virtual fn.
|
||||
// Instead, pass just the data pointer, but give it the type `*const/mut dyn Trait`
|
||||
|
|
|
@ -163,7 +163,7 @@ impl LlvmType for CastTarget {
|
|||
}
|
||||
}
|
||||
|
||||
pub trait ArgTypeExt<'ll, 'tcx> {
|
||||
pub trait ArgAbiExt<'ll, 'tcx> {
|
||||
fn memory_ty(&self, cx: &CodegenCx<'ll, 'tcx>) -> &'ll Type;
|
||||
fn store(
|
||||
&self,
|
||||
|
@ -179,7 +179,7 @@ pub trait ArgTypeExt<'ll, 'tcx> {
|
|||
);
|
||||
}
|
||||
|
||||
impl ArgTypeExt<'ll, 'tcx> for ArgAbi<'tcx, Ty<'tcx>> {
|
||||
impl ArgAbiExt<'ll, 'tcx> for ArgAbi<'tcx, Ty<'tcx>> {
|
||||
/// Gets the LLVM type for a place of the original Rust type of
|
||||
/// this argument/return, i.e., the result of `type_of::type_of`.
|
||||
fn memory_ty(&self, cx: &CodegenCx<'ll, 'tcx>) -> &'ll Type {
|
||||
|
|
|
@ -19,7 +19,7 @@ use crate::context::CodegenCx;
|
|||
use crate::type_::Type;
|
||||
use crate::value::Value;
|
||||
use rustc::ty::{self, PolyFnSig};
|
||||
use rustc::ty::layout::{FnTypeExt, LayoutOf};
|
||||
use rustc::ty::layout::{FnAbiExt, LayoutOf};
|
||||
use rustc::session::config::Sanitizer;
|
||||
use rustc_data_structures::small_c_str::SmallCStr;
|
||||
use rustc_codegen_ssa::traits::*;
|
||||
|
|
|
@ -2,7 +2,7 @@ use crate::abi::{FnAbi};
|
|||
use crate::common::*;
|
||||
use crate::type_::Type;
|
||||
use rustc::ty::{self, Ty, TypeFoldable};
|
||||
use rustc::ty::layout::{self, Align, LayoutOf, FnTypeExt, PointeeInfo, Size, TyLayout};
|
||||
use rustc::ty::layout::{self, Align, LayoutOf, FnAbiExt, PointeeInfo, Size, TyLayout};
|
||||
use rustc_target::abi::{FloatTy, TyLayoutMethods};
|
||||
use rustc::ty::print::obsolete::DefPathBasedNames;
|
||||
use rustc_codegen_ssa::traits::*;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use rustc_index::vec::Idx;
|
||||
use rustc::middle::lang_items;
|
||||
use rustc::ty::{self, Ty, TypeFoldable, Instance};
|
||||
use rustc::ty::layout::{self, LayoutOf, HasTyCtxt, FnTypeExt};
|
||||
use rustc::ty::layout::{self, LayoutOf, HasTyCtxt, FnAbiExt};
|
||||
use rustc::mir::{self, PlaceBase, Static, StaticKind};
|
||||
use rustc::mir::interpret::PanicInfo;
|
||||
use rustc_target::abi::call::{ArgAbi, FnAbi, PassMode};
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
use rustc::ty::{self, Ty, TypeFoldable, Instance};
|
||||
use rustc::ty::layout::{TyLayout, HasTyCtxt, FnTypeExt};
|
||||
use rustc::ty::layout::{TyLayout, HasTyCtxt, FnAbiExt};
|
||||
use rustc::mir::{self, Body};
|
||||
use rustc_target::abi::call::{FnAbi, PassMode};
|
||||
use crate::base;
|
||||
|
|
Loading…
Reference in a new issue