From b65624963d47e1a57a45388dd5da7761f8eeef04 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Thu, 30 Apr 2020 21:40:07 +0300
Subject: [PATCH] rust: Revert to previous version until Firefox supports this
 one.

---
 extra/rust/build     | 6 ++----
 extra/rust/checksums | 9 ++++-----
 extra/rust/sources   | 9 ++++-----
 extra/rust/version   | 2 +-
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/extra/rust/build b/extra/rust/build
index 2e7fc267..de563db1 100755
--- a/extra/rust/build
+++ b/extra/rust/build
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-for patch in *.patch; do 
+for patch in *.patch; do
     patch -p1 < "$patch"
 done
 
@@ -8,7 +8,7 @@ done
 # bootstrap library to allow for the removal of the internet
 # connection requirement per build.
 {
-    mkdir -p "${cache_dir:=build/cache/2020-03-12}"
+    mkdir -p "${cache_dir:=build/cache/2020-02-27}"
 
     for tarball in *.tar.xz\?no-extract; do
         mv -f "$tarball" "$cache_dir/${tarball%%\?no-extract}"
@@ -63,5 +63,3 @@ export DESTDIR="$1"
 
 python3 ./x.py build -j "$(nproc)"
 python3 ./x.py install
-
-rm -rf "$1/usr/lib/rustlib/src/"
diff --git a/extra/rust/checksums b/extra/rust/checksums
index b04efab6..47ac6e98 100644
--- a/extra/rust/checksums
+++ b/extra/rust/checksums
@@ -1,6 +1,5 @@
-d0899933840369f07394b211cb0b53a5cd4634907633f0bee541133c8b75e309  rustc-1.43.0-src.tar.xz
-f429e81c3266bdcc038b6c2c2e5f51c64f75a85b46749e2cf5b93556f17b63a1  rust-std-1.42.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-79029296fbd91c19c2ad080a52c62963eb127227c59005645b86b5aa9aa310b8  rustc-1.42.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-705e648c727c50b3815a7be4a18a5886cb9f68e69df990710e938678080264a0  cargo-0.43.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+aa5b4c0f2bac33cc26a11523fce9b0f120d2eff510ed148ae7c586501481ed04  rustc-1.42.0-src.tar.xz
+82b2ce7da86132beeab1a00e52c3a748d52206af4cdd82de6586b13e819ceba7  rust-std-1.41.1-x86_64-unknown-linux-musl.tar.xz?no-extract
+af9b1797ce5ae20bceabc3e5e67a9aca507bcfca3100d916783bd82273924d46  rustc-1.41.1-x86_64-unknown-linux-musl.tar.xz?no-extract
+4f36ad854709cfaa85bf98d05cb9ecbcc2ee3a2698af99bfff0e04cd941bea56  cargo-0.42.0-x86_64-unknown-linux-musl.tar.xz?no-extract
 abb2acdfc50880da504225dd068f5ea381997cac9ebd23f371290aa8f29d438f  musl.patch
-722f672f3a96ad1916d47a88b922579456b3af2cdc37096ce98a093f3589a4fb  llvm10.patch
diff --git a/extra/rust/sources b/extra/rust/sources
index af674ef0..f1a68ebc 100644
--- a/extra/rust/sources
+++ b/extra/rust/sources
@@ -1,6 +1,5 @@
-https://static.rust-lang.org/dist/rustc-1.43.0-src.tar.xz
-https://static.rust-lang.org/dist/2020-03-12/rust-std-1.42.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-https://static.rust-lang.org/dist/2020-03-12/rustc-1.42.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-https://static.rust-lang.org/dist/2020-03-12/cargo-0.43.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/rustc-1.42.0-src.tar.xz
+https://static.rust-lang.org/dist/2020-02-27/rust-std-1.41.1-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/2020-02-27/rustc-1.41.1-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/2020-02-27/cargo-0.42.0-x86_64-unknown-linux-musl.tar.xz?no-extract
 patches/musl.patch
-patches/llvm10.patch
diff --git a/extra/rust/version b/extra/rust/version
index 57b04881..b5951814 100644
--- a/extra/rust/version
+++ b/extra/rust/version
@@ -1 +1 @@
-1.43.0 1
+1.42.0 2