Fixing A and COOP_PREFERRED generics. WIP

Author: peter-lyons-kehl

library/alloc/src/lib.rs

@@ -288,9 +288,3 @@ pub(crate) mod test_helpers {
 
 use crate::alloc::Global;
 
-/// See also `core::alloc::co_alloc_metadata_num_slots_with_preference`.
-#[unstable(feature = "global_co_alloc", issue = "none")]
-pub const fn co_alloc_metadata_num_slots_with_preference_global(coop_preferred: bool) -> usize {
-    // FIXME or replace any calls with core::alloc::co_alloc_metadata_num_slots_with_preference::<Global>(COOP_PREFERRED). See raw_vec.rs.
-    if /*Global::IS_CO_ALLOCATOR*/ true && coop_preferred { 1 } else { 0 }
-}

library/alloc/src/string.rs

@@ -662,7 +662,7 @@ where
 
         const REPLACEMENT: &str = "\u{FFFD}";
 
-        let mut res = String::with_capacity(v.len());
+        let mut res = String::<false>::with_capacity(v.len());
         res.push_str(first_valid);
         res.push_str(REPLACEMENT);
 

library/alloc/src/vec/spec_from_iter.rs

@@ -1,4 +1,5 @@
 use core::alloc::{self, Allocator};
+use crate::alloc::Global;
 use core::mem::ManuallyDrop;
 use core::ptr::{self};
 
@@ -38,9 +39,9 @@ where
 }
 
 #[allow(unused_braces)]
-impl<T, A: Allocator, const COOP_PREFERRED: bool> SpecFromIter<T, IntoIter<T>> for Vec<T, A, COOP_PREFERRED>
+impl<T, const COOP_PREFERRED: bool> SpecFromIter<T, IntoIter<T>> for Vec<T, Global, COOP_PREFERRED>
 where
-[(); alloc::co_alloc_metadata_num_slots_with_preference::<A>(COOP_PREFERRED)]:,
+[(); alloc::co_alloc_metadata_num_slots_with_preference::<Global>(COOP_PREFERRED)]:,
 {
     fn from_iter(iterator: IntoIter<T>) -> Self {
         // A common case is passing a vector into a function which immediately
@@ -62,7 +63,7 @@ where
             }
         }
 
-        let mut vec = Vec::new();
+        let mut vec = Vec::<T, Global, COOP_PREFERRED>::new();
         // must delegate to spec_extend() since extend() itself delegates
         // to spec_from for empty Vecs
         vec.spec_extend(iterator);