Fix paths

Author: tgross35

library/Cargo.lock

@@ -8,7 +8,7 @@ version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
- "compiler_builtins 0.1.160 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins",
  "gimli",
  "rustc-std-workspace-alloc",
  "rustc-std-workspace-core",
@@ -20,15 +20,15 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 dependencies = [
- "compiler_builtins 0.1.160 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins",
  "rustc-std-workspace-core",
 ]
 
 [[package]]
 name = "alloc"
 version = "0.0.0"
 dependencies = [
- "compiler_builtins 0.1.160",
+ "compiler_builtins",
  "core",
 ]
 
@@ -62,18 +62,10 @@ name = "compiler_builtins"
 version = "0.1.160"
 dependencies = [
  "cc",
+ "core",
  "panic-handler",
 ]
 
-[[package]]
-name = "compiler_builtins"
-version = "0.1.160"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6376049cfa92c0aa8b9ac95fae22184b981c658208d4ed8a1dc553cd83612895"
-dependencies = [
- "rustc-std-workspace-core",
-]
-
 [[package]]
 name = "core"
 version = "0.0.0"
@@ -93,7 +85,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8cff88b751e7a276c4ab0e222c3f355190adc6dde9ce39c851db39da34990df7"
 dependencies = [
  "cfg-if",
- "compiler_builtins 0.1.160 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins",
  "libc",
  "rustc-std-workspace-core",
  "windows-sys",
@@ -105,7 +97,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57cafc2274c10fab234f176b25903ce17e690fca7597090d50880e047a0389c5"
 dependencies = [
- "compiler_builtins 0.1.160 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins",
  "rustc-std-workspace-core",
 ]
 
@@ -126,7 +118,7 @@ version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 dependencies = [
- "compiler_builtins 0.1.160 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins",
  "rustc-std-workspace-alloc",
  "rustc-std-workspace-core",
 ]
@@ -146,7 +138,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
 dependencies = [
- "compiler_builtins 0.1.160 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins",
  "rustc-std-workspace-alloc",
  "rustc-std-workspace-core",
 ]
@@ -166,7 +158,7 @@ version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 dependencies = [
- "compiler_builtins 0.1.160 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins",
  "rustc-std-workspace-core",
 ]
 
@@ -177,7 +169,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
 dependencies = [
  "adler2",
- "compiler_builtins 0.1.160 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins",
  "rustc-std-workspace-alloc",
  "rustc-std-workspace-core",
 ]
@@ -188,7 +180,7 @@ version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
- "compiler_builtins 0.1.160 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins",
  "memchr",
  "rustc-std-workspace-alloc",
  "rustc-std-workspace-core",
@@ -203,7 +195,7 @@ name = "panic_abort"
 version = "0.0.0"
 dependencies = [
  "alloc",
- "compiler_builtins 0.1.160",
+ "compiler_builtins",
  "core",
  "libc",
 ]
@@ -214,7 +206,7 @@ version = "0.0.0"
 dependencies = [
  "alloc",
  "cfg-if",
- "compiler_builtins 0.1.160",
+ "compiler_builtins",
  "core",
  "libc",
  "unwind",
@@ -242,7 +234,7 @@ version = "5.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
 dependencies = [
- "compiler_builtins 0.1.160 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins",
  "rustc-std-workspace-core",
 ]
 
@@ -252,7 +244,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e43c53ff1a01d423d1cb762fd991de07d32965ff0ca2e4f80444ac7804198203"
 dependencies = [
- "compiler_builtins 0.1.160 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins",
  "r-efi",
  "rustc-std-workspace-core",
 ]
@@ -309,7 +301,7 @@ dependencies = [
 name = "rustc-std-workspace-core"
 version = "1.99.0"
 dependencies = [
- "compiler_builtins 0.1.160",
+ "compiler_builtins",
  "core",
 ]
 
@@ -333,7 +325,7 @@ dependencies = [
  "addr2line",
  "alloc",
  "cfg-if",
- "compiler_builtins 0.1.160",
+ "compiler_builtins",
  "core",
  "dlmalloc",
  "fortanix-sgx-abi",
@@ -399,7 +391,7 @@ name = "unwind"
 version = "0.0.0"
 dependencies = [
  "cfg-if",
- "compiler_builtins 0.1.160",
+ "compiler_builtins",
  "core",
  "libc",
  "unwinding",
@@ -411,7 +403,7 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8393f2782b6060a807337ff353780c1ca15206f9ba2424df18cb6e733bd7b345"
 dependencies = [
- "compiler_builtins 0.1.160 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins",
  "gimli",
  "rustc-std-workspace-core",
 ]
@@ -422,7 +414,7 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 dependencies = [
- "compiler_builtins 0.1.160 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins",
  "rustc-std-workspace-alloc",
  "rustc-std-workspace-core",
 ]

library/Cargo.toml

@@ -54,3 +54,4 @@ cfg-if = { git = "https://github.com/tgross35/cfg-if.git", branch = "no-compiler
 hashbrown = { git = "https://github.com/tgross35/hashbrown.git", branch = "no-compiler-builtins"}
 rustc-demangle = { git = "https://github.com/tgross35/rustc-demangle.git", branch = "no-compiler-builtins"}
 unicode-width = { git = "https://github.com/tgross35/unicode-width.git", branch = "no-compiler-builtins"}
+compiler_builtins = { path = "compiler-builtins/compiler-builtins" }

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

@@ -19,6 +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 = { path = "../../core", optional = true }
 # core = { version = "1.0.0", optional = true, package = "rustc-std-workspace-core" }
 
 [build-dependencies]
@@ -53,8 +54,7 @@ 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"]
+rustc-dep-of-std = ["compiler-builtins", "dep:core"]
 
 # This makes certain traits and function specializations public that
 # are not normally public but are required by the `builtins-test`

library/compiler-builtins/crates/panic-handler/src/lib.rs

@@ -1,11 +1,11 @@
-//! This is needed for tests on targets that require a `#[panic_handler]` function
+// //! This is needed for tests on targets that require a `#[panic_handler]` function
 
 #![feature(no_core)]
 #![no_core]
 
-extern crate core;
+// extern crate core;
 
-#[panic_handler]
-fn panic(_: &core::panic::PanicInfo) -> ! {
-    loop {}
-}
+// #[panic_handler]
+// fn panic(_: &core::panic::PanicInfo) -> ! {
+//     loop {}
+// }