diff options
| author | bors <bors@rust-lang.org> | 2024-08-06 19:02:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-08-06 19:02:52 +0000 |
| commit | 3f5fd8dd41153bc5fdca9427e9e05be2c767ba23 (patch) | |
| tree | 01cdc48561c6f259221b76ee764f3e8fba492708 /tests/codegen-units | |
| parent | 051478957371ee0084a7c0913941d2a8c4757bb9 (diff) | |
| parent | 1cc8da5c1015f8ce0268f856a4de42cb9e77e218 (diff) | |
| download | rust-1.80.1.tar.gz rust-1.80.1.zip | |
Auto merge of #128635 - pietroalbini:pa-1.80.1, r=pietroalbini 1.80.1
Prepare Rust 1.80.1 point release The point release is scheduled to include: * https://github.com/rust-lang/rust/pull/128271 * https://github.com/rust-lang/rust/pull/128618
Diffstat (limited to 'tests/codegen-units')
| -rw-r--r-- | tests/codegen-units/item-collection/generic-impl.rs | 10 | ||||
| -rw-r--r-- | tests/codegen-units/item-collection/overloaded-operators.rs | 24 |
2 files changed, 17 insertions, 17 deletions
diff --git a/tests/codegen-units/item-collection/generic-impl.rs b/tests/codegen-units/item-collection/generic-impl.rs index b4cd99272b1..23d09e0d8af 100644 --- a/tests/codegen-units/item-collection/generic-impl.rs +++ b/tests/codegen-units/item-collection/generic-impl.rs @@ -22,16 +22,16 @@ impl<T> Struct<T> { } } -pub struct _LifeTimeOnly<'a> { +pub struct LifeTimeOnly<'a> { _a: &'a u32, } -impl<'a> _LifeTimeOnly<'a> { - //~ MONO_ITEM fn _LifeTimeOnly::<'_>::foo +impl<'a> LifeTimeOnly<'a> { + //~ MONO_ITEM fn LifeTimeOnly::<'_>::foo pub fn foo(&self) {} - //~ MONO_ITEM fn _LifeTimeOnly::<'_>::bar + //~ MONO_ITEM fn LifeTimeOnly::<'_>::bar pub fn bar(&'a self) {} - //~ MONO_ITEM fn _LifeTimeOnly::<'_>::baz + //~ MONO_ITEM fn LifeTimeOnly::<'_>::baz pub fn baz<'b>(&'b self) {} pub fn non_instantiated<T>(&self) {} diff --git a/tests/codegen-units/item-collection/overloaded-operators.rs b/tests/codegen-units/item-collection/overloaded-operators.rs index e00e22dbab9..69b55695d3d 100644 --- a/tests/codegen-units/item-collection/overloaded-operators.rs +++ b/tests/codegen-units/item-collection/overloaded-operators.rs @@ -5,44 +5,44 @@ use std::ops::{Add, Deref, Index, IndexMut}; -pub struct _Indexable { +pub struct Indexable { data: [u8; 3], } -impl Index<usize> for _Indexable { +impl Index<usize> for Indexable { type Output = u8; - //~ MONO_ITEM fn <_Indexable as std::ops::Index<usize>>::index + //~ MONO_ITEM fn <Indexable as std::ops::Index<usize>>::index fn index(&self, index: usize) -> &Self::Output { if index >= 3 { &self.data[0] } else { &self.data[index] } } } -impl IndexMut<usize> for _Indexable { - //~ MONO_ITEM fn <_Indexable as std::ops::IndexMut<usize>>::index_mut +impl IndexMut<usize> for Indexable { + //~ MONO_ITEM fn <Indexable as std::ops::IndexMut<usize>>::index_mut fn index_mut(&mut self, index: usize) -> &mut Self::Output { if index >= 3 { &mut self.data[0] } else { &mut self.data[index] } } } -//~ MONO_ITEM fn <_Equatable as std::cmp::PartialEq>::eq -//~ MONO_ITEM fn <_Equatable as std::cmp::PartialEq>::ne +//~ MONO_ITEM fn <Equatable as std::cmp::PartialEq>::eq +//~ MONO_ITEM fn <Equatable as std::cmp::PartialEq>::ne #[derive(PartialEq)] -pub struct _Equatable(u32); +pub struct Equatable(u32); -impl Add<u32> for _Equatable { +impl Add<u32> for Equatable { type Output = u32; - //~ MONO_ITEM fn <_Equatable as std::ops::Add<u32>>::add + //~ MONO_ITEM fn <Equatable as std::ops::Add<u32>>::add fn add(self, rhs: u32) -> u32 { self.0 + rhs } } -impl Deref for _Equatable { +impl Deref for Equatable { type Target = u32; - //~ MONO_ITEM fn <_Equatable as std::ops::Deref>::deref + //~ MONO_ITEM fn <Equatable as std::ops::Deref>::deref fn deref(&self) -> &Self::Target { &self.0 } |
