Skip to content

Commit e3021e4

Browse files
authored
chore: update Rust to 1.92.0 (#5710)
Update Rust to 1.92.0 and fix the new compiler and clippy lints: - better unused imports detection in nested modules/scopes when the same path is made visible in multiple ways at the same time - `is_some`+`unwrap` pattern detection
1 parent 9de0574 commit e3021e4

6 files changed

Lines changed: 6 additions & 17 deletions

File tree

psl/psl-core/src/validate/validation_pipeline/validations/indexes.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,10 +355,12 @@ pub(crate) fn composite_type_in_compound_unique_index(index: IndexWalker<'_>, ct
355355
.fields()
356356
.find(|f| f.scalar_field_type().as_composite_type().is_some());
357357

358-
if index.fields().len() > 1 && composite_type.is_some() {
358+
if index.fields().len() > 1
359+
&& let Some(composite_type) = composite_type
360+
{
359361
let message = format!(
360362
"Prisma does not currently support composite types in compound unique indices, please remove {:?} from the index. See https://pris.ly/d/mongodb-composite-compound-indices for more details",
361-
composite_type.unwrap().name()
363+
composite_type.name()
362364
);
363365
ctx.push_error(DatamodelError::new_attribute_validation_error(
364366
&message,

quaint/src/visitor/mssql.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,6 @@ impl<'a> Visitor<'a> for Mssql<'a> {
856856
mod tests {
857857
use crate::{
858858
ast::*,
859-
val,
860859
visitor::{Mssql, Visitor},
861860
};
862861
use indoc::indoc;
@@ -922,8 +921,6 @@ mod tests {
922921

923922
#[test]
924923
fn test_in_values() {
925-
use crate::{col, values};
926-
927924
let expected_sql =
928925
"SELECT [test].* FROM [test] WHERE (([id1] = @P1 AND [id2] = @P2) OR ([id1] = @P3 AND [id2] = @P4))";
929926

@@ -941,8 +938,6 @@ mod tests {
941938

942939
#[test]
943940
fn test_not_in_values() {
944-
use crate::{col, values};
945-
946941
let expected_sql =
947942
"SELECT [test].* FROM [test] WHERE NOT (([id1] = @P1 AND [id2] = @P2) OR ([id1] = @P3 AND [id2] = @P4))";
948943

quaint/src/visitor/mysql.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -804,8 +804,6 @@ mod tests {
804804

805805
#[test]
806806
fn test_in_values_2_tuple() {
807-
use crate::{col, values};
808-
809807
let expected_sql = "SELECT `test`.* FROM `test` WHERE (`id1`,`id2`) IN ((?,?),(?,?))";
810808
let query = Select::from_table("test")
811809
.so_that(Row::from((col!("id1"), col!("id2"))).in_selection(values!((1, 2), (3, 4))));

quaint/src/visitor/sqlite.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ impl<'a> Visitor<'a> for Sqlite<'a> {
570570

571571
#[cfg(test)]
572572
mod tests {
573-
use crate::{val, visitor::*};
573+
use crate::visitor::*;
574574

575575
fn expected_values<'a, T>(sql: &'static str, params: Vec<T>) -> (String, Vec<Value<'a>>)
576576
where
@@ -633,8 +633,6 @@ mod tests {
633633

634634
#[test]
635635
fn test_select_from_values() {
636-
use crate::values;
637-
638636
let expected_sql = "SELECT `vals`.* FROM (VALUES (?,?),(?,?)) AS `vals`";
639637
let values = Table::from(values!((1, 2), (3, 4))).alias("vals");
640638
let query = Select::from_table(values);
@@ -649,8 +647,6 @@ mod tests {
649647

650648
#[test]
651649
fn test_in_values() {
652-
use crate::{col, values};
653-
654650
let expected_sql = "SELECT `test`.* FROM `test` WHERE (`id1`,`id2`) IN (VALUES (?,?),(?,?))";
655651
let query = Select::from_table("test")
656652
.so_that(Row::from((col!("id1"), col!("id2"))).in_selection(values!((1, 2), (3, 4))));

query-engine/connector-test-kit-rs/query-engine-tests/tests/queries/filters/filter_regression.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use query_engine_tests::*;
44
/// Basic filter regression 1:m relation tests.
55
#[test_suite(schema(schema))]
66
mod fr_one_to_m {
7-
use indoc::indoc;
87
use query_engine_tests::run_query;
98

109
fn schema() -> String {
@@ -77,7 +76,6 @@ mod fr_one_to_m {
7776
/// Filter regression 1:m relation tests with compound ids.
7877
#[test_suite(schema(schema), capabilities(CompoundIds))]
7978
mod fr_compound_one_to_m {
80-
use indoc::indoc;
8179
use query_engine_tests::run_query;
8280

8381
fn schema() -> String {

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[toolchain]
2-
channel = "1.91.1"
2+
channel = "1.92.0"
33
components = ["clippy", "rustfmt", "rust-src"]
44
targets = [
55
# Wasm target for serverless and edge environments.

0 commit comments

Comments
 (0)