diff options
| author | Michael Goulet <michael@errs.io> | 2024-10-15 12:33:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-15 12:33:36 -0400 |
| commit | 1c799ff05e424e3a3b95e6dc2bbe6f8584491cf0 (patch) | |
| tree | f256508da2759151c24b98fb800b4f13fbbc5351 /tests | |
| parent | 2f3f001423286560e9a0b28bb9ef19c51c61f88e (diff) | |
| parent | 9e0a7b99b5d3677d3c90b11b57ec56a6a2c4f162 (diff) | |
| download | rust-1c799ff05e424e3a3b95e6dc2bbe6f8584491cf0.tar.gz rust-1c799ff05e424e3a3b95e6dc2bbe6f8584491cf0.zip | |
Rollup merge of #131521 - jdonszelmann:rc, r=joboet
rename RcBox to RcInner for consistency Arc uses ArcInner too (created in collaboration with `@aDotInTheVoid` and `@WaffleLapkin` )
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/debuginfo/strings-and-strs.rs | 3 | ||||
| -rw-r--r-- | tests/ui/abi/compatibility.rs | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/tests/debuginfo/strings-and-strs.rs b/tests/debuginfo/strings-and-strs.rs index b7ee3312d13..3d6589db34b 100644 --- a/tests/debuginfo/strings-and-strs.rs +++ b/tests/debuginfo/strings-and-strs.rs @@ -19,8 +19,7 @@ // gdb-check:$4 = ("Hello", "World") // gdb-command:print str_in_rc -// gdb-check:$5 = alloc::rc::Rc<&str, alloc::alloc::Global> {ptr: core::ptr::non_null::NonNull<alloc::rc::RcBox<&str>> {pointer: 0x[...]}, phantom: core::marker::PhantomData<alloc::rc::RcBox<&str>>, alloc: alloc::alloc::Global} - +// gdb-check:$5 = alloc::rc::Rc<&str, alloc::alloc::Global> {ptr: core::ptr::non_null::NonNull<alloc::rc::RcInner<&str>> {pointer: 0x[...]}, phantom: core::marker::PhantomData<alloc::rc::RcInner<&str>>, alloc: alloc::alloc::Global} // === LLDB TESTS ================================================================================== // lldb-command:run diff --git a/tests/ui/abi/compatibility.rs b/tests/ui/abi/compatibility.rs index b439a4bcf86..28c8063a923 100644 --- a/tests/ui/abi/compatibility.rs +++ b/tests/ui/abi/compatibility.rs @@ -160,14 +160,14 @@ mod prelude { pub struct Box<T: ?Sized, A = Global>(Unique<T>, A); #[repr(C)] - struct RcBox<T: ?Sized> { + struct RcInner<T: ?Sized> { strong: UnsafeCell<usize>, weak: UnsafeCell<usize>, value: T, } pub struct Rc<T: ?Sized, A = Global> { - ptr: NonNull<RcBox<T>>, - phantom: PhantomData<RcBox<T>>, + ptr: NonNull<RcInner<T>>, + phantom: PhantomData<RcInner<T>>, alloc: A, } |
