<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a07f2a4ee8fdf4a5050ceb812dcb659283037c80">https://github.com/macports/macports-ports/commit/a07f2a4ee8fdf4a5050ceb812dcb659283037c80</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a07f2a4ee8fdf4a5050ceb812dcb659283037c80
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Thu Feb 24 15:21:51 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> rust: update to 1.59.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - use Python 3.10
</span><span style='display:block; white-space:pre;color:#404040;'> - add lbzip2 as build dependency
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/64686
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/64728
</span>---
lang/rust/Portfile | 123 ++++++++++++++++----------------
lang/rust/files/compiler_builtins.diff | 8 +--
lang/rust/files/offline-bootstrap.patch | 8 +--
3 files changed, 68 insertions(+), 71 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/rust/Portfile b/lang/rust/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2a33cb6e584..a87cf4c1d11 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/rust/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/rust/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,9 +10,14 @@ legacysupport.newest_darwin_requires_legacy 15
</span>
# keep in mind that you also need to update cargo.crates at the end of this file
name rust
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.58.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# rust-src has increased revision. Keep it in mind
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.59.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# rustc_version is the prior version of Rust used to build the stages of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this current version. The specific prior version is declared in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# src/stage0.json. Rust stable 1.x usually requires `set rustc_version 1.(x-1)`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set rustc_version 1.58.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
if { ${subport} eq ${name} } {
PortGroup openssl 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +26,6 @@ if { ${subport} eq ${name} } {
</span> }
categories lang devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> supported_archs x86_64 arm64
license {MIT Apache-2} BSD zlib NCSA Permissive
maintainers {g5pw @g5pw} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,11 +45,7 @@ long_description Rust is a curly-brace, block-structured expression \
</span>
homepage https://www.rust-lang.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Get from src/stage0.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Rust stable 1.x usually requires `set rustc_version 1.(x-1)`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set rustc_version 1.57.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set py_ver 3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver 3.10
</span> set py_ver_nodot [string map {. {}} ${py_ver}]
# Make sure the chosen python is found via PATH
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,6 +108,7 @@ if { ${subport} ne ${ccwrap} } {
</span> bin:git:git \
path:bin/cmake:cmake \
port:cctools \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lbzip2 \
</span> port:python${py_ver_nodot} \
port:pkgconfig \
port:ninja \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,34 +128,34 @@ distfiles-append rust-std-${binTag}${extract.suffix} \
</span> cargo-${binTag}${extract.suffix}
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c3ca2d08e695c11ec30afcd840a1f564f16a1592 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a839afdd3625d6f3f3c4c10b79813675d1775c460d14be1feaf33a6c829c07c7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 183834489
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 758b0bfa6955aa8a0676b857d6a571fae435d80e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a7c8eeaee85bfcef84c96b02b3171d1e6540d15179ff83dddd9eafba185f85f9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 190229590
</span>
checksums-append rust-std-${rustc_version}-x86_64-apple-${os.platform}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 70f98e9c74a10231843d42a57cbdc68ec39331a9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c1eb892ddb50ebeed288b7aa8171ad46d62362bb26b2d82d2b463dfd45606dc2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 37799551 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 10ddd3a98036998f0f3904223eadd77a8d61ed2b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fa89e9ab2e3645d6732811dae3828c86fbd65cb7447ec33c84137e61b168396a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 38052490 \
</span> rustc-${rustc_version}-x86_64-apple-${os.platform}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 7957152a70746d494e62ce0eea219daee0846ead \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4417eea141bb915f39305cf2d812579f503422fa2e712eddf11427ce91c48294 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 97498978 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 37f05c82ab6e9297852eaef21f503c3781b852d3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3d3815385dda1c1d8617ee14b682ec3804307b0f5a0ac5604a7dc5efc783263f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 97525234 \
</span> cargo-${rustc_version}-x86_64-apple-${os.platform}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 e6e12bdc5de488d01cbd271f4f8f4945ecb6b41c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 26129f0e3ecd42e730f62d9c693e1a89aedfe6b7c8108cf970b2f1ed51900fb8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6718899 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a549b5d7ce05fa2152ef81e8086320da11b7ecd3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 60203fc7ec453f2a9eb93734c70a72f8ee88e349905edded04155c1646e283a6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6644822 \
</span> rust-std-${rustc_version}-aarch64-apple-${os.platform}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 8541ec8419f44f2bc114908be8865c5af8fa59a9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3b442d3f546524aef4fe8483c5ddcec1c5dbd52216d98aabc066883db31088d8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 36320839 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 31a8636f80df5bef24b474814d8e53d8ddc2526a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7c1d58bdc87b79f439b1083348a0e492305f8737ad1931755c26b2834a854f42 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 37218461 \
</span> rustc-${rustc_version}-aarch64-apple-${os.platform}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 4e639f226571bca82736673a078ef5244cfe16c7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cfd28be33d8669c85dc177775de6c4aa94289bba7cc65b90cbd2d9cd5486c860 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 98877438 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 c73151a7c0d73b8500bb4cc1e8542fc32699b015 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7b3291177d4f8a73c8e20185a04bbc88775fc85eeb271c19bc8f37fb5051ae0c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 98543672 \
</span> cargo-${rustc_version}-aarch64-apple-${os.platform}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 4fe6ef71ea1e3b3a593b15c31b31648f68e15b7f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2171ecf2c18fadd90588252aa294272aeb740f065772076ef36d04b1b4bfcc4e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5968351
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b810fe314b99b9836fc05f333139d4e3c92012e8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9144ee0f614c8dcb5f34a774e47a24b676860fa442afda2a3c7f45abfe694e6a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5906007
</span>
# The only way to introduce support of macOS 10.6 is reimplement __thread
# See: https://github.com/rust-lang/rust/issues/10842
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -378,8 +379,6 @@ livecheck.url https://github.com/rust-lang/rust/tags
</span> livecheck.regex refs/tags/(\[\\d\\.\]+).zip
subport rust-src {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision [ expr ${revision} + 0 ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # do not unpack bootsrap dependency
distfiles ${distname}${extract.suffix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -463,7 +462,7 @@ if {${subport} ne "${ccwrap}" && ${subport} ne "rust-src"} {
</span> annotate-snippets 0.8.0 d78ea013094e5ea606b1c05fe35f1dd7ea1eb1ea259908d040b25bd5ec677ee5 \
ansi_term 0.11.0 ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b \
ansi_term 0.12.1 d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- anyhow 1.0.34 bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ anyhow 1.0.51 8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203 \
</span> array_tool 1.0.3 8f8cb5d814eb646a863c4f24978cff2880c4be96ad8cde2c0f0678732902e271 \
arrayvec 0.7.0 5a2f58b0bb10c380af2b26e57212856b8c9a59e0925b4c20f4a174a49734eaf7 \
atty 0.2.14 d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -486,12 +485,12 @@ if {${subport} ne "${ccwrap}" && ${subport} ne "rust-src"} {
</span> cc 1.0.69 e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2 \
cfg-if 0.1.10 4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822 \
cfg-if 1.0.0 baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- chalk-derive 0.55.0 3983193cacd81f0f924acb666b7fe5e1a0d81db9f113fa69203eda7ea8ce8b6c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- chalk-engine 0.55.0 05a171ce5abbf0fbd06f221ab80ab182c7ef78603d23b858bc44e7ce8a86a396 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- chalk-ir 0.55.0 a522f53af971e7678f472d687e053120157b3ae26e2ebd5ecbc0f5ab124f2cb6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- chalk-solve 0.55.0 cdf79fb77a567e456a170f7ec84ea6584163d4ba3f13660cd182013d34ca667c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chalk-derive 0.75.0 d54e3b5f9e3425e6b119ff07568d8d006bfa5a8d6f78a9cbc3530b1e962e316c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chalk-engine 0.75.0 bdc891073396b167163db77123b0a3c00088edc00466cecc5531f33e3e989523 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chalk-ir 0.75.0 2b79e5a1d04b79311e90c69356a2c62027853906a7e33b3e070b93c055fc3e8a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chalk-solve 0.75.0 a5d2a1db6605aba70a58820bd80ac422b218913a510f1a40beef9efc5371ea1d \
</span> chrono 0.4.19 670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- clap 2.33.3 37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clap 2.34.0 a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c \
</span> cmake 0.1.44 0e56268c17a6248366d66d4a47a3381369d068cce8409bb1716ed77ea32163bb \
colored 2.0.0 b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd \
commoncrypto 0.2.0 d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -536,6 +535,7 @@ if {${subport} ne "${ccwrap}" && ${subport} ne "rust-src"} {
</span> env_logger 0.9.0 0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3 \
expect-test 1.0.1 ceb96f3eaa0d4e8769c52dacfd4eb60183b817ed2f176171b3c691d5022b0f2e \
fake-simd 0.1.2 e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ fallible-iterator 0.2.0 4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7 \
</span> filetime 0.2.14 1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8 \
fixedbitset 0.2.0 37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d \
flate2 1.0.16 68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -566,6 +566,7 @@ if {${subport} ne "${ccwrap}" && ${subport} ne "rust-src"} {
</span> getrandom 0.2.0 ee8025cf36f917e6a52cce185b7c7177689b838b7ec138364e50cc2277a56cf4 \
getset 0.1.1 24b328c01a4d71d2d8173daa93562a73ab0fe85616876f02500f53d82948c504 \
gimli 0.25.0 f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ gimli 0.26.1 78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4 \
</span> git2 0.13.23 2a8057932925d3a9d9e4434ea016570d37420ddb1ceed45a174d577f24ed6700 \
git2-curl 0.14.1 883539cb0ea94bab3f8371a98cd8e937bbe9ee7c044499184aa4c17deb643a50 \
glob 0.3.0 9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -589,7 +590,7 @@ if {${subport} ne "${ccwrap}" && ${subport} ne "rust-src"} {
</span> im-rc 15.0.0 3ca8957e71f04a205cb162508f9326aea04676c8dfd0711220190d6b83664f3f \
indexmap 1.7.0 bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5 \
indoc 1.0.3 e5a75aeaaef0ce18b58056d306c27b07436fbb34b8816c53094b76dd81803136 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- instant 0.1.6 5b141fdc7836c525d4d594027d318c84161ca17aaf8113ab1f81ab93ae897485 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ instant 0.1.12 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c \
</span> itertools 0.9.0 284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b \
itertools 0.10.1 69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf \
itoa 0.4.6 dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -605,14 +606,15 @@ if {${subport} ne "${ccwrap}" && ${subport} ne "rust-src"} {
</span> jsonrpc-server-utils 18.0.0 fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4 \
lazy_static 1.4.0 e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646 \
lazycell 1.3.0 830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- libc 0.2.106 a60553f9a9e039a333b4e9b20573b9e9b9c0bb3a11e201ccc48ef4283456d673 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libc 0.2.108 8521a1b57e76b1ec69af7599e75e38e7b7fad6610f037db8c79b127201b5d119 \
</span> libgit2-sys 0.12.24+1.3.0 ddbd6021eef06fb289a8f54b3c2acfdd85ff2a585dfbb24b8576325373d2152c \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ libloading 0.7.1 c0cf036d15402bea3c5d4de17b3fce76b3e4a56ebc1f577be0e7a72f7c607cf0 \
</span> libm 0.1.4 7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a \
libnghttp2-sys 0.1.4+1.41.0 03624ec6df166e79e139a2310ca213283d6b3c30810c54844f307086d4488df1 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- libssh2-sys 0.2.19 ca46220853ba1c512fc82826d0834d87b06bcd3c2a42241b7de72f3d2fe17056 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libssh2-sys 0.2.23 b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca \
</span> libz-sys 1.1.3 de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66 \
linked-hash-map 0.5.3 8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lock_api 0.4.1 28247cc5a5be2f05fbcd76dd0cf2c7d3b5400cb978a28042abcd4fa0b3f8261c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lock_api 0.4.5 712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109 \
</span> log 0.4.14 51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710 \
lsp-codec 0.3.0 aa939d0b62476a5a19fb7fcb423a5c6ce8c7e09b851d37531e2fe3e0e6d9d257 \
lsp-types 0.60.0 fe3edefcd66dde1f7f1df706f46520a3c93adc5ca4bc5747da6621195e894efd \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -622,18 +624,16 @@ if {${subport} ne "${ccwrap}" && ${subport} ne "rust-src"} {
</span> maplit 1.0.2 3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d \
markup5ever 0.10.0 aae38d669396ca9b707bfc3db254bc382ddb94f57cc5c235f34623a669a01dab \
markup5ever_rcdom 0.1.0 f015da43bcd8d4f144559a3423f4591d69b8ce0652c905374da7205df336ae2b \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- matchers 0.0.1 f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ matchers 0.1.0 8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558 \
</span> matches 0.1.8 7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08 \
maybe-uninit 2.0.0 60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00 \
md-5 0.9.1 7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- mdbook 0.4.12 0651782b4cc514c3f98c0acf9b5af1101a735bbe1ac6852bb1a90cb91bdf0ed4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mdbook 0.4.15 241f10687eb3b4e0634b3b4e423f97c5f1efbd69dc9522e24a8b94583eeec3c6 \
</span> measureme 9.1.2 78f7a41bc6f856a2cf0e95094ad5121f82500e2d9a0f3c0171d98f6566d8117d \
measureme 10.0.0 bd460fad6e55ca82fa0cd9dab0d315294188fd9ec6efbf4105e5635d4872ef9c \
memchr 2.4.1 308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a \
memmap2 0.2.1 04e3e85b970d650e2ae6d70592474087051c11c54da7f7b4949725c5735fbcc6 \
memoffset 0.5.5 c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- merge 0.1.0 10bbef93abb1da61525bbc45eeaff6473a41907d19f8f9aa5168d214e10693e9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- merge_derive 0.1.0 209d075476da2e63b4b29e72a2ef627b840589588e71400a25e3565c4f849d07 \
</span> minifier 0.0.41 5594542d20834f2b974f5e5fb8e0cf1c67a2119dcadc29ef5d93a081fb30cc08 \
miniz_oxide 0.4.0 be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f \
mio 0.7.13 8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -644,11 +644,11 @@ if {${subport} ne "${ccwrap}" && ${subport} ne "rust-src"} {
</span> num-traits 0.2.12 ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611 \
num_cpus 1.13.0 05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3 \
object 0.26.2 39f37e50073ccad23b6d09bcb5b263f4e76d3bb6038e4a3c08e52162ffa8abc2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ object 0.27.1 67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9 \
</span> odht 0.3.1 5a518809ac14b25b569624d0268eba1e88498f71615893dca57982bed7621abb \
once_cell 1.7.2 af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3 \
opaque-debug 0.2.3 2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c \
opaque-debug 0.3.0 624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- open 1.4.0 7c283bf0114efea9e42f1a60edea9859e8c47528eae09d01df4b29c1e489cc48 \
</span> opener 0.5.0 4ea3ebcd72a54701f56345f16785a6d3ac2df7e986d273eb4395c0b01db17952 \
openssl 0.10.35 549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885 \
openssl-probe 0.1.2 77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -659,8 +659,8 @@ if {${subport} ne "${ccwrap}" && ${subport} ne "rust-src"} {
</span> output_vt100 0.1.2 53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9 \
packed_simd_2 0.3.4 3278e0492f961fd4ae70909f56b2723a7e8d01a228427294e19cdfdebda89a17 \
parity-tokio-ipc 0.9.0 9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- parking_lot 0.11.1 6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- parking_lot_core 0.8.3 fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ parking_lot 0.11.2 7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ parking_lot_core 0.8.5 d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216 \
</span> pathdiff 0.2.0 877630b3de15c0b64cc52f659345724fbf6bdad9bd9566699fc53688f3c34a34 \
percent-encoding 1.0.1 31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831 \
percent-encoding 2.1.0 d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -689,8 +689,7 @@ if {${subport} ne "${ccwrap}" && ${subport} ne "rust-src"} {
</span> proc-macro-nested 0.1.7 bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086 \
proc-macro2 1.0.30 edc3358ebc67bc8b7fa0c007f945b0b18226f78437d61bec735a9eb96b61ee70 \
psm 0.1.16 cd136ff4382c4753fc061cb9e4712ab2af263376b95bbd5bd8cd50c020b78e69 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pulldown-cmark 0.7.2 ca36dea94d187597e104a5c8e4b07576a8a45aa5db48a65e12940d3eb7461f55 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pulldown-cmark 0.8.0 ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pulldown-cmark 0.9.1 34f197a544b0c9ab3ae46c359a7ec9cbbb5c7bf97054266fecb7ead794a181d6 \
</span> punycode 0.4.1 e9e1dcb320d6839f6edb64f7a4a59d39b30480d4d1765b56873f7c858538a5fe \
quick-error 1.2.3 a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0 \
quick-error 2.0.0 3ac73b1112776fc109b2e61909bc46c7e1bf0d7f690ffb1676553acce16d5cda \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -743,7 +742,6 @@ if {${subport} ne "${ccwrap}" && ${subport} ne "rust-src"} {
</span> rustc-rayon-core 0.3.1 e94187d9ea3e8c38fafdbc38acb94eafa7ce155867f6ccb13830466a0d0db8c6 \
rustc-semver 1.1.0 5be1bdc7edf596692617627bbfeaba522131b18e06ca4df2b6b689e3c5d5ce84 \
rustc_tools_util 0.2.0 b725dadae9fabc488df69a287f5a99c5eaf5d10853842a8a3dfac52476f544ee \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rustc_version 0.3.3 f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee \
</span> rustc_version 0.4.0 bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366 \
rustfix 0.5.1 f2c50b74badcddeb8f7652fa8323ce440b95286f8e4b64ebfd871c609672704e \
rustfix 0.6.0 6f0be05fc0675ef4f47119dc39cfc46636bb77d4fc4ef1bd851b9c3f7697f32a \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -782,12 +780,12 @@ if {${subport} ne "${ccwrap}" && ${subport} ne "rust-src"} {
</span> string_cache_codegen 0.5.1 f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97 \
strip-ansi-escapes 0.1.0 9d63676e2abafa709460982ddc02a3bb586b6d15a49b75c212e06edd3933acee \
strsim 0.8.0 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- structopt 0.3.16 de5472fb24d7e80ae84a7801b7978f95a19ec32cb1876faea59ab711eb901976 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- structopt-derive 0.4.9 1e0eb37335aeeebe51be42e2dc07f031163fbabfa6ac67d7ea68b5c2f68d5f99 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ structopt 0.3.25 40b9788f4202aa75c240ecc9c15c65185e6a39ccdeb0fd5d008b98825464c87c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ structopt-derive 0.4.18 dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0 \
</span> strum 0.18.0 57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b \
strum_macros 0.18.0 87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c \
syn 1.0.80 d010a1623fbd906d51d650a9916aaefc05ffa0e4053ff7fe601167f3e715d194 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- synstructure 0.12.4 b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ synstructure 0.12.6 f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f \
</span> tar 0.4.37 d6f5515d3add52e0bbdcad7b83c388bb36ba7b754dda3b5f5bc2d38640cdba5c \
tempfile 3.2.0 dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22 \
tendril 0.4.1 707feda9f2582d5d680d733e38755547a3e8fb471e7ba11452ecfd9ce93a5d3b \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -798,8 +796,9 @@ if {${subport} ne "${ccwrap}" && ${subport} ne "rust-src"} {
</span> termize 0.1.1 1706be6b564323ce7092f5f7e6b118a14c8ef7ed0e69c8c5329c914a9f101295 \
tester 0.9.0 0639d10d8f4615f223a57275cf40f9bdb7cfbb806bcb7f7cc56e3beb55a576eb \
textwrap 0.11.0 d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- thiserror 1.0.20 7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- thiserror-impl 1.0.20 bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ thiserror 1.0.30 854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ thiserror-impl 1.0.30 aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ thorin-dwp 0.1.1 039d1fc0bfdb73910c2702893515580e38c192f47a987bc98ddd38a36f2d953a \
</span> thread_local 1.0.1 d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14 \
tikv-jemalloc-sys 0.4.1+5.2.1-patched 8a26331b05179d4cb505c8d6814a7e18d298972f0a551b0e3cefccff927f86d3 \
tikv-jemallocator 0.4.1 3c14a5a604eb8715bc5785018a37d00739b180bcf609916ddf4393d33d49ccdf \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -809,14 +808,14 @@ if {${subport} ne "${ccwrap}" && ${subport} ne "rust-src"} {
</span> tokio-stream 0.1.7 7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f \
tokio-util 0.6.7 1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592 \
toml 0.5.7 75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ topological-sort 0.1.0 aa7c7f42dea4b1b99439786f5633aeb9c14c1b53f75e282803c2ec2ad545873c \
</span> tower-service 0.3.1 360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- tracing 0.1.28 84f96e095c0c82419687c20ddf5cb3eadb61f4e1405923c9dc8e53a1adacbda8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tracing-attributes 0.1.17 c4f915eb6abf914599c200260efced9203504c4c37380af10cdf3b7d36970650 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tracing 0.1.29 375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tracing-attributes 0.1.18 f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e \
</span> tracing-core 0.1.21 1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4 \
tracing-log 0.1.2 a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- tracing-serde 0.1.2 fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tracing-subscriber 0.2.16 8ab8966ac3ca27126141f7999361cc97dd6fb4b71da04c02044fa9045d98bb96 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tracing-tree 0.1.9 1712b40907f8d9bc2bc66763ab61dec914b7123d7149e59feb0d4e2a95fc4967 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tracing-subscriber 0.3.3 245da694cc7fc4729f3f418b304cb57789f1bed2a78c575407ab8a23f53cb4d3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tracing-tree 0.2.0 3ce989c9962c7f61fe084dd4a230eec784649dfc2392467c790007c3a6e134e7 \
</span> typenum 1.12.0 373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33 \
ucd-parse 0.1.8 5269f8d35df6b8b60758343a6d742ecf09e4bca13faee32af5503aebd1e11b7c \
ucd-trie 0.1.3 56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/rust/files/compiler_builtins.diff b/lang/rust/files/compiler_builtins.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4aa03da108b..2f062030375 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/rust/files/compiler_builtins.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/rust/files/compiler_builtins.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- library/std/Cargo.toml.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ library/std/Cargo.toml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- library/std/Cargo.toml 2022-02-24 14:23:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ library/std/Cargo.toml 2022-02-24 14:24:09.000000000 -0500
</span> @@ -16,7 +16,7 @@
panic_abort = { path = "../panic_abort" }
core = { path = "../core" }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- libc = { version = "0.2.106", default-features = false, features = ['rustc-dep-of-std'] }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--compiler_builtins = { version = "0.1.53" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libc = { version = "0.2.108", default-features = false, features = ['rustc-dep-of-std'] }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-compiler_builtins = { version = "0.1.67" }
</span> +compiler_builtins = { version = "0.1.69" }
profiler_builtins = { path = "../profiler_builtins", optional = true }
unwind = { path = "../unwind" }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/rust/files/offline-bootstrap.patch b/lang/rust/files/offline-bootstrap.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 303592d2085..864ac3426e2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/rust/files/offline-bootstrap.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/rust/files/offline-bootstrap.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/bootstrap/bootstrap.py src/bootstrap/bootstrap.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e34768bc2c9..fea0cdfa8a0 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/bootstrap/bootstrap.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/bootstrap/bootstrap.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -938,6 +938,7 @@ class RustBuild(object):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/bootstrap/bootstrap.py 2022-02-24 14:11:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/bootstrap/bootstrap.py 2022-02-24 14:11:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1028,6 +1028,7 @@
</span> args.append("--locked")
if self.use_vendored_sources:
args.append("--frozen")
</pre><pre style='margin:0'>
</pre>