diff options
| author | Ralf Jung <post@ralfj.de> | 2025-06-15 12:14:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-15 12:14:05 +0000 |
| commit | 5770b90356dbb25e53e2bf51722d1f840df15415 (patch) | |
| tree | 47690c255eb9b79639b9eb3ae1aa4c9c732e138b /compiler/rustc_codegen_gcc | |
| parent | 3951b5511167ba1ac4f41498c2bb8946a7a04e26 (diff) | |
| parent | 19beef420548f5cd55387d79593f0b39490145a7 (diff) | |
| download | rust-5770b90356dbb25e53e2bf51722d1f840df15415.tar.gz rust-5770b90356dbb25e53e2bf51722d1f840df15415.zip | |
Merge pull request #4400 from RalfJung/rustup
Rustup
Diffstat (limited to 'compiler/rustc_codegen_gcc')
| -rw-r--r-- | compiler/rustc_codegen_gcc/example/arbitrary_self_types_pointers_and_wrappers.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_codegen_gcc/src/builder.rs | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/compiler/rustc_codegen_gcc/example/arbitrary_self_types_pointers_and_wrappers.rs b/compiler/rustc_codegen_gcc/example/arbitrary_self_types_pointers_and_wrappers.rs index b299aa87974..c26606f0bdd 100644 --- a/compiler/rustc_codegen_gcc/example/arbitrary_self_types_pointers_and_wrappers.rs +++ b/compiler/rustc_codegen_gcc/example/arbitrary_self_types_pointers_and_wrappers.rs @@ -37,10 +37,6 @@ impl<T: DispatchFromDyn<U>, U> DispatchFromDyn<Wrapper<U>> for Wrapper<T> {} trait Trait { - // This method isn't object-safe yet. Unsized by-value `self` is object-safe (but not callable - // without unsized_locals), but wrappers around `Self` currently are not. - // FIXME (mikeyhew) uncomment this when unsized rvalues object-safety is implemented - // fn wrapper(self: Wrapper<Self>) -> i32; fn ptr_wrapper(self: Ptr<Wrapper<Self>>) -> i32; fn wrapper_ptr(self: Wrapper<Ptr<Self>>) -> i32; fn wrapper_ptr_wrapper(self: Wrapper<Ptr<Wrapper<Self>>>) -> i32; diff --git a/compiler/rustc_codegen_gcc/src/builder.rs b/compiler/rustc_codegen_gcc/src/builder.rs index d1fb8d8f9d6..1bd89212100 100644 --- a/compiler/rustc_codegen_gcc/src/builder.rs +++ b/compiler/rustc_codegen_gcc/src/builder.rs @@ -897,7 +897,7 @@ impl<'a, 'gcc, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'gcc, 'tcx> { fn checked_binop( &mut self, oop: OverflowOp, - typ: Ty<'_>, + typ: Ty<'tcx>, lhs: Self::Value, rhs: Self::Value, ) -> (Self::Value, Self::Value) { |