commit bac25829d1b7dae8bd416288f5bc1033f0fe1e2b
author David Tolnay <dtolnay@gmail.com> Sat Dec 12 23:13:51 2020 -0800
committer David Tolnay <dtolnay@gmail.com> Sat Dec 12 23:14:01 2020 -0800
tree 05d6e446e190bee14704823d8492deb0be5ca631
parent be3cbf76940dfe83b9ebd34029d452e4b6dcb784

Shorten name of string and vector modules

src/cxx_vector.rs

diff --git a/src/cxx_vector.rs b/src/cxx_vector.rs
index 037fe6a..cf15e73 100644
--- a/src/cxx_vector.rs
+++ b/src/cxx_vector.rs
@@ -1,6 +1,6 @@
-use crate::cxx_string::CxxString;
 use crate::extern_type::ExternType;
 use crate::kind::Trivial;
+use crate::string::CxxString;
 use core::ffi::c_void;
 use core::fmt::{self, Debug, Display};
 use core::marker::{PhantomData, PhantomPinned};

src/lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index b57ea0e..0142197 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -392,8 +392,6 @@
 #[macro_use]
 mod macros;
 
-mod cxx_string;
-mod cxx_vector;
 mod exception;
 mod extern_type;
 mod function;
@@ -405,16 +403,20 @@
 mod rust_type;
 mod rust_vec;
 mod shared_ptr;
+#[path = "cxx_string.rs"]
+mod string;
 mod symbols;
 mod unique_ptr;
 mod unwind;
+#[path = "cxx_vector.rs"]
+mod vector;
 
-pub use crate::cxx_string::CxxString;
-pub use crate::cxx_vector::CxxVector;
 pub use crate::exception::Exception;
 pub use crate::extern_type::{kind, ExternType};
 pub use crate::shared_ptr::SharedPtr;
+pub use crate::string::CxxString;
 pub use crate::unique_ptr::UniquePtr;
+pub use crate::vector::CxxVector;
 pub use cxxbridge_macro::bridge;
 
 /// For use in impls of the `ExternType` trait. See [`ExternType`].
@@ -439,8 +441,6 @@
 // Not public API.
 #[doc(hidden)]
 pub mod private {
-    pub use crate::cxx_string::StackString;
-    pub use crate::cxx_vector::VectorElement;
     pub use crate::extern_type::{verify_extern_kind, verify_extern_type};
     pub use crate::function::FatFunction;
     pub use crate::opaque::Opaque;
@@ -451,8 +451,10 @@
     pub use crate::rust_type::{ImplBox, ImplVec, RustType};
     pub use crate::rust_vec::RustVec;
     pub use crate::shared_ptr::SharedPtrTarget;
+    pub use crate::string::StackString;
     pub use crate::unique_ptr::UniquePtrTarget;
     pub use crate::unwind::catch_unwind;
+    pub use crate::vector::VectorElement;
 }
 
 mod actually_private {

src/shared_ptr.rs

diff --git a/src/shared_ptr.rs b/src/shared_ptr.rs
index 8f25005..f355d9c 100644
--- a/src/shared_ptr.rs
+++ b/src/shared_ptr.rs
@@ -1,5 +1,5 @@
-use crate::cxx_string::CxxString;
 use crate::kind::Trivial;
+use crate::string::CxxString;
 use crate::ExternType;
 use core::ffi::c_void;
 use core::fmt::{self, Debug, Display};

src/unique_ptr.rs

diff --git a/src/unique_ptr.rs b/src/unique_ptr.rs
index 3655a7a..0f9fa8f 100644
--- a/src/unique_ptr.rs
+++ b/src/unique_ptr.rs
@@ -1,6 +1,6 @@
-use crate::cxx_string::CxxString;
-use crate::cxx_vector::{self, CxxVector, VectorElement};
 use crate::kind::Trivial;
+use crate::string::CxxString;
+use crate::vector::{self, CxxVector, VectorElement};
 use crate::ExternType;
 use core::ffi::c_void;
 use core::fmt::{self, Debug, Display};
@@ -237,7 +237,7 @@
 where
     T: VectorElement + 'static,
 {
-    const __NAME: &'static dyn Display = &cxx_vector::TypeName::<T>::new();
+    const __NAME: &'static dyn Display = &vector::TypeName::<T>::new();
     fn __null() -> *mut c_void {
         T::__unique_ptr_null()
     }