From 4d21a396a3744ccf45e35fc6306d4e80c80e7f56 Mon Sep 17 00:00:00 2001
From: Thom Chiovoloni <thom@shift.click>
Date: Wed, 18 Oct 2023 06:59:25 -0700
Subject: [PATCH] Update Rust to 1.73.0 (#388)

Depends on https://github.com/tcdi/postgrestd/pull/51
---
 doc/book.toml                              | 2 +-
 doc/src/install-plrust-on-debian-ubuntu.md | 2 +-
 plrust/build                               | 2 +-
 plrustc/build.sh                           | 4 ++--
 plrustc/plrustc/uitests/ice_hook.stderr    | 3 ++-
 plrustc/rust-toolchain.toml                | 2 +-
 rust-toolchain.toml                        | 2 +-
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/doc/book.toml b/doc/book.toml
index 39812464..c1ae2ac3 100644
--- a/doc/book.toml
+++ b/doc/book.toml
@@ -6,4 +6,4 @@ src = "src"
 title = "PL/Rust Guide"
 
 [preprocessor.variables.variables]
-toolchain_ver = "1.72.0"
+toolchain_ver = "1.73.0"
diff --git a/doc/src/install-plrust-on-debian-ubuntu.md b/doc/src/install-plrust-on-debian-ubuntu.md
index 8eac6d7d..7c0f4c00 100644
--- a/doc/src/install-plrust-on-debian-ubuntu.md
+++ b/doc/src/install-plrust-on-debian-ubuntu.md
@@ -28,7 +28,7 @@ Where:
 Example:
 
 ```
-plrust-trusted-1.2.3_1.72.0-debian-pg15-amd64.deb
+plrust-trusted-1.2.3_1.73.0-debian-pg15-amd64.deb
 ```
 
 ## Preparing the environment
diff --git a/plrust/build b/plrust/build
index 678bcfec..4d3fa2d6 100755
--- a/plrust/build
+++ b/plrust/build
@@ -75,7 +75,7 @@ fi
         git pull
         git submodule update --init --recursive
     else
-        git clone https://github.com/tcdi/postgrestd.git --branch "rust-1.72.0" --recurse-submodules
+        git clone https://github.com/tcdi/postgrestd.git --branch "rust-1.73.0" --recurse-submodules
         cd ./postgrestd
     fi
     rm -f rust-toolchain.toml
diff --git a/plrustc/build.sh b/plrustc/build.sh
index 42315378..6a757c84 100755
--- a/plrustc/build.sh
+++ b/plrustc/build.sh
@@ -25,8 +25,8 @@ fi
 export RUSTC_BOOTSTRAP=1
 
 version=$($RUSTC --version | cut -d ' ' -f 2)
-if [ "$version" != "1.72.0" ]; then
-    echo "rustc ('$RUSTC') is not version 1.72.0" >&2
+if [ "$version" != "1.73.0" ]; then
+    echo "rustc ('$RUSTC') is not version 1.73.0" >&2
     exit 1
 fi
 
diff --git a/plrustc/plrustc/uitests/ice_hook.stderr b/plrustc/plrustc/uitests/ice_hook.stderr
index 74149be3..89319efb 100644
--- a/plrustc/plrustc/uitests/ice_hook.stderr
+++ b/plrustc/plrustc/uitests/ice_hook.stderr
@@ -1,4 +1,5 @@
-thread 'rustc' panicked at 'Here is your ICE', plrustc/src/lints/force_ice.rs
+thread 'rustc' panicked at plrustc/src/lints/force_ice.rs:
+Here is your ICE
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
 
 error: the compiler unexpectedly panicked. this is a bug.
diff --git a/plrustc/rust-toolchain.toml b/plrustc/rust-toolchain.toml
index 3f04015d..cdb699f0 100644
--- a/plrustc/rust-toolchain.toml
+++ b/plrustc/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.72.0"
+channel = "1.73.0"
 components = [ "rustfmt", "rust-src", "rustc-dev", "cargo", "llvm-tools" ]
 targets = [ ]
 profile = "minimal"
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index ffb76ff9..a61a3669 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.72.0"
+channel = "1.73.0"
 components = [ "rustfmt", "rust-src", "rustc-dev", "llvm-tools" ]
 targets = [ ]
 profile = "minimal"