bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #113810 - glandium:allocator-fn, r=Amanieu

Browse source 
Make {Rc,Arc}::allocator associated functions
This commit is contained in:
Matthias Krüger 2023-07-21 06:52:28 +02:00 • committed by GitHub
commit 5ac3684abd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
library/alloc/src/rc.rs
View file

@ -661,10 +661,14 @@ impl<T> Rc<T> {
impl<T, A: Allocator> Rc<T, A> { impl<T, A: Allocator> Rc<T, A> {
/// Returns a reference to the underlying allocator. /// Returns a reference to the underlying allocator.
///
/// Note: this is an associated function, which means that you have
/// to call it as `Rc::allocator(&r)` instead of `r.allocator()`. This
/// is so that there is no conflict with a method on the inner type.
#[inline] #[inline]
#[unstable(feature = "allocator_api", issue = "32838")] #[unstable(feature = "allocator_api", issue = "32838")]
pub fn allocator(&self) -> &A { pub fn allocator(this: &Self) -> &A {
&self.alloc &this.alloc
} }
/// Constructs a new `Rc` in the provided allocator. /// Constructs a new `Rc` in the provided allocator.
/// ///

8
library/alloc/src/sync.rs
View file

@ -678,10 +678,14 @@ impl<T> Arc<T> {
impl<T, A: Allocator> Arc<T, A> { impl<T, A: Allocator> Arc<T, A> {
/// Returns a reference to the underlying allocator. /// Returns a reference to the underlying allocator.
///
/// Note: this is an associated function, which means that you have
/// to call it as `Arc::allocator(&a)` instead of `a.allocator()`. This
/// is so that there is no conflict with a method on the inner type.
#[inline] #[inline]
#[unstable(feature = "allocator_api", issue = "32838")] #[unstable(feature = "allocator_api", issue = "32838")]
pub fn allocator(&self) -> &A { pub fn allocator(this: &Self) -> &A {
&self.alloc &this.alloc
} }
/// Constructs a new `Arc<T>` in the provided allocator. /// Constructs a new `Arc<T>` in the provided allocator.
/// ///