user/rust: Bump to 1.33.0

1 files changed, 0 insertions, 53 deletions

diff --git a/user/rust/0022-Move-debugger-scripts-to-usr-share-rust.patch b/user/rust/0022-Move-debugger-scripts-to-usr-share-rust.patch
deleted file mode 100644
index a46ddcd45..000000000
--- a/user/rust/0022-Move-debugger-scripts-to-usr-share-rust.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 347b144930e68e49dc27b3682751a1d4c13d81c5 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Mon, 17 Sep 2018 02:09:10 +0000
-Subject: [PATCH 22/23] Move debugger scripts to /usr/share/rust
-
----
- src/bootstrap/dist.rs | 2 +-
- src/etc/rust-gdb      | 2 +-
- src/etc/rust-lldb     | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
-index fea6302d0a..e6ba249d28 100644
---- a/src/bootstrap/dist.rs
-+++ b/src/bootstrap/dist.rs
-@@ -591,7 +591,7 @@ impl Step for DebuggerScripts {
-     fn run(self, builder: &Builder) {
-         let host = self.host;
-         let sysroot = self.sysroot;
--        let dst = sysroot.join("lib/rustlib/etc");
-+        let dst = sysroot.join("share/rust");
-         t!(fs::create_dir_all(&dst));
-         let cp_debugger_script = |file: &str| {
-             builder.install(&builder.src.join("src/etc/").join(file), &dst, 0o644);
-diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb
-index 743952a5be..71694ddb87 100755
---- a/src/etc/rust-gdb
-+++ b/src/etc/rust-gdb
-@@ -14,7 +14,7 @@ set -e
- 
- # Find out where the pretty printer Python module is
- RUSTC_SYSROOT=`rustc --print=sysroot`
--GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
-+GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/share/rust"
- 
- # Run GDB with the additional arguments that load the pretty printers
- # Set the environment variable `RUST_GDB` to overwrite the call to a
-diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb
-index 6ed8210349..f115587ce1 100755
---- a/src/etc/rust-lldb
-+++ b/src/etc/rust-lldb
-@@ -35,7 +35,7 @@ display the contents of local variables!"
- fi
- 
- # Prepare commands that will be loaded before any file on the command line has been loaded
--script_import="command script import \"$RUSTC_SYSROOT/lib/rustlib/etc/lldb_rust_formatters.py\""
-+script_import="command script import \"$RUSTC_SYSROOT/share/rust/lldb_rust_formatters.py\""
- category_definition="type summary add --no-value --python-function lldb_rust_formatters.print_val -x \".*\" --category Rust"
- category_enable="type category enable Rust"
- 
--- 
-2.19.2
-