commit 83f71155f2a19237336d3ca03704b70d73e40fe9
author David Tolnay <dtolnay@gmail.com> Sun Sep 06 19:31:09 2020 -0700
committer David Tolnay <dtolnay@gmail.com> Sun Sep 06 21:15:06 2020 -0700
tree 305a2669696e8e6980fcd18e8b288a2776d7817e
parent 4d0bf3312adb56b8cbec8e457d267aac68cf99a2

Linearize cycle dependency between cxx crate and cxx.cc

src/lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index 8d874bd..0fb7ad9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -369,9 +369,8 @@
 
 #[cfg(built_with_cargo)]
 extern crate link_cplusplus;
-
 #[macro_use]
-mod macros;
+extern crate symbols;
 
 mod cxx_string;
 mod cxx_vector;
@@ -387,9 +386,6 @@
 mod unique_ptr;
 mod unwind;
 
-#[cfg(not(no_export_symbols))]
-mod symbols;
-
 pub use crate::cxx_string::CxxString;
 pub use crate::cxx_vector::CxxVector;
 pub use crate::exception::Exception;

src/symbols/Cargo.toml

diff --git a/src/symbols/Cargo.toml b/src/symbols/Cargo.toml
new file mode 100644
index 0000000..80728d3
--- /dev/null
+++ b/src/symbols/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "cxx-symbols"
+version = "0.4.2"
+authors = ["David Tolnay <dtolnay@gmail.com>"]
+edition = "2018"
+license = "MIT OR Apache-2.0"
+description = "Implementation detail of the `cxx` crate"
+repository = "https://github.com/dtolnay/cxx"
+documentation = "https://docs.rs/cxx"
+
+[lib]
+name = "symbols"
+path = "lib.rs"

src/symbols/lib.rs

diff --git a/src/symbols/lib.rs b/src/symbols/lib.rs
new file mode 100644
index 0000000..da0f223
--- /dev/null
+++ b/src/symbols/lib.rs
@@ -0,0 +1,9 @@
+//! *Implementation detail of the `cxx` crate.*
+
+#[macro_use]
+mod macros;
+
+mod exception;
+mod rust_str;
+mod rust_string;
+mod rust_vec;

src/symbols/macros/assert.rs

diff --git a/src/macros/assert.rs b/src/symbols/macros/assert.rs
similarity index 80%
rename from src/macros/assert.rs
rename to src/symbols/macros/assert.rs
index 738e5bb..5d5ea9e 100644
--- a/src/macros/assert.rs
+++ b/src/symbols/macros/assert.rs
@@ -1,3 +1,5 @@
+#[macro_export]
+#[doc(hidden)]
 macro_rules! const_assert_eq {
     ($left:expr, $right:expr $(,)?) => {
         const _: [(); $left] = [(); $right];

src/symbols/macros/concat.rs

diff --git a/src/macros/concat.rs b/src/symbols/macros/concat.rs
similarity index 80%
rename from src/macros/concat.rs
rename to src/symbols/macros/concat.rs
index e67e50d..5ee77c5 100644
--- a/src/macros/concat.rs
+++ b/src/symbols/macros/concat.rs
@@ -1,3 +1,5 @@
+#[macro_export]
+#[doc(hidden)]
 macro_rules! attr {
     (#[$name:ident = $value:expr] $($rest:tt)*) => {
         #[$name = $value]

src/symbols/macros/mod.rs

diff --git a/src/macros/mod.rs b/src/symbols/macros/mod.rs
similarity index 100%
rename from src/macros/mod.rs
rename to src/symbols/macros/mod.rs

src/symbols/mod.rs

diff --git a/src/symbols/mod.rs b/src/symbols/mod.rs
deleted file mode 100644
index a9d158d..0000000
--- a/src/symbols/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-mod exception;
-mod rust_str;
-mod rust_string;
-mod rust_vec;

src/symbols/rust_vec.rs

diff --git a/src/symbols/rust_vec.rs b/src/symbols/rust_vec.rs
index 163f7a9..7789454 100644
--- a/src/symbols/rust_vec.rs
+++ b/src/symbols/rust_vec.rs
@@ -1,4 +1,4 @@
-use super::rust_string::RustString;
+use crate::rust_string::RustString;
 use std::mem;
 use std::ptr;
 

src/symbols/symbols.rs

diff --git a/src/symbols/symbols.rs b/src/symbols/symbols.rs
deleted file mode 100644
index 2c052ec..0000000
--- a/src/symbols/symbols.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#[path = "../macros/mod.rs"]
-#[macro_use]
-mod macros;
-
-include!("mod.rs");