Try to break out of cyclic dependency

Author: tgross35

library/Cargo.lock

@@ -63,7 +63,6 @@ version = "0.1.160"
 dependencies = [
  "cc",
  "panic-handler",
- "rustc-std-workspace-core",
 ]
 
 [[package]]
@@ -314,6 +313,7 @@ dependencies = [
 name = "rustc-std-workspace-core"
 version = "1.99.0"
 dependencies = [
+ "compiler_builtins 0.1.160",
  "core",
 ]
 

library/compiler-builtins/compiler-builtins/Cargo.toml

@@ -19,7 +19,7 @@ test = false
 [dependencies]
 # For more information on this dependency see
 # https://github.com/rust-lang/rust/tree/master/library/rustc-std-workspace-core
-core = { version = "1.0.0", optional = true, package = "rustc-std-workspace-core" }
+# core = { version = "1.0.0", optional = true, package = "rustc-std-workspace-core" }
 
 [build-dependencies]
 cc = { optional = true, version = "1.0" }
@@ -53,7 +53,8 @@ mem = []
 mangled-names = []
 
 # Only used in the compiler's build system
-rustc-dep-of-std = ["compiler-builtins", "dep:core"]
+# rustc-dep-of-std = ["compiler-builtins", "dep:core"]
+rustc-dep-of-std = ["compiler-builtins"]
 
 # This makes certain traits and function specializations public that
 # are not normally public but are required by the `builtins-test`

library/rustc-std-workspace-core/Cargo.toml

@@ -12,4 +12,4 @@ path = "lib.rs"
 
 [dependencies]
 core = { path = "../core" }
-compiler_builtins = { path = "../compiler-builtins/compiler-builtins" }
+compiler_builtins = { path = "../compiler-builtins/compiler-builtins", features = ["compiler-builtins"] }