Reformat

Author: fee1-dead

rustfmt.toml

@@ -0,0 +1,2 @@
+imports_granularity = "Module"
+group_imports = "StdExternalCrate"

src/api.rs

@@ -1,13 +1,14 @@
-use std::{collections::HashMap, num::NonZeroU16, sync::Arc};
+use std::collections::HashMap;
+use std::num::NonZeroU16;
+use std::sync::Arc;
 
 use reqwest::Url;
-use serde::{de::DeserializeOwned, Deserialize};
+use serde::de::DeserializeOwned;
+use serde::Deserialize;
 use serde_json::Value;
 
-use crate::{
-    req::{self, Login, Main, QueryProp, RvProp, RvSlot, TokenType, QueryPropRevisions},
-    BotPassword, Result, Simple, WriteUrlParams,
-};
+use crate::req::{self, Login, Main, QueryProp, QueryPropRevisions, RvProp, RvSlot, TokenType};
+use crate::{BotPassword, Result, Simple, WriteUrlParams};
 
 #[derive(Deserialize, Debug)]
 pub struct Slot {

src/gen.rs

@@ -1,7 +1,9 @@
-use std::{pin::Pin, task::{Context, Poll}};
+use std::pin::Pin;
+use std::task::{Context, Poll};
 
 use futures_core::Stream;
 
+use crate::req::{Main, Query};
 use crate::{Bot, Page};
 
 pub struct SearchGenerator {
@@ -18,7 +20,9 @@ impl SearchGenerator {
 impl Stream for SearchGenerator {
     type Item = Page;
     fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+        let m = Main::query(Query {
+            ..Default::default()
+        });
         todo!()
     }
 }
-

src/lib.rs

@@ -1,15 +1,17 @@
-use std::{borrow::Cow, convert::Infallible, num::{NonZeroU16, NonZeroU32, NonZeroU64, NonZeroUsize}, ops::Deref, sync::Arc};
+use std::borrow::Cow;
+use std::convert::Infallible;
+use std::num::{NonZeroU16, NonZeroU32, NonZeroU64, NonZeroUsize};
+use std::ops::Deref;
+use std::sync::Arc;
 
 use req::{encode_multivalue, HasValue};
-use reqwest::{
-    header::{HeaderMap, HeaderValue},
-    Client, Url,
-};
+use reqwest::header::{HeaderMap, HeaderValue};
+use reqwest::{Client, Url};
 use serde::Deserialize;
 
 pub mod api;
-pub mod req;
 pub mod gen;
+pub mod req;
 
 pub trait WriteUrlParams {
     fn ser<W: UrlParamWriter>(&self, w: &mut W) -> Result<(), W::E>;

src/req.rs

@@ -1,4 +1,8 @@
-use std::{collections::HashSet, fmt::Debug, hash::Hash, mem::discriminant, num::{NonZeroU16, NonZeroU32}};
+use std::collections::HashSet;
+use std::fmt::Debug;
+use std::hash::Hash;
+use std::mem::discriminant;
+use std::num::{NonZeroU16, NonZeroU32};
 
 use bytemuck::TransparentWrapper;
 use serde::ser::SerializeSeq;

wikiproc/src/lib.rs

@@ -1,6 +1,7 @@
 use proc_macro2::TokenStream as Ts;
 use quote::quote;
-use syn::{spanned::Spanned, Data, Fields, FieldsUnnamed, Lit, Meta, MetaNameValue, NestedMeta};
+use syn::spanned::Spanned;
+use syn::{Data, Fields, FieldsUnnamed, Lit, Meta, MetaNameValue, NestedMeta};
 use synstructure::VariantInfo;
 
 synstructure::decl_derive!([WriteUrl, attributes(wikiproc)] => derive_write_url);
@@ -97,12 +98,14 @@ fn gen_fields(v: &VariantInfo, o: &Options) -> Ts {
                 } else {
                     let name = opts.override_name.unwrap_or_else(|| {
                         let mut s = o.prepend_all.clone().unwrap_or_default();
-                        s.push_str(&*b.ast()
-                            .ident
-                            .as_ref()
-                            .unwrap()
-                            .to_string()
-                            .to_ascii_lowercase());
+                        s.push_str(
+                            &*b.ast()
+                                .ident
+                                .as_ref()
+                                .unwrap()
+                                .to_string()
+                                .to_ascii_lowercase(),
+                        );
                         s
                     });
                     quote! {{