Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nexus/db-queries/src/db/collection_attach.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use super::cte_utils::{
};
use async_bb8_diesel::AsyncRunQueryDsl;
use diesel::associations::HasTable;
use diesel::expression::{AsExpression, Expression};

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh that's cool, how in the world did this become necessary without needing an edition or something

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great question!

use diesel::expression::{AsExpression, Expression, IntoSql};
use diesel::helper_types::*;
use diesel::pg::Pg;
use diesel::prelude::*;
Expand Down
2 changes: 1 addition & 1 deletion nexus/tests/integration_tests/external_ips.rs
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ async fn test_floating_ip_create_attachment(
.await;
assert_eq!(
error.message,
format!("Floating IP cannot be deleted while attached to an instance"),
"Floating IP cannot be deleted while attached to an instance",
);

// Stop and delete the instance.
Expand Down
2 changes: 1 addition & 1 deletion nexus/tests/integration_tests/instances.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6722,7 +6722,7 @@ async fn test_boot_disk_must_be_attached(cptestctx: &ControlPlaneTestContext) {
)
.await;

assert_eq!(error.message, format!("boot disk must be attached"));
assert_eq!(error.message, "boot disk must be attached");

// Now attach the disk.
let url_instance_detach_disk =
Expand Down
2 changes: 1 addition & 1 deletion oximeter/db/src/sql/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,7 @@ impl RestrictedQuery {
"Query must select from a single named table, with no database"
);
}
if let Some(from) = select.from.iter_mut().next() {
if let Some(from) = select.from.first_mut() {
timeseries.extend(Self::process_table_factor(&mut from.relation)?);
for join in from.joins.iter_mut() {
let op = match &join.join_operator {
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
# 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.97.1"
channel = "1.98.1"
profile = "default"
Loading