Skip to content

Commit

Permalink
fix nightly 1.75 (neondatabase#5719)
Browse files Browse the repository at this point in the history
## Problem

Neon doesn't compile on nightly and had numerous clippy complaints.

## Summary of changes

1. Fixed troublesome dependency
2. Fixed or ignored the lints where appropriate
  • Loading branch information
conradludgate authored Oct 30, 2023
1 parent ad99fa5 commit d8c21ec
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 22 deletions.
23 changes: 4 additions & 19 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions libs/postgres_ffi/wal_craft/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ macro_rules! xlog_utils_test {
($version:ident) => {
#[path = "."]
mod $version {
#[allow(unused_imports)]
pub use postgres_ffi::$version::wal_craft_test_export::*;
#[allow(clippy::duplicate_mod)]
#[cfg(test)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ async fn identify_system(client: &Client) -> anyhow::Result<IdentifySystem> {

// extract the row contents into an IdentifySystem struct.
// written as a closure so I can use ? for Option here.
if let Some(SimpleQueryMessage::Row(first_row)) = response.get(0) {
if let Some(SimpleQueryMessage::Row(first_row)) = response.first() {
Ok(IdentifySystem {
systemid: get_parse(first_row, 0)?,
timeline: get_parse(first_row, 1)?,
Expand Down
2 changes: 1 addition & 1 deletion proxy/src/console/provider/mock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ impl Api {
let rows = client.query(query, &[&creds.user]).await?;

// We can get at most one row, because `rolname` is unique.
let row = match rows.get(0) {
let row = match rows.first() {
Some(row) => row,
// This means that the user doesn't exist, so there can be no secret.
// However, this is still a *valid* outcome which is very similar
Expand Down
1 change: 0 additions & 1 deletion proxy/src/scram.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ mod password;
pub use exchange::Exchange;
pub use key::ScramKey;
pub use secret::ServerSecret;
pub use secret::*;

use hmac::{Hmac, Mac};
use sha2::{Digest, Sha256};
Expand Down

0 comments on commit d8c21ec

Please sign in to comment.