CoAlloc: Renamed feature global_co_alloc_def to global_co_alloc_default. tidy

Author: peter-lyons-kehl

library/alloc/src/ffi/c_str.rs

@@ -1,12 +1,14 @@
 #[cfg(test)]
 mod tests;
 
+use crate::alloc::Global;
 use crate::borrow::{Cow, ToOwned};
 use crate::boxed::Box;
 use crate::rc::Rc;
 use crate::slice::hack::into_vec;
 use crate::string::String;
 use crate::vec::Vec;
+use crate::DEFAULT_COOP_PREFERRED;
 use core::borrow::Borrow;
 use core::ffi::{c_char, CStr};
 use core::fmt;
@@ -17,8 +19,6 @@ use core::ptr;
 use core::slice;
 use core::slice::memchr;
 use core::str::{self, Utf8Error};
-use crate::alloc::Global;
-use crate::DEFAULT_COOP_PREFERRED;
 
 #[cfg(target_has_atomic = "ptr")]
 use crate::sync::Arc;
@@ -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_PREFERRED!()}> {
+impl From<CString> for Vec<u8, Global, { DEFAULT_COOP_PREFERRED!() }> {
     /// Converts a [`CString`] into a <code>[Vec]<[u8]></code>.
     ///
     /// The conversion consumes the [`CString`], and removes the terminating NUL byte.

library/alloc/src/lib.rs

@@ -185,7 +185,7 @@
 #![feature(global_co_alloc_short_term_pref)]
 #![feature(hashmap_internals)]
 #![feature(lang_items)]
-#![feature(global_co_alloc_def)]
+#![feature(global_co_alloc_default)]
 // When we used min_specialization instead of specialization, library/alloc/src/vec/mod.rs was failing with:
 // - cannot specialize on predicate `the constant `core::alloc::co_alloc_metadata_num_slots::<A>()` can be evaluated`
 // - cannot specialize on predicate `[(); _] well-formed`

library/alloc/src/vec/mod.rs

@@ -150,8 +150,8 @@ use self::spec_extend::SpecExtend;
 mod spec_extend;
 
 /// Default `Vec`, `DefVec`, `DecVeque`, `DefDecVeq` "cooperation" (`COOP_PREFERRED`) generic parameter.
-/// NOT for public use. It's exported only so that library/proc_macro (and other internals) can use this. TODO FIXME.
-#[unstable(feature = "global_co_alloc_def", issue = "none")]
+/// NOT for public use. It's exported only so that library/proc_macro (and other internals) can use this. FIXME.
+#[unstable(feature = "global_co_alloc_default", issue = "none")]
 // pub const DEFAULT_COOP_PREFERRED: bool = true;
 #[macro_export]
 macro_rules! DEFAULT_COOP_PREFERRED {
@@ -445,10 +445,10 @@ pub type DefVec<T, A = Global> = Vec<T, A, { DEFAULT_COOP_PREFERRED!() }>;
 pub type WeVec<T, const WEIGHT: u8> = Vec<T, Global, { WEIGHT > 127 }>;
 
 impl<T> Vec<T> {
-/*impl<T, const COOP_PREFERRED: bool> Vec<T, Global, COOP_PREFERRED>
-where
-    [(); core::alloc::co_alloc_metadata_num_slots_with_preference::<Global>(COOP_PREFERRED)]:,
-{*/
+    /*impl<T, const COOP_PREFERRED: bool> Vec<T, Global, COOP_PREFERRED>
+    where
+        [(); core::alloc::co_alloc_metadata_num_slots_with_preference::<Global>(COOP_PREFERRED)]:,
+    {*/
     /// Constructs a new, empty `Vec<T>`.
     ///
     /// The vector will not allocate until elements are pushed onto it.
@@ -525,7 +525,6 @@ where
     pub fn with_capacity(capacity: usize) -> Self {
         Self::with_capacity_in(capacity, Global)
     }
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -546,7 +545,7 @@ where
         Vec { buf: RawVec::NEW, len: 0 }
     }
 
-    // TODO @FIXME document co-allocation
+    // @FIXME document co-allocation
     /// Constructs a new, empty `Vec<T>` with at least the specified capacity.
     ///
     /// The vector will be able to hold at least `capacity` elements without

library/proc_macro/src/bridge/rpc.rs

@@ -6,8 +6,8 @@ use std::io::Write;
 use std::num::NonZeroU32;
 use std::str;
 //use std::alloc::Global;
-use alloc::DEFAULT_COOP_PREFERRED;
 use alloc::alloc::Global;
+use alloc::DEFAULT_COOP_PREFERRED;
 
 pub(super) type Writer = super::buffer::Buffer;
 

library/proc_macro/src/lib.rs

@@ -33,7 +33,7 @@
 #![feature(min_specialization)]
 #![feature(strict_provenance)]
 #![recursion_limit = "256"]
-#![feature(global_co_alloc_def)]
+#![feature(global_co_alloc_default)]
 
 #[unstable(feature = "proc_macro_internals", issue = "27812")]
 #[doc(hidden)]