diff --git a/build_sysroot/Cargo.lock b/build_sysroot/Cargo.lock
index 7ddf91ad01f..7755943bf3a 100644
--- a/build_sysroot/Cargo.lock
+++ b/build_sysroot/Cargo.lock
@@ -261,7 +261,6 @@ version = "0.1.5"
 dependencies = [
  "cfg-if",
  "compiler_builtins",
- "libc",
  "rustc-std-workspace-alloc",
  "rustc-std-workspace-core",
 ]
@@ -273,6 +272,7 @@ dependencies = [
  "alloc",
  "compiler_builtins",
  "core",
+ "proc_macro",
  "std",
  "test",
 ]
@@ -285,7 +285,6 @@ dependencies = [
  "getopts",
  "panic_abort",
  "panic_unwind",
- "proc_macro",
  "std",
 ]
 
diff --git a/build_sysroot/Cargo.toml b/build_sysroot/Cargo.toml
index 8219e6b6ccf..ea9d1c8df1c 100644
--- a/build_sysroot/Cargo.toml
+++ b/build_sysroot/Cargo.toml
@@ -7,6 +7,7 @@ core = { path = "./sysroot_src/library/core" }
 alloc = { path = "./sysroot_src/library/alloc" }
 std = { path = "./sysroot_src/library/std", features = ["panic_unwind", "backtrace"] }
 test = { path = "./sysroot_src/library/test" }
+proc_macro = { path = "./sysroot_src/library/proc_macro" }
 
 compiler_builtins = { version = "0.1.87", default-features = false, features = ["no-asm"] }
 
diff --git a/rust-toolchain b/rust-toolchain
index f5c196a8e70..056268c61e6 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2023-05-04"
+channel = "nightly-2023-05-05"
 components = ["rust-src", "rustc-dev", "llvm-tools-preview"]