From 0427f3ff8c39390133f1f016645d29d9e4ad2223 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Sat, 11 Feb 2023 14:01:00 -0700
Subject: [PATCH] Update Rust to nightly-2023-01-21

---
 .gitmodules         | 2 +-
 mk/prefix.mk        | 2 ++
 relibc              | 2 +-
 rust                | 2 +-
 rust-toolchain      | 1 -
 rust-toolchain.toml | 3 +++
 6 files changed, 8 insertions(+), 4 deletions(-)
 delete mode 100644 rust-toolchain
 create mode 100644 rust-toolchain.toml

diff --git a/.gitmodules b/.gitmodules
index 80f8f8c..972d88f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,7 +9,7 @@
 [submodule "rust"]
 	path = rust
 	url = https://gitlab.redox-os.org/redox-os/rust.git
-	branch = redox-2022-03-18
+	branch = redox-2023-01-21
 [submodule "redoxfs"]
 	path = redoxfs
 	url = https://gitlab.redox-os.org/redox-os/redoxfs.git
diff --git a/mk/prefix.mk b/mk/prefix.mk
index 0264d2f..a96ecdf 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -151,6 +151,7 @@ else
 	"$</configure" \
 		--prefix="/" \
 		--disable-docs \
+		--disable-download-ci-llvm \
 		--enable-cargo-native-static \
 		--enable-extended \
 		--enable-lld \
@@ -240,6 +241,7 @@ else
 	"$</configure" \
 		--prefix="/" \
 		--disable-docs \
+		--disable-download-ci-llvm \
 		--enable-cargo-native-static \
 		--enable-dist-src \
 		--enable-extended \
diff --git a/relibc b/relibc
index a379161..0bd476d 160000
--- a/relibc
+++ b/relibc
@@ -1 +1 @@
-Subproject commit a37916101fbe8061704c1fc5079021b20789e318
+Subproject commit 0bd476d28af204c34c62cb3e7b5e4c660838d59b
diff --git a/rust b/rust
index d30df15..08f61d4 160000
--- a/rust
+++ b/rust
@@ -1 +1 @@
-Subproject commit d30df15f622c711ab9b27f487e6bde67075a6e44
+Subproject commit 08f61d4025be0ecba7e66bb136434f72c8af3fe9
diff --git a/rust-toolchain b/rust-toolchain
deleted file mode 100644
index 9eed510..0000000
--- a/rust-toolchain
+++ /dev/null
@@ -1 +0,0 @@
-nightly-2022-03-18
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 0000000..87f6fe7
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+channel = "nightly-2023-01-21"
+components = ["rust-src"]