From d40a19ef8cb670bdc7c2e8b89adaccba09a61333 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alex@aspect.dev>
Date: Tue, 17 Sep 2024 10:46:54 -0700
Subject: [PATCH 1/3] chore: point to non-deprecated rustfmt

See https://github.com/bazelbuild/rules_rust/pull/2703
---
 example/tools/format/BUILD.bazel | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/example/tools/format/BUILD.bazel b/example/tools/format/BUILD.bazel
index a6f44934..7c8e9829 100644
--- a/example/tools/format/BUILD.bazel
+++ b/example/tools/format/BUILD.bazel
@@ -73,7 +73,11 @@ format_multirun(
     markdown = ":prettier",
     protocol_buffer = "//tools/lint:buf",
     python = "@aspect_rules_lint//format:ruff",
-    rust = "@rules_rust//tools/rustfmt:upstream_rustfmt",
+    # Note, older rules_rust versions may need
+    # @rules_rust//tools/rustfmt:upstream_rustfmt
+    # which was later deprecated in
+    # https://github.com/bazelbuild/rules_rust/pull/2703
+    rust = "@rules_rust//tools/upstream_wrapper:rustfmt",
     scala = ":scalafmt",
     shell = "@aspect_rules_lint//format:shfmt",
     sql = ":prettier",

From c389741bdf61d8d9973dff2d8e82cb8849bf5a4e Mon Sep 17 00:00:00 2001
From: Alex Eagle <alex@aspect.dev>
Date: Tue, 17 Sep 2024 10:53:12 -0700
Subject: [PATCH 2/3] chore: upgrade rules_rust

---
 example/MODULE.bazel    | 2 +-
 example/WORKSPACE.bazel | 5 ++---
 example/src/Bar.java    | 2 --
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/example/MODULE.bazel b/example/MODULE.bazel
index 2fbeca6c..d88b2ee7 100644
--- a/example/MODULE.bazel
+++ b/example/MODULE.bazel
@@ -14,7 +14,7 @@ bazel_dep(name = "rules_jvm_external", version = "4.5")
 bazel_dep(name = "rules_go", version = "0.42.0", repo_name = "io_bazel_rules_go")
 bazel_dep(name = "rules_proto", version = "6.0.0")
 bazel_dep(name = "rules_python", version = "0.26.0")
-bazel_dep(name = "rules_rust", version = "0.45.1")
+bazel_dep(name = "rules_rust", version = "0.50.1")
 bazel_dep(name = "buildifier_prebuilt", version = "6.3.3")
 bazel_dep(name = "platforms", version = "0.0.8")
 bazel_dep(name = "rules_kotlin", version = "1.9.0")
diff --git a/example/WORKSPACE.bazel b/example/WORKSPACE.bazel
index 11e627fb..605aade4 100644
--- a/example/WORKSPACE.bazel
+++ b/example/WORKSPACE.bazel
@@ -273,9 +273,8 @@ kt_register_toolchains()
 
 http_archive(
     name = "rules_rust",
-    integrity = "sha256-Eg0TqoZgX2BG0VEhB6qfWrxL5luctWwFhogWgtzYQ78=",
-    strip_prefix = "rules_rust-4a3ffcb1e89b3f20b12a37b55595682f4bc866b7",
-    urls = ["https://github.com/bazelbuild/rules_rust/archive/4a3ffcb1e89b3f20b12a37b55595682f4bc866b7.tar.gz"],
+    integrity = "sha256-MZscNcESBO9WsdlKVJ9rnTUygTt3jwLXCe9oyDcDbPE=",
+    urls = ["https://github.com/bazelbuild/rules_rust/releases/download/0.50.1/rules_rust-v0.50.1.tar.gz"],
 )
 
 load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains")
diff --git a/example/src/Bar.java b/example/src/Bar.java
index 64077315..d1685b3f 100644
--- a/example/src/Bar.java
+++ b/example/src/Bar.java
@@ -1,8 +1,6 @@
 package src;
 
 // Unused imports are suppressed in suppressions.xml, so this should not raise issue.
-import java.util.Objects;
-import java.io.BufferedInputStream;
 
 public class Bar {
   // Max line length set to 20, so this should raise issue.

From 069ab7dbc658cb96fefd387fed4b182a499d1c53 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alex@aspect.dev>
Date: Tue, 17 Sep 2024 13:31:09 -0700
Subject: [PATCH 3/3] Update Bar.java

---
 example/src/Bar.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/example/src/Bar.java b/example/src/Bar.java
index d1685b3f..64077315 100644
--- a/example/src/Bar.java
+++ b/example/src/Bar.java
@@ -1,6 +1,8 @@
 package src;
 
 // Unused imports are suppressed in suppressions.xml, so this should not raise issue.
+import java.util.Objects;
+import java.io.BufferedInputStream;
 
 public class Bar {
   // Max line length set to 20, so this should raise issue.