Browse Source

fix new clippy warnings for cicd (#2075)

Matthew Callens 3 years ago
parent
commit
fc3789520e
3 changed files with 7 additions and 5 deletions
  1. 4 2
      cli/src/template.rs
  2. 2 2
      lang/src/lib.rs
  3. 1 1
      lang/syn/src/parser/accounts/mod.rs

+ 4 - 2
cli/src/template.rs

@@ -4,6 +4,7 @@ use anchor_syn::idl::Idl;
 use anyhow::Result;
 use heck::{CamelCase, MixedCase, SnakeCase};
 use solana_sdk::pubkey::Pubkey;
+use std::fmt::Write;
 
 pub fn default_program_id() -> Pubkey {
     "Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS"
@@ -368,14 +369,15 @@ anchor.setProvider(provider);
     );
 
     for program in programs {
-        eval_string.push_str(&format!(
+        write!(
+            &mut eval_string,
             r#"
 anchor.workspace.{} = new anchor.Program({}, new PublicKey("{}"), provider);
 "#,
             program.name.to_camel_case(),
             serde_json::to_string(&program.idl)?,
             program.program_id
-        ));
+        )?;
     }
 
     Ok(eval_string)

+ 2 - 2
lang/src/lib.rs

@@ -353,7 +353,7 @@ pub mod __private {
 macro_rules! require {
     ($invariant:expr, $error:tt $(,)?) => {
         if !($invariant) {
-            return Err(anchor_lang::error!(crate::ErrorCode::$error));
+            return Err(anchor_lang::error!($crate::ErrorCode::$error));
         }
     };
     ($invariant:expr, $error:expr $(,)?) => {
@@ -562,7 +562,7 @@ macro_rules! require_gte {
 #[macro_export]
 macro_rules! err {
     ($error:tt $(,)?) => {
-        Err(anchor_lang::error!(crate::ErrorCode::$error))
+        Err(anchor_lang::error!($crate::ErrorCode::$error))
     };
     ($error:expr $(,)?) => {
         Err(anchor_lang::error!($error))

+ 1 - 1
lang/syn/src/parser/accounts/mod.rs

@@ -33,7 +33,7 @@ pub fn parse(strct: &syn::ItemStruct) -> ParseResult<AccountsStruct> {
         }
     };
 
-    let _ = constraints_cross_checks(&fields)?;
+    constraints_cross_checks(&fields)?;
 
     Ok(AccountsStruct::new(strct.clone(), fields, instruction_api))
 }