CoAlloc: renamed macro DEFAULT_COOP_PREF -> CO_ALLOC_PREF_DEFAULT

Author: peter-lyons-kehl

library/alloc/src/collections/binary_heap/mod.rs

@@ -155,7 +155,7 @@ use crate::alloc::Global;
 use crate::collections::TryReserveError;
 use crate::slice;
 use crate::vec::{self, AsVecIntoIter, Vec};
-use crate::DEFAULT_COOP_PREF;
+use crate::CO_ALLOC_PREF_DEFAULT;
 
 use super::SpecExtend;
 
@@ -1664,7 +1664,7 @@ impl<T: Ord, const N: usize> From<[T; N]> for BinaryHeap<T> {
 
 #[stable(feature = "binary_heap_extras_15", since = "1.5.0")]
 #[allow(unused_braces)]
-impl<T> From<BinaryHeap<T>> for Vec<T, Global, { DEFAULT_COOP_PREF!() }> {
+impl<T> From<BinaryHeap<T>> for Vec<T, Global, { CO_ALLOC_PREF_DEFAULT!() }> {
     /// Converts a `BinaryHeap<T>` into a `Vec<T>`.
     ///
     /// This conversion requires no data movement or allocation, and has

library/alloc/src/collections/vec_deque/mod.rs

@@ -7,7 +7,7 @@
 
 #![feature(global_co_alloc)]
 #![stable(feature = "rust1", since = "1.0.0")]
-use crate::DEFAULT_COOP_PREF;
+use crate::CO_ALLOC_PREF_DEFAULT;
 use core::alloc;
 use core::cmp::{self, Ordering};
 use core::fmt;
@@ -97,7 +97,7 @@ mod tests;
 pub struct VecDeque<
     T,
     #[unstable(feature = "allocator_api", issue = "32838")] A: Allocator = Global,
-    const COOP_PREF: bool = { DEFAULT_COOP_PREF!() },
+    const COOP_PREF: bool = { CO_ALLOC_PREF_DEFAULT!() },
 > where
     [(); alloc::co_alloc_metadata_num_slots_with_preference::<A>(COOP_PREF)]:,
 {

library/alloc/src/ffi/c_str.rs

@@ -8,7 +8,7 @@ use crate::rc::Rc;
 use crate::slice::hack::into_vec;
 use crate::string::String;
 use crate::vec::Vec;
-use crate::DEFAULT_COOP_PREF;
+use crate::CO_ALLOC_PREF_DEFAULT;
 use core::borrow::Borrow;
 use core::ffi::{c_char, CStr};
 use core::fmt;
@@ -726,7 +726,7 @@ impl fmt::Debug for CString {
 
 #[stable(feature = "cstring_into", since = "1.7.0")]
 #[allow(unused_braces)]
-impl From<CString> for Vec<u8, Global, { DEFAULT_COOP_PREF!() }> {
+impl From<CString> for Vec<u8, Global, { CO_ALLOC_PREF_DEFAULT!() }> {
     /// Converts a [`CString`] into a <code>[Vec]<[u8]></code>.
     ///
     /// The conversion consumes the [`CString`], and removes the terminating NUL byte.

library/alloc/src/macros.rs

@@ -134,7 +134,7 @@ macro_rules! __rust_force_expr {
 // fixed. Then move the const to a submodule, for example alloc::co_alloc.
 #[unstable(feature = "global_co_alloc_default", issue = "none")]
 #[macro_export]
-macro_rules! DEFAULT_COOP_PREF {
+macro_rules! CO_ALLOC_PREF_DEFAULT {
     () => {
         true
     };

library/alloc/src/raw_vec.rs

@@ -16,7 +16,7 @@ use crate::alloc::{Allocator, Global, Layout};
 use crate::boxed::Box;
 use crate::collections::TryReserveError;
 use crate::collections::TryReserveErrorKind::*;
-use crate::DEFAULT_COOP_PREF;
+use crate::CO_ALLOC_PREF_DEFAULT;
 
 #[cfg(test)]
 mod tests;
@@ -52,8 +52,8 @@ enum AllocInit {
 /// `usize::MAX`. This means that you need to be careful when round-tripping this type with a
 /// `Box<[T]>`, since `capacity()` won't yield the length.
 #[allow(missing_debug_implementations)]
-#[allow(unused_braces)]
-pub(crate) struct RawVec<T, A: Allocator = Global, const COOP_PREF: bool = { DEFAULT_COOP_PREF!() }>
+#[allow(unused_braces)] //@FIXME remove #[allow(unused_braces)] once that false positive warning fix is included on stable
+pub(crate) struct RawVec<T, A: Allocator = Global, const COOP_PREF: bool = { CO_ALLOC_PREF_DEFAULT!() }>
 where
     [(); alloc::co_alloc_metadata_num_slots_with_preference::<A>(COOP_PREF)]:,
 {

library/alloc/src/vec/mod.rs

@@ -403,7 +403,7 @@ pub struct Vec<
     T,
     #[unstable(feature = "allocator_api", issue = "32838")] A: Allocator = Global,
     //@FIXME: #[unstable(feature ="global_co_alloc_vec", issue="none")]
-    const COOP_PREF: bool = { DEFAULT_COOP_PREF!() },
+    const COOP_PREF: bool = { CO_ALLOC_PREF_DEFAULT!() },
 > where
     [(); core::alloc::co_alloc_metadata_num_slots_with_preference::<A>(COOP_PREF)]:,
 {
@@ -425,7 +425,7 @@ pub type PlVec<T, A = Global> = Vec<T, A, false>;
 /// author considered using `CoVec` or `PlVec`, but left it to default instead.
 #[unstable(feature = "global_co_alloc_defvec", issue = "none")]
 #[allow(unused_braces)]
-pub type DefVec<T, A = Global> = Vec<T, A, { DEFAULT_COOP_PREF!() }>;
+pub type DefVec<T, A = Global> = Vec<T, A, { CO_ALLOC_PREF_DEFAULT!() }>;
 
 /// "Weighted cooperative" Vec. Weight means how much it wants to cooperate (with the allocator). 0
 /// = always pack; u8::MAX = always cooperate (if `Global` supports it).
@@ -454,7 +454,7 @@ impl<T> Vec<T> {
     #[must_use]
     pub const fn new() -> Self {
         #[allow(unused_braces)]
-        Vec::<T, Global, { DEFAULT_COOP_PREF!() }>::new_co()
+        Vec::<T, Global, { CO_ALLOC_PREF_DEFAULT!() }>::new_co()
         //Self::new_co()
     }
 
@@ -3317,7 +3317,7 @@ where
 #[cfg(not(no_global_oom_handling))]
 #[stable(feature = "rust1", since = "1.0.0")]
 #[allow(unused_braces)]
-impl<T: Clone> From<&[T]> for Vec<T, Global, { DEFAULT_COOP_PREF!() }> {
+impl<T: Clone> From<&[T]> for Vec<T, Global, { CO_ALLOC_PREF_DEFAULT!() }> {
     /// Allocate a `Vec<T>` and fill it by cloning `s`'s items.
     ///
     /// # Examples
@@ -3338,7 +3338,7 @@ impl<T: Clone> From<&[T]> for Vec<T, Global, { DEFAULT_COOP_PREF!() }> {
 #[cfg(not(no_global_oom_handling))]
 #[stable(feature = "vec_from_mut", since = "1.19.0")]
 #[allow(unused_braces)]
-impl<T: Clone> From<&mut [T]> for Vec<T, Global, { DEFAULT_COOP_PREF!() }> {
+impl<T: Clone> From<&mut [T]> for Vec<T, Global, { CO_ALLOC_PREF_DEFAULT!() }> {
     /// Allocate a `Vec<T>` and fill it by cloning `s`'s items.
     ///
     /// # Examples
@@ -3359,7 +3359,7 @@ impl<T: Clone> From<&mut [T]> for Vec<T, Global, { DEFAULT_COOP_PREF!() }> {
 #[cfg(not(no_global_oom_handling))]
 #[stable(feature = "vec_from_array", since = "1.44.0")]
 #[allow(unused_braces)]
-impl<T, const N: usize> From<[T; N]> for Vec<T, Global, { DEFAULT_COOP_PREF!() }> {
+impl<T, const N: usize> From<[T; N]> for Vec<T, Global, { CO_ALLOC_PREF_DEFAULT!() }> {
     /// Allocate a `Vec<T>` and move `s`'s items into it.
     ///
     /// # Examples
@@ -3383,7 +3383,7 @@ impl<T, const N: usize> From<[T; N]> for Vec<T, Global, { DEFAULT_COOP_PREF!() }
 
 #[stable(feature = "vec_from_cow_slice", since = "1.14.0")]
 #[allow(unused_braces)]
-impl<'a, T> From<Cow<'a, [T]>> for Vec<T, Global, { DEFAULT_COOP_PREF!() }>
+impl<'a, T> From<Cow<'a, [T]>> for Vec<T, Global, { CO_ALLOC_PREF_DEFAULT!() }>
 where
     [T]: ToOwned<Owned = Vec<T>>,
 {
@@ -3461,7 +3461,7 @@ where
 #[cfg(not(no_global_oom_handling))]
 #[stable(feature = "rust1", since = "1.0.0")]
 #[allow(unused_braces)]
-impl From<&str> for Vec<u8, Global, { DEFAULT_COOP_PREF!() }> {
+impl From<&str> for Vec<u8, Global, { CO_ALLOC_PREF_DEFAULT!() }> {
     /// Allocate a `Vec<u8>` and fill it with a UTF-8 string.
     ///
     /// # Examples

library/alloc/src/vec/spec_from_iter_nested.rs

@@ -5,7 +5,7 @@ use core::ptr;
 
 use crate::alloc::Global;
 use crate::raw_vec::RawVec;
-use crate::DEFAULT_COOP_PREF;
+use crate::CO_ALLOC_PREF_DEFAULT;
 
 use super::{SpecExtend, Vec};
 
@@ -51,7 +51,7 @@ where
 }
 
 #[allow(unused_braces)]
-impl<T, I> SpecFromIterNested<T, I> for Vec<T, Global, { DEFAULT_COOP_PREF!() }>
+impl<T, I> SpecFromIterNested<T, I> for Vec<T, Global, { CO_ALLOC_PREF_DEFAULT!() }>
 where
     I: TrustedLen<Item = T>,
 {