From 808aeec3d8920de7ee8c3b90ee3adafe34074c9b Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Mon, 4 Sep 2023 23:50:51 +0800
Subject: [PATCH] rust: Update to rustc-1.72.0

---
 general/prog/rust.xml | 18 +++++++++---------
 packages.ent          |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/general/prog/rust.xml b/general/prog/rust.xml
index 3ee7c97802..e1eb9e6534 100644
--- a/general/prog/rust.xml
+++ b/general/prog/rust.xml
@@ -6,7 +6,7 @@
 
   <!ENTITY rust-download-http "https://static.rust-lang.org/dist/rustc-&rust-version;-src.tar.xz">
   <!ENTITY rust-download-ftp  " ">
-  <!ENTITY rust-md5sum        "b6f9973de878e37a589f0989e4138480">
+  <!ENTITY rust-md5sum        "4125b8bf1b0bc6a520f8ec21252322e7">
   <!ENTITY rust-size          "145 MB">
   <!ENTITY rust-buildsize     "8.9 GB (292 MB installed); add 6.4 GB if running the tests">
   <!ENTITY rust-time          "6.7 SBU (including download time; add 6.2 SBU for tests, both using parallelism=8)">
@@ -76,7 +76,7 @@
       However it can be mostly limited to a specified number of processors by
       a combination of adding the switch <literal>--jobs &lt;N&gt;</literal>
       (e.g. '--jobs 4' to limit to 4 processors) on each invocation of
-      <command>python3 ./x.py</command> <emphasis>and</emphasis> using an
+      <command>python3 x.py</command> <emphasis>and</emphasis> using an
       environment variable <envar>CARGO_BUILD_JOBS=&lt;N&gt;</envar>. At the
       moment this is not effective when some of the rustc tests are run.
     </para>
@@ -312,9 +312,7 @@ llvm-config = "/usr/bin/llvm-config"
 [target.i686-unknown-linux-gnu]
 # NB the output of llvm-config (i.e. help options) may be
 # dumped to the screen when config.toml is parsed.
-llvm-config = "/usr/bin/llvm-config"
-
-</literal>
+llvm-config = "/usr/bin/llvm-config"</literal>
 EOF</userinput></screen>
 
 <!--<para>
@@ -335,7 +333,7 @@ EOF</userinput></screen>
 
 <screen><userinput>{ [ ! -e /usr/include/libssh2.h ] ||
   export LIBSSH2_SYS_USE_PKG_CONFIG=1; } &amp;&amp;
-python3 ./x.py build</userinput></screen>
+python3 x.py build</userinput></screen>
 
     <note>
       <para>
@@ -352,8 +350,10 @@ python3 ./x.py build</userinput></screen>
       To run the tests (again using all available CPUs) issue:
     </para>
 
-<screen remap="test"><userinput>SSL_CERT_DIR=/etc/ssl/certs \
-python3 ./x.py test --verbose --no-fail-fast | tee rustc-testlog</userinput></screen>
+<screen remap="test"><userinput>mkdir -pv .github/workflows                    &amp;&amp;
+python3 x.py run src/tools/expand-yaml-anchors &amp;&amp;
+SSL_CERT_DIR=/etc/ssl/certs                    \
+python3 x.py test --verbose --no-fail-fast | tee rustc-testlog</userinput></screen>
 
     <!-- https://github.com/rust-lang/rust/issues/112209
          I only saw 2 failures with 1.71.1, but Rainer saw 6 ones.
@@ -438,7 +438,7 @@ python3 ./x.py test --verbose --no-fail-fast | tee rustc-testlog</userinput></sc
       </para>
     </note>
 
-<screen role='root'><userinput>python3 ./x.py install</userinput></screen>
+<screen role='root'><userinput>python3 x.py install</userinput></screen>
 
     <!-- TODO: Report to upstream if this persists in the next release -->
     <para>
diff --git a/packages.ent b/packages.ent
index 695423e5d4..3c5539fe42 100644
--- a/packages.ent
+++ b/packages.ent
@@ -346,7 +346,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY ruby-patch-version           "2">
 <!ENTITY ruby-version                 "&ruby-minor-version;.&ruby-patch-version;">
 <!ENTITY ruby-gemdir                  "/usr/lib/ruby/gems/&ruby-minor-version;.0">
-<!ENTITY rust-version                 "1.71.1">
+<!ENTITY rust-version                 "1.72.0">
 <!ENTITY scons-version                "4.5.2">
 <!ENTITY slang-version                "2.3.3">
 <!ENTITY subversion-version           "1.14.2">