From ccca35ab1a53d08697b4c7dc891c98df58d54f9e Mon Sep 17 00:00:00 2001 From: Billy Chan Date: Fri, 16 Dec 2022 16:48:16 +0800 Subject: [PATCH] clippy --- sea-orm-codegen/src/entity/transformer.rs | 4 ++-- sea-orm-codegen/src/entity/writer.rs | 4 ++-- src/executor/paginator.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sea-orm-codegen/src/entity/transformer.rs b/sea-orm-codegen/src/entity/transformer.rs index 282d0393..31a4c2a1 100644 --- a/sea-orm-codegen/src/entity/transformer.rs +++ b/sea-orm-codegen/src/entity/transformer.rs @@ -202,8 +202,8 @@ impl EntityTransformer { } Ok(EntityWriter { entities: entities - .into_iter() - .map(|(_, mut v)| { + .into_values() + .map(|mut v| { v.relations.sort_by(|a, b| a.ref_table.cmp(&b.ref_table)); v }) diff --git a/sea-orm-codegen/src/entity/writer.rs b/sea-orm-codegen/src/entity/writer.rs index 6b62cac1..388e2e4a 100644 --- a/sea-orm-codegen/src/entity/writer.rs +++ b/sea-orm-codegen/src/entity/writer.rs @@ -225,8 +225,8 @@ impl EntityWriter { lines.push("".to_owned()); let code_blocks = self .enums - .iter() - .map(|(_, active_enum)| active_enum.impl_active_enum(with_serde, with_copy_enums)) + .values() + .map(|active_enum| active_enum.impl_active_enum(with_serde, with_copy_enums)) .collect(); Self::write(&mut lines, code_blocks); OutputFile { diff --git a/src/executor/paginator.rs b/src/executor/paginator.rs index 60811323..f56d8a32 100644 --- a/src/executor/paginator.rs +++ b/src/executor/paginator.rs @@ -45,8 +45,8 @@ where let query = self .query .clone() - .limit(self.page_size as u64) - .offset((self.page_size * page) as u64) + .limit(self.page_size) + .offset(self.page_size * page) .to_owned(); let builder = self.db.get_database_backend(); let stmt = builder.build(&query);