Merge #21

21: Add libgc_internal crate to core library r=ltratt a=jacob-hughes



Co-authored-by: Jacob Hughes <jh@jakehughes.uk>

Cargo.lock

@@ -37,6 +37,7 @@ version = "0.0.0"
 dependencies = [
  "compiler_builtins",
  "core",
+ "libgc_internal",
  "rand",
  "rand_xorshift",
 ]
@@ -1719,6 +1720,15 @@ dependencies = [
  "rustc-std-workspace-core",
 ]
 
+[[package]]
+name = "libgc_internal"
+version = "0.1.0"
+source = "git+https://github.com/softdevteam/libgc_internal#cbf33df99760b284fd8fbd8d00afbf35044808da"
+dependencies = [
+ "compiler_builtins",
+ "rustc-std-workspace-core",
+]
+
 [[package]]
 name = "libgit2-sys"
 version = "0.12.14+1.1.0"
@@ -4685,6 +4695,7 @@ dependencies = [
  "hashbrown",
  "hermit-abi",
  "libc",
+ "libgc_internal",
  "miniz_oxide",
  "object",
  "panic_abort",

library/alloc/Cargo.toml

@@ -8,6 +8,7 @@ edition = "2018"
 
 [dependencies]
 core = { path = "../core" }
+libgc_internal = { git = "https://github.com/softdevteam/libgc_internal", features = ['rustgc'] }
 compiler_builtins = { version = "0.1.10", features = ['rustc-dep-of-std'] }
 
 [dev-dependencies]

library/alloc/src/lib.rs

@@ -150,6 +150,9 @@ extern crate std;
 #[cfg(test)]
 extern crate test;
 
+#[allow(unused_extern_crates)]
+extern crate libgc_internal;
+
 // Module with internal macros used by other modules (needs to be included before other modules).
 #[macro_use]
 mod macros;

library/std/Cargo.toml

@@ -12,6 +12,7 @@ crate-type = ["dylib", "rlib"]
 
 [dependencies]
 alloc = { path = "../alloc" }
+libgc_internal = { git = "https://github.com/softdevteam/libgc_internal", features = ['rustgc'] }
 cfg-if = { version = "0.1.8", features = ['rustc-dep-of-std'] }
 panic_unwind = { path = "../panic_unwind", optional = true }
 panic_abort = { path = "../panic_abort" }

src/tools/tidy/src/deps.rs

@@ -114,6 +114,7 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[
     "kernel32-sys",
     "lazy_static",
     "libc",
+    "libgc_internal",
     "libz-sys",
     "lock_api",
     "log",

src/tools/tidy/src/extdeps.rs

@@ -25,6 +25,12 @@ pub fn check(root: &Path, bad: &mut bool) {
         // Extract source value.
         let source = line.split_once('=').unwrap().1.trim();
 
+        // rustc only permits crates from crates.io so for now libgc_internal is
+        // hardcoded to pass the tidy checker.
+        if source.contains("softdevteam/libgc_internal") {
+            continue;
+        }
+
         // Ensure source is allowed.
         if !ALLOWED_SOURCES.contains(&&*source) {
             println!("invalid source: {}", source);