diff options
| author | Eduard-Mihai Burtescu <eddyb@lyken.rs> | 2021-08-25 11:50:26 +0300 |
|---|---|---|
| committer | Eduard-Mihai Burtescu <eddyb@lyken.rs> | 2021-09-18 01:42:43 +0300 |
| commit | 4d36faf9ef10bda32c606517d0f2007fd53b16ac (patch) | |
| tree | f61a54703069b7f01dc755c84d77ca266579b1a3 | |
| parent | feca7d0a03ffe1c786f6fe00330b6d2df59bcfef (diff) | |
| download | rust-4d36faf9ef10bda32c606517d0f2007fd53b16ac.tar.gz rust-4d36faf9ef10bda32c606517d0f2007fd53b16ac.zip | |
rustc_target: `adjust_for_cabi` -> `adjust_for_foreign_abi`.
| -rw-r--r-- | compiler/rustc_middle/src/ty/layout.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_target/src/abi/call/mod.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_middle/src/ty/layout.rs b/compiler/rustc_middle/src/ty/layout.rs index 793dda5c928..95dda620cd4 100644 --- a/compiler/rustc_middle/src/ty/layout.rs +++ b/compiler/rustc_middle/src/ty/layout.rs @@ -3098,7 +3098,7 @@ where return; } - if let Err(msg) = self.adjust_for_cabi(cx, abi) { + if let Err(msg) = self.adjust_for_foreign_abi(cx, abi) { cx.tcx().sess.fatal(&msg); } } diff --git a/compiler/rustc_target/src/abi/call/mod.rs b/compiler/rustc_target/src/abi/call/mod.rs index 927bebd8157..bce86ca809d 100644 --- a/compiler/rustc_target/src/abi/call/mod.rs +++ b/compiler/rustc_target/src/abi/call/mod.rs @@ -600,7 +600,7 @@ pub struct FnAbi<'a, Ty> { } impl<'a, Ty> FnAbi<'a, Ty> { - pub fn adjust_for_cabi<C>(&mut self, cx: &C, abi: spec::abi::Abi) -> Result<(), String> + pub fn adjust_for_foreign_abi<C>(&mut self, cx: &C, abi: spec::abi::Abi) -> Result<(), String> where Ty: TyAbiInterface<'a, C> + Copy, C: HasDataLayout + HasTargetSpec, |