From 285794a496474227d21f5440f2eadb9f9e6f90e9 Mon Sep 17 00:00:00 2001
From: Rain <rain@oxide.computer>
Date: Fri, 15 Dec 2023 14:13:06 -0800
Subject: [PATCH 1/4] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20ch?=
 =?UTF-8?q?anges=20to=20main=20this=20commit=20is=20based=20on?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Created using spr 1.3.5

[skip ci]
---
 rust-toolchain.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 65ee8a9912..2e7a87b58b 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -4,5 +4,5 @@
 #
 # We choose a specific toolchain (rather than "stable") for repeatability.  The
 # intent is to keep this up-to-date with recently-released stable Rust.
-channel = "1.74.0"
+channel = "1.74.1"
 profile = "default"

From a1559398332479edaf83bb8b0d483d126f3b2b27 Mon Sep 17 00:00:00 2001
From: Rain <rain@oxide.computer>
Date: Fri, 15 Dec 2023 14:13:34 -0800
Subject: [PATCH 2/4] Rebase on main

Created using spr 1.3.5
---
 rust-toolchain.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 2e7a87b58b..65ee8a9912 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -4,5 +4,5 @@
 #
 # We choose a specific toolchain (rather than "stable") for repeatability.  The
 # intent is to keep this up-to-date with recently-released stable Rust.
-channel = "1.74.1"
+channel = "1.74.0"
 profile = "default"

From b945f814f34b23381e2994aa4f13690cf2a8f3d0 Mon Sep 17 00:00:00 2001
From: Rain <rain@oxide.computer>
Date: Fri, 15 Dec 2023 14:15:48 -0800
Subject: [PATCH 3/4] Update prettyplease

Created using spr 1.3.5
---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c0ca948fe0..304918962c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6147,9 +6147,9 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.12"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62"
+checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
 dependencies = [
  "proc-macro2",
  "syn 2.0.32",
diff --git a/Cargo.toml b/Cargo.toml
index f0f03bec5f..26d95ba362 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -290,7 +290,7 @@ postgres-protocol = "0.6.6"
 predicates = "3.0.4"
 pretty_assertions = "1.4.0"
 pretty-hex = "0.4.0"
-prettyplease = "0.2.8"
+prettyplease = "0.2.15"
 proc-macro2 = "1.0"
 progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
 progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }

From e5f47ae1d14aa4041a600fb89ff1cc49a8254ed8 Mon Sep 17 00:00:00 2001
From: Rain <rain@oxide.computer>
Date: Fri, 15 Dec 2023 15:01:56 -0800
Subject: [PATCH 4/4] address review comment

Created using spr 1.3.5
---
 nexus/authz-macros/src/lib.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nexus/authz-macros/src/lib.rs b/nexus/authz-macros/src/lib.rs
index cc555bcfd8..3d6f265fea 100644
--- a/nexus/authz-macros/src/lib.rs
+++ b/nexus/authz-macros/src/lib.rs
@@ -480,6 +480,8 @@ mod tests {
             name = "Instance",
             parent = "Project",
             primary_key = (String, String),
+            // The SomeCompositeId type doesn't exist, but that's okay because
+            // this code is never compiled, just printed out.
             input_key = SomeCompositeId,
             roles_allowed = false,
             polar_snippet = InProject,