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
4 changes: 4 additions & 0 deletions .github/workflows/sqlx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ jobs:
tls: [native-tls, rustls]
steps:
- uses: actions/checkout@v6
- name: Install pinned Clippy toolchain
uses: dtolnay/rust-toolchain@ce678459e9fc7500d337468f904b95f1b5c10b5e
with:
components: clippy
- uses: Swatinem/rust-cache@65012b490220f477f20ab979e35ae732e6de4e68
with:
prefix-key: v1-sqlx
Expand Down
4 changes: 2 additions & 2 deletions sqlx-core/src/logger.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ impl<'q> QueryLogger<'q> {

let sql = if summary != self.sql {
summary.push_str(" …");
format!("\n\n{}\n", &self.sql)
format!("\n\n{}\n", self.sql)
} else {
String::new()
};
Expand Down Expand Up @@ -125,7 +125,7 @@ impl<'q, O: Debug + Hash + Eq, R: Debug, P: Debug> QueryPlanLogger<'q, O, R, P>

let sql = if summary != self.sql {
summary.push_str(" …");
format!("\n\n{}\n", &self.sql)
format!("\n\n{}\n", self.sql)
} else {
String::new()
};
Expand Down
2 changes: 1 addition & 1 deletion sqlx-core/src/mssql/connection/stream.rs
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ pub(crate) fn write_packets<'en, T: Encode<'en>>(
);
}

packet_header.truncate(0);
packet_header.clear();
PacketHeader {
r#type: ty,
status: if is_last {
Expand Down
2 changes: 1 addition & 1 deletion sqlx-core/src/postgres/connection/sasl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ pub(crate) async fn authenticate(
let client_final_message_wo_proof = format!(
"{channel_binding},r={nonce}",
channel_binding = channel_binding,
nonce = &cont.nonce
nonce = cont.nonce
);

// AuthMessage := client-first-message-bare + "," + server-first-message + "," + client-final-message-without-proof
Expand Down
2 changes: 1 addition & 1 deletion sqlx-macros/src/query/output.rs
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ fn get_column_type<DB: DatabaseExt>(i: usize, column: &DB::Column) -> TokenStrea
if let Some(feature_gate) = <DB as DatabaseExt>::get_feature_gate(type_info) {
format!(
"optional feature `{feat}` required for type {ty} of {col}",
ty = &type_info,
ty = type_info,
feat = feature_gate,
col = DisplayColumn {
idx: i,
Expand Down
2 changes: 1 addition & 1 deletion tests/postgres/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ test_type!(str<&str>(Postgres,
));

test_type!(string<String>(Postgres,
"'this is foo'" == format!("this is foo"),
"'this is foo'" == "this is foo".to_string(),
));

test_type!(string_vec<Vec<String>>(Postgres,
Expand Down
Loading