chore: fmt

Author: robjtede

.cspell.yml

@@ -2,3 +2,7 @@ version: "0.2"
 words:
   - clippy
   - direnv
+  - nixos
+  - nixpkgs
+  - pkgs
+  - taplo

.taplo.toml

@@ -2,18 +2,28 @@ exclude = ["target/*"]
 include = ["**/*.toml"]
 
 [formatting]
-column_width = 100
+column_width = 110
 
 [[rule]]
 include = ["**/Cargo.toml"]
-keys = ["dependencies", "*-dependencies"]
-
-[rule.formatting]
-reorder_keys = true
+keys = [
+    "dependencies",
+    "*-dependencies",
+    "workspace.dependencies",
+    "workspace.*-dependencies",
+    "target.*.dependencies",
+    "target.*.*-dependencies",
+]
+formatting.reorder_keys = true
 
 [[rule]]
 include = ["**/Cargo.toml"]
-keys = ["dependencies.*", "*-dependencies.*"]
-
-[rule.formatting]
-reorder_keys = false
+keys = [
+    "dependencies.*",
+    "*-dependencies.*",
+    "workspace.dependencies.*",
+    "workspace.*-dependencies.*",
+    "target.*.dependencies",
+    "target.*.*-dependencies",
+]
+formatting.reorder_keys = false

examples/library.rs

@@ -2,10 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use contracts::*;
-
 use std::collections::HashSet;
 
+use contracts::*;
+
 pub struct Library {
     available: HashSet<String>,
     lent: HashSet<String>,

flake.lock

@@ -4,14 +4,9 @@
 
 use proc_macro2::{Ident, Span, TokenStream};
 use quote::ToTokens;
-use syn::{
-    spanned::Spanned, visit_mut as visitor, Attribute, Expr, ExprCall,
-    ReturnType,
-};
+use syn::{spanned::Spanned, visit_mut as visitor, Attribute, Expr, ExprCall, ReturnType};
 
-use crate::implementation::{
-    Contract, ContractMode, ContractType, FuncWithContracts,
-};
+use crate::implementation::{Contract, ContractMode, ContractType, FuncWithContracts};
 
 /// Substitution for `old()` expressions.
 pub(crate) struct OldExpr {
@@ -222,9 +217,7 @@ pub(crate) fn generate(
     let pre: proc_macro2::TokenStream = func
         .contracts
         .iter()
-        .filter(|c| {
-            c.ty == ContractType::Requires || c.ty == ContractType::Invariant
-        })
+        .filter(|c| c.ty == ContractType::Requires || c.ty == ContractType::Invariant)
         .flat_map(|c| {
             let desc = if let Some(desc) = c.desc.as_ref() {
                 format!(
@@ -237,8 +230,10 @@ pub(crate) fn generate(
                 format!("{} of {} violated", c.ty.message_name(), func_name)
             };
 
-            c.assertions.iter().zip(c.streams.iter()).map(
-                move |(expr, display)| {
+            c.assertions
+                .iter()
+                .zip(c.streams.iter())
+                .map(move |(expr, display)| {
                     let mode = c.mode.final_mode();
 
                     make_assertion(
@@ -248,8 +243,7 @@ pub(crate) fn generate(
                         expr,
                         &desc.clone(),
                     )
-                },
-            )
+                })
         })
         .collect();
 
@@ -260,9 +254,7 @@ pub(crate) fn generate(
     let post: proc_macro2::TokenStream = func
         .contracts
         .iter()
-        .filter(|c| {
-            c.ty == ContractType::Ensures || c.ty == ContractType::Invariant
-        })
+        .filter(|c| c.ty == ContractType::Ensures || c.ty == ContractType::Invariant)
         .flat_map(|c| {
             let desc = if let Some(desc) = c.desc.as_ref() {
                 format!(
@@ -275,8 +267,10 @@ pub(crate) fn generate(
                 format!("{} of {} violated", c.ty.message_name(), func_name)
             };
 
-            c.assertions.iter().zip(c.streams.iter()).map(
-                move |(expr, display)| {
+            c.assertions
+                .iter()
+                .zip(c.streams.iter())
+                .map(move |(expr, display)| {
                     let mode = c.mode.final_mode();
 
                     make_assertion(
@@ -286,8 +280,7 @@ pub(crate) fn generate(
                         expr,
                         &desc.clone(),
                     )
-                },
-            )
+                })
         })
         .collect();
 
@@ -414,8 +407,7 @@ fn create_body_closure(func: &syn::ItemFn) -> TokenStream {
                     path: syn::Path::from(syn::Ident::new("Self", rcv.span())),
                 }));
 
-                let ty = if let Some((and_token, ref lifetime)) = rcv.reference
-                {
+                let ty = if let Some((and_token, ref lifetime)) = rcv.reference {
                     Box::new(syn::Type::Reference(syn::TypeReference {
                         and_token,
                         lifetime: lifetime.clone(),
@@ -463,8 +455,7 @@ fn create_body_closure(func: &syn::ItemFn) -> TokenStream {
 
         match &func.sig.inputs[0] {
             syn::FnArg::Receiver(receiver) => {
-                arg_names
-                    .push(syn::Ident::new("self", receiver.self_token.span()));
+                arg_names.push(syn::Ident::new("self", receiver.self_token.span()));
             }
             syn::FnArg::Typed(pat) => {
                 if let syn::Pat::Ident(ident) = &*pat.pat {
@@ -500,9 +491,7 @@ fn create_body_closure(func: &syn::ItemFn) -> TokenStream {
 
                         // Any function argument identifier starting with '_' signals
                         // that the binding will not be used.
-                        if !ident_str.starts_with('_')
-                            || ident_str.starts_with("__")
-                        {
+                        if !ident_str.starts_with('_') || ident_str.starts_with("__") {
                             arg_names.push(ident.ident.clone());
                             closure_args.push(arg.clone());
                         }

src/implementation/codegen.rs

@@ -2,11 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use crate::implementation::{Contract, ContractMode};
-use proc_macro2::Span;
-use proc_macro2::TokenStream;
+use proc_macro2::{Span, TokenStream};
 use syn::{parse::Parser, Attribute};
 
+use crate::implementation::{Contract, ContractMode};
+
 pub(crate) fn generate_attributes(contracts: &[Contract]) -> Vec<Attribute> {
     let mut attrs = vec![];
 
@@ -15,8 +15,7 @@ pub(crate) fn generate_attributes(contracts: &[Contract]) -> Vec<Attribute> {
 
         let content_str = syn::LitStr::new(content, span);
 
-        let toks: TokenStream =
-            quote::quote_spanned!( span=> #[doc = #content_str] );
+        let toks: TokenStream = quote::quote_spanned!( span=> #[doc = #content_str] );
 
         let parser = Attribute::parse_outer;
 
@@ -53,13 +52,8 @@ pub(crate) fn generate_attributes(contracts: &[Contract]) -> Vec<Attribute> {
 
             attrs.push(make_attribute(&header_txt));
 
-            for (_assert, stream) in
-                contract.assertions.iter().zip(contract.streams.iter())
-            {
-                attrs.push(make_attribute(&format!(
-                    " - `{}`",
-                    print_stream(stream)
-                )));
+            for (_assert, stream) in contract.assertions.iter().zip(contract.streams.iter()) {
+                attrs.push(make_attribute(&format!(" - `{}`", print_stream(stream))));
             }
 
             attrs.push(make_attribute(""));

src/implementation/doc.rs

@@ -2,14 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use crate::implementation::{ContractMode, ContractType, FuncWithContracts};
 use proc_macro2::TokenStream;
 
-pub(crate) fn ensures(
-    mode: ContractMode,
-    attr: TokenStream,
-    toks: TokenStream,
-) -> TokenStream {
+use crate::implementation::{ContractMode, ContractType, FuncWithContracts};
+
+pub(crate) fn ensures(mode: ContractMode, attr: TokenStream, toks: TokenStream) -> TokenStream {
     let ty = ContractType::Ensures;
 
     let func = syn::parse_quote!(#toks);

src/implementation/ensures.rs

@@ -8,11 +8,7 @@ use syn::{FnArg, ImplItem, ImplItemMethod, Item, ItemFn, ItemImpl};
 
 use crate::implementation::{ContractMode, ContractType, FuncWithContracts};
 
-pub(crate) fn invariant(
-    mode: ContractMode,
-    attr: TokenStream,
-    toks: TokenStream,
-) -> TokenStream {
+pub(crate) fn invariant(mode: ContractMode, attr: TokenStream, toks: TokenStream) -> TokenStream {
     let item: Item = syn::parse_quote!(#toks);
 
     let name = mode.name().unwrap().to_string() + "invariant";
@@ -27,11 +23,7 @@ pub(crate) fn invariant(
     }
 }
 
-fn invariant_fn(
-    mode: ContractMode,
-    attr: TokenStream,
-    func: ItemFn,
-) -> TokenStream {
+fn invariant_fn(mode: ContractMode, attr: TokenStream, func: ItemFn) -> TokenStream {
     let ty = ContractType::Invariant;
 
     let f = FuncWithContracts::new_with_initial_contract(func, ty, mode, attr);
@@ -59,8 +51,7 @@ fn invariant_impl(
         }
     };
 
-    let invariant_ident =
-        syn::Ident::new(&name, proc_macro2::Span::call_site());
+    let invariant_ident = syn::Ident::new(&name, proc_macro2::Span::call_site());
 
     fn method_uses_self(method: &ImplItemMethod) -> bool {
         let inputs = &method.sig.inputs;