Merge pull request #1116 from dtolnay/nostdpath

No-std fixes for Box, String, Pin, c_char

Author: dtolnay

macro/src/load.rs

@@ -264,7 +264,7 @@ fn translate_qual_type(cx: &mut Errors, enm: &Enum, qual_type: &str) -> Path {
         .unwrap()
         .span();
     let ident = Ident::new(rust_std_name, span);
-    let path = quote_spanned!(span=> ::std::os::raw::#ident);
+    let path = quote_spanned!(span=> ::cxx::core::ffi::#ident);
     parse_quote!(#path)
 }
 

macro/src/tokens.rs

@@ -33,7 +33,7 @@ impl ToTokens for ReceiverType<'_> {
             mutability,
         } = &self.0;
         if let Some((pin, langle, _rangle)) = pin_tokens {
-            tokens.extend(quote_spanned!(pin.span=> ::std::pin::Pin));
+            tokens.extend(quote_spanned!(pin.span=> ::cxx::core::pin::Pin));
             langle.to_tokens(tokens);
         }
         ampersand.to_tokens(tokens);
@@ -61,7 +61,7 @@ impl ToTokens for ReceiverTypeSelf<'_> {
             mutability,
         } = &self.0;
         if let Some((pin, langle, _rangle)) = pin_tokens {
-            tokens.extend(quote_spanned!(pin.span=> ::std::pin::Pin));
+            tokens.extend(quote_spanned!(pin.span=> ::cxx::core::pin::Pin));
             langle.to_tokens(tokens);
         }
         ampersand.to_tokens(tokens);

src/c_char.rs

@@ -1,5 +1,4 @@
-#![cfg(feature = "alloc")]
-
+#[allow(missing_docs)]
 pub type c_char = c_char_definition::c_char;
 
 // Validate that our definition is consistent with libstd's definition, without

src/lib.rs

@@ -490,6 +490,7 @@ pub type Vector<T> = CxxVector<T>;
 // Not public API.
 #[doc(hidden)]
 pub mod private {
+    pub use crate::c_char::c_char;
     pub use crate::cxx_vector::VectorElement;
     pub use crate::extern_type::{verify_extern_kind, verify_extern_type};
     pub use crate::function::FatFunction;

syntax/tokens.rs

@@ -13,10 +13,13 @@ impl ToTokens for Type {
             Type::Ident(ident) => {
                 if ident.rust == Char {
                     let span = ident.rust.span();
-                    tokens.extend(quote_spanned!(span=> ::std::os::raw::));
+                    tokens.extend(quote_spanned!(span=> ::cxx::private::));
                 } else if ident.rust == CxxString {
                     let span = ident.rust.span();
                     tokens.extend(quote_spanned!(span=> ::cxx::));
+                } else if ident.rust == RustString {
+                    let span = ident.rust.span();
+                    tokens.extend(quote_spanned!(span=> ::cxx::alloc::string::));
                 }
                 ident.to_tokens(tokens);
             }
@@ -66,8 +69,11 @@ impl ToTokens for Ty1 {
             "UniquePtr" | "SharedPtr" | "WeakPtr" | "CxxVector" => {
                 tokens.extend(quote_spanned!(span=> ::cxx::));
             }
+            "Box" => {
+                tokens.extend(quote_spanned!(span=> ::cxx::alloc::boxed::));
+            }
             "Vec" => {
-                tokens.extend(quote_spanned!(span=> ::std::vec::));
+                tokens.extend(quote_spanned!(span=> ::cxx::alloc::vec::));
             }
             _ => {}
         }
@@ -90,7 +96,7 @@ impl ToTokens for Ref {
             mutability,
         } = self;
         if let Some((pin, langle, _rangle)) = pin_tokens {
-            tokens.extend(quote_spanned!(pin.span=> ::std::pin::Pin));
+            tokens.extend(quote_spanned!(pin.span=> ::cxx::core::pin::Pin));
             langle.to_tokens(tokens);
         }
         ampersand.to_tokens(tokens);