From 6169762d534607588634036fe0d69b0e78bbea28 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Wed, 30 Jun 2021 23:46:09 +0000
Subject: [PATCH] rust: 1.53.0

---
 extra/rust/build                  | 16 ++++++++++------
 extra/rust/checksums              | 10 +++++-----
 extra/rust/patches/libressl.patch |  4 ++--
 extra/rust/sources                |  8 ++++----
 extra/rust/version                |  2 +-
 5 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/extra/rust/build b/extra/rust/build
index 4a2472ef..89434b95 100755
--- a/extra/rust/build
+++ b/extra/rust/build
@@ -6,19 +6,22 @@ patch -p1 < libressl.patch
 # bootstrap library to allow for the removal of the internet
 # connection requirement per build.
 {
-    mkdir -p "${cache_dir:=build/cache/2020-08-27}"
+    mkdir -p "${cache_dir:=build/cache/2021-05-06}"
 
     for tarball in *.tar.xz\?no-extract; do
         mv -f "$tarball" "$cache_dir/${tarball%%\?no-extract}"
     done
 }
 
-# We modified openssl-sys.
-sed -i 's/\("files":{\)[^}]*/\1/' \
-    vendor/openssl-sys/.cargo-checksum.json
-
+# Set shared linking as the default.
 sed -i 's/crt_static_default = true/crt_static_default = false/' \
-    src/librustc_target/spec/linux_musl_base.rs
+    compiler/rustc_target/src/spec/linux_musl_base.rs \
+    vendor/rustc-ap-rustc_target/src/spec/linux_musl_base.rs
+
+# Ignore checksums of files modified above.
+sed -i 's/\("files":{\)[^}]*/\1/' \
+    vendor/openssl-sys/.cargo-checksum.json \
+    vendor/rustc-ap-rustc_target/.cargo-checksum.json
 
 cat > config.toml <<EOF
 [llvm]
@@ -36,6 +39,7 @@ submodules     = false
 python         = "python3"
 locked-deps    = true
 vendor         = true
+tools          = ["cargo", "rls", "clippy", "rustfmt", "analysis", "src", "rust-demangler"]
 sanitizers     = false
 profiler       = false
 full-bootstrap = false
diff --git a/extra/rust/checksums b/extra/rust/checksums
index 24848ab8..e2d54407 100644
--- a/extra/rust/checksums
+++ b/extra/rust/checksums
@@ -1,5 +1,5 @@
-ec2c81d2d34890486094a6407589be96161e4e301c238332d32c6dbae4f38ea2
-9e7107082c5b47b8931f65d5d6a9c97b1540e67533a2e69f480d9d83e8d05d57
-130fb0ef33324996bd87abcc5d6835b0fea97d9786f53c90af5986a80c1d97da
-bc5539c333bda74094aa59a9d08b12e435eb1936389afe58d61673951c07b7ed
-5e00f619c609d03fba09f0c44d8f667d3ab16b7ea2ef7935a1656a8845a930ec
+e53a2df2c2c26f8929d551852eeae242b9a6167fba34481f92010b30def32dec
+d5809f3f1345a3c524f00cfa2ac1631b494a6de3143b1a3d081476f2c4f78905
+57a2282e20694ea9dcb8417bd45ad7623c95ccbfac86c58927a7e3479976b21d
+680dbc224f2a1d9a33a256b15be8d1c58dbdfe88aae3ca9c2b0f805fea568ab3
+9e984b9e4ab38ad6c8b894d23ba9c5546f38a19c8fe01be4ea8c3c1c68b05802
diff --git a/extra/rust/patches/libressl.patch b/extra/rust/patches/libressl.patch
index d5c55278..be633ba4 100644
--- a/extra/rust/patches/libressl.patch
+++ b/extra/rust/patches/libressl.patch
@@ -7,7 +7,7 @@ index 49f26d2b7..27deb1f36 100644
              (3, 1, _) => ('3', '1', 'x'),
              (3, 2, 0) => ('3', '2', '0'),
 +            (3, 2, 1) => ('3', '2', '1'),
-+            (3, 2, _) => ('3', '2', 'x'),
++            (3, 3, _) => ('3', '3', 'x'),
              _ => version_error(),
          };
- 
+
diff --git a/extra/rust/sources b/extra/rust/sources
index fd2b4968..74a699d1 100644
--- a/extra/rust/sources
+++ b/extra/rust/sources
@@ -1,5 +1,5 @@
-https://static.rust-lang.org/dist/rustc-1.47.0-src.tar.xz
-https://static.rust-lang.org/dist/2020-08-27/rust-std-1.46.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-https://static.rust-lang.org/dist/2020-08-27/rustc-1.46.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-https://static.rust-lang.org/dist/2020-08-27/cargo-0.47.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/rustc-1.53.0-src.tar.xz
+https://static.rust-lang.org/dist/2021-05-06/rust-std-1.52.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/2021-05-06/rustc-1.52.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/2021-05-06/cargo-1.52.0-x86_64-unknown-linux-musl.tar.xz?no-extract
 patches/libressl.patch
diff --git a/extra/rust/version b/extra/rust/version
index a42aadef..c56ed413 100644
--- a/extra/rust/version
+++ b/extra/rust/version
@@ -1 +1 @@
-1.47.0 2
+1.53.0 1