Inline cxx-symbols crate into cxx

The separation is no longer needed for Buck when linking with lld.

Author: dtolnay

BUCK

@@ -1,11 +1,10 @@
 rust_library(
     name = "cxx",
-    srcs = glob(["src/**"], exclude = ["src/symbols/**"]),
+    srcs = glob(["src/**"]),
     visibility = ["PUBLIC"],
     deps = [
         ":core",
         ":macro",
-        ":symbols",
     ],
 )
 
@@ -32,12 +31,6 @@ cxx_library(
         "cxx.h": "include/cxx.h",
     },
     exported_linker_flags = ["-lstdc++"],
-    deps = [":symbols"],
-)
-
-rust_library(
-    name = "symbols",
-    srcs = glob(["src/symbols/**"]),
 )
 
 rust_library(

BUILD

@@ -2,18 +2,12 @@ load("//tools/bazel:rust.bzl", "rust_binary", "rust_library")
 
 rust_library(
     name = "cxx",
-    srcs = glob(
-        ["src/**/*.rs"],
-        exclude = ["src/symbols/**/*.rs"],
-    ),
+    srcs = glob(["src/**/*.rs"]),
     proc_macro_deps = [
         ":cxxbridge-macro",
     ],
     visibility = ["//visibility:public"],
-    deps = [
-        ":core-lib",
-        ":symbols",
-    ],
+    deps = [":core-lib"],
 )
 
 rust_binary(
@@ -44,11 +38,6 @@ cc_library(
     hdrs = ["include/cxx.h"],
 )
 
-rust_library(
-    name = "symbols",
-    srcs = glob(["src/symbols/**/*.rs"]),
-)
-
 rust_library(
     name = "cxxbridge-macro",
     srcs = glob(["macro/src/**"]),

Cargo.toml

@@ -20,7 +20,6 @@ default = ["cxxbridge-flags/default"] # c++11
 "c++20" = ["cxxbridge-flags/c++20"]
 
 [dependencies]
-cxx-symbols = { version = "=0.4.3", path = "src/symbols" }
 cxxbridge-macro = { version = "=0.4.3", path = "macro" }
 link-cplusplus = "1.0"
 
@@ -35,7 +34,7 @@ rustversion = "1.0"
 trybuild = { version = "1.0.33", features = ["diff"] }
 
 [workspace]
-members = ["demo", "flags", "gen/build", "gen/cmd", "gen/lib", "macro", "src/symbols", "tests/ffi"]
+members = ["demo", "flags", "gen/build", "gen/cmd", "gen/lib", "macro", "tests/ffi"]
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

src/lib.rs

@@ -369,8 +369,9 @@
 
 #[cfg(built_with_cargo)]
 extern crate link_cplusplus;
+
 #[macro_use]
-extern crate symbols;
+mod macros;
 
 mod cxx_string;
 mod cxx_vector;
@@ -383,6 +384,7 @@ mod rust_sliceu8;
 mod rust_str;
 mod rust_string;
 mod rust_vec;
+mod symbols;
 mod unique_ptr;
 mod unwind;
 

src/symbols/macros/assert.rs renamed to src/macros/assert.rs

@@ -3,7 +3,7 @@ use std::mem::ManuallyDrop;
 
 #[repr(C)]
 pub struct RustVec<T> {
-    repr: Vec<T>,
+    pub(crate) repr: Vec<T>,
 }
 
 impl<T> RustVec<T> {