From 59fbf089bf3023f4a7ddde2131bb15dc03b3496b Mon Sep 17 00:00:00 2001 From: stefan-mysten <135084671+stefan-mysten@users.noreply.github.com> Date: Thu, 17 Oct 2024 18:29:12 -0700 Subject: [PATCH 1/4] Update to Rust v1.82 --- rust-toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 4cef0b738ff63..76fcadb5b3218 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.81" +channel = "1.82" From f6ae68bdebc05b21f97b2abaf315318146e7be8b Mon Sep 17 00:00:00 2001 From: stefan-mysten <135084671+stefan-mysten@users.noreply.github.com> Date: Thu, 17 Oct 2024 18:50:43 -0700 Subject: [PATCH 2/4] Fix clippy --- .../move/crates/move-compiler/src/diagnostics/mod.rs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/external-crates/move/crates/move-compiler/src/diagnostics/mod.rs b/external-crates/move/crates/move-compiler/src/diagnostics/mod.rs index 3c7cbe46de462..4730cadca2cec 100644 --- a/external-crates/move/crates/move-compiler/src/diagnostics/mod.rs +++ b/external-crates/move/crates/move-compiler/src/diagnostics/mod.rs @@ -788,12 +788,9 @@ macro_rules! ice_assert { pub fn print_stack_trace() { use std::backtrace::{Backtrace, BacktraceStatus}; let stacktrace = Backtrace::capture(); - match stacktrace.status() { - BacktraceStatus::Captured => { - eprintln!("stacktrace:"); - eprintln!("{}", stacktrace); - } - BacktraceStatus::Unsupported | BacktraceStatus::Disabled | _ => (), + if let BacktraceStatus::Captured = stacktrace.status() { + eprintln!("stacktrace:"); + eprintln!("{}", stacktrace); } } From 45508a3b7951f3313a7ba7a3f30e2e44104b2158 Mon Sep 17 00:00:00 2001 From: stefan-mysten <135084671+stefan-mysten@users.noreply.github.com> Date: Thu, 17 Oct 2024 19:30:46 -0700 Subject: [PATCH 3/4] Fix clippy in suiop-cli --- crates/suiop-cli/src/cli/notion/mod.rs | 30 ++++++++++++++----- crates/suiop-cli/src/cli/notion/models/mod.rs | 12 ++++++-- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/crates/suiop-cli/src/cli/notion/mod.rs b/crates/suiop-cli/src/cli/notion/mod.rs index 8f16bf33b5e46..716d41b2fcec9 100644 --- a/crates/suiop-cli/src/cli/notion/mod.rs +++ b/crates/suiop-cli/src/cli/notion/mod.rs @@ -44,7 +44,7 @@ pub enum Error { JsonParseError { source: serde_json::Error }, #[error("Unexpected API Response")] - UnexpectedResponse { response: Object }, + UnexpectedResponse { response: Box }, #[error("API Error {}({}): {}", .error.code, .error.status, .error.message)] ApiError { error: ErrorResponse }, @@ -122,7 +122,9 @@ impl NotionApi { match self.make_json_request(builder).await? { Object::List { list } => Ok(list.expect_databases()?), - response => Err(Error::UnexpectedResponse { response }), + response => Err(Error::UnexpectedResponse { + response: Box::new(response), + }), } } @@ -143,7 +145,9 @@ impl NotionApi { match result { Object::List { list } => Ok(list), - response => Err(Error::UnexpectedResponse { response }), + response => Err(Error::UnexpectedResponse { + response: Box::new(response), + }), } } @@ -161,7 +165,9 @@ impl NotionApi { match result { Object::Database { database } => Ok(database), - response => Err(Error::UnexpectedResponse { response }), + response => Err(Error::UnexpectedResponse { + response: Box::new(response), + }), } } @@ -176,7 +182,9 @@ impl NotionApi { match result { Object::Page { page } => Ok(page), - response => Err(Error::UnexpectedResponse { response }), + response => Err(Error::UnexpectedResponse { + response: Box::new(response), + }), } } @@ -192,7 +200,9 @@ impl NotionApi { match result { Object::Page { page } => Ok(page), - response => Err(Error::UnexpectedResponse { response }), + response => Err(Error::UnexpectedResponse { + response: Box::new(response), + }), } } @@ -218,7 +228,9 @@ impl NotionApi { .await?; match result { Object::List { list } => Ok(list.expect_pages()?), - response => Err(Error::UnexpectedResponse { response }), + response => Err(Error::UnexpectedResponse { + response: Box::new(response), + }), } } @@ -235,7 +247,9 @@ impl NotionApi { match result { Object::List { list } => Ok(list.expect_blocks()?), - response => Err(Error::UnexpectedResponse { response }), + response => Err(Error::UnexpectedResponse { + response: Box::new(response), + }), } } } diff --git a/crates/suiop-cli/src/cli/notion/models/mod.rs b/crates/suiop-cli/src/cli/notion/models/mod.rs index 0b23e26239946..143d3b9dfe8a9 100644 --- a/crates/suiop-cli/src/cli/notion/models/mod.rs +++ b/crates/suiop-cli/src/cli/notion/models/mod.rs @@ -126,7 +126,9 @@ impl ListResponse { .into_iter() .map(|object| match object { Object::Database { database } => Ok(database), - response => Err(Error::UnexpectedResponse { response }), + response => Err(Error::UnexpectedResponse { + response: Box::new(response), + }), }) .collect(); @@ -143,7 +145,9 @@ impl ListResponse { .into_iter() .map(|object| match object { Object::Page { page } => Ok(page), - response => Err(Error::UnexpectedResponse { response }), + response => Err(Error::UnexpectedResponse { + response: Box::new(response), + }), }) .collect(); @@ -160,7 +164,9 @@ impl ListResponse { .into_iter() .map(|object| match object { Object::Block { block } => Ok(block), - response => Err(Error::UnexpectedResponse { response }), + response => Err(Error::UnexpectedResponse { + response: Box::new(response), + }), }) .collect(); From 00afacdeff3ef5d6d95fb62794482c6b10b89c47 Mon Sep 17 00:00:00 2001 From: stefan-mysten <135084671+stefan-mysten@users.noreply.github.com> Date: Thu, 17 Oct 2024 20:25:53 -0700 Subject: [PATCH 4/4] Fix clippy --- crates/sui-graphql-rpc-client/src/response.rs | 2 ++ crates/sui-graphql-rpc-client/src/simple_client.rs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/sui-graphql-rpc-client/src/response.rs b/crates/sui-graphql-rpc-client/src/response.rs index 807861111d967..92cd0b1330003 100644 --- a/crates/sui-graphql-rpc-client/src/response.rs +++ b/crates/sui-graphql-rpc-client/src/response.rs @@ -35,6 +35,7 @@ impl GraphqlResponse { }) } + #[allow(clippy::result_large_err)] pub fn graphql_version(&self) -> Result { Ok(self .headers @@ -85,6 +86,7 @@ impl GraphqlResponse { self.full_response.errors.clone() } + #[allow(clippy::result_large_err)] pub fn usage(&self) -> Result>, ClientError> { Ok(match self.full_response.extensions.get("usage").cloned() { Some(Value::Object(obj)) => Some( diff --git a/crates/sui-graphql-rpc-client/src/simple_client.rs b/crates/sui-graphql-rpc-client/src/simple_client.rs index badafad03fee5..1eb57479774ee 100644 --- a/crates/sui-graphql-rpc-client/src/simple_client.rs +++ b/crates/sui-graphql-rpc-client/src/simple_client.rs @@ -121,7 +121,7 @@ impl SimpleClient { } } -#[allow(clippy::type_complexity)] +#[allow(clippy::type_complexity, clippy::result_large_err)] pub fn resolve_variables( vars: &[GraphqlQueryVariable], ) -> Result<(BTreeMap, BTreeMap), ClientError> {