gnostr:cargo apply fmt/sort

Author: RandyMcMillan

Cargo.toml

@@ -2,7 +2,7 @@
 name = "gnostr"
 version = "0.0.2"
 edition = "2021"
-authors = ["gnostr <[email protected]>","extrawurst <[email protected]>", "TODO:add more contributors"]
+authors = ["gnostr <[email protected]>", "extrawurst <[email protected]>", "TODO:add more contributors"]
 description = "gnostr: a git+nostr workflow utility"
 rust-version = "1.65"
 exclude = [".github/*", ".vscode/*", "assets/*"]
@@ -13,24 +13,23 @@ license = "MIT"
 categories = ["command-line-utilities"]
 keywords = ["git", "gui", "cli", "terminal", "ui", "gnostr"]
 build = "build.rs"
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+cc = { version = "1.0.88", features = ["libc"] }
+getopts = "0.2.21"
+git2 = "0.18.2"
+gnostr-bins = "0.0.14"
+gnostr-xq = { git = "https://github.com/gnostr-org/gnostr-xq.git", version = "0.0.0" }
+
+inline-c = "0.1.7"
 # gnostr-bins = { git = "https://github.com/gnostr-org/gnostr-bins.git", version = "0.0.6" }
 # gnostr-cli = { git = "https://github.com/gnostr-org/gnostr-cli.git", rev = "60e244cffdcd781f1a22c2c67f31bb3d539624f2" }
 k256 = { version = "0.13.3", features = ["schnorr", "ecdh"], path = "vendor/k256" }
+libc = "0.2"
 rand_core = "0.6"
-
-inline-c = "0.1.7"
-sha2 = { version = "0.10.8", path = "vendor/sha2" }
-getopts = "0.2.21"
-git2 = "0.18.2"
 reqwest = { version = "0.11.24", features = ["blocking"] }
-gnostr-xq = { git = "https://github.com/gnostr-org/gnostr-xq.git", version = "0.0.0" }
-gnostr-bins = "0.0.14"
-cc = { version = "1.0.88", features = ["libc"] }
-libc = "0.2"
+sha2 = { version = "0.10.8", path = "vendor/sha2" }
 
 [build-dependencies]
 cc = { version = "1.0.88", features = ["libc"] }

build.rs

@@ -9,7 +9,6 @@ fn main() {
         .include("../include/sha256.h")
         .include("../include/random.h")
         .include("../include/proof.h")
-
         .include("../include/constants.h")
         .include("../include/struct_key.h")
         .include("../include/struct_args.h")

src/bin/gnostr-reqwest.rs

@@ -1,5 +1,5 @@
-use std::io::{Read};
 use reqwest::Url;
+use std::io::Read;
 fn main() {
     let url = Url::parse("https://www.rust-lang.org/").unwrap();
     let mut res = reqwest::blocking::get(url).unwrap();

src/lib.rs

@@ -1,6 +1,6 @@
 extern crate libc;
 
-extern {
+extern "C" {
     pub fn gnostr_get_relays(input: libc::c_int) -> libc::c_int;
 }
 

src/main.rs

@@ -6,31 +6,31 @@ use std::process;
 
 extern crate gnostr_bins;
 
+use gnostr_bins::get_relays;
 use reqwest::Url;
 use std::io::Read;
-use gnostr_bins::{get_relays};
 
 use std::time::{SystemTime, UNIX_EPOCH};
 
 extern crate libc;
 
-extern {
+extern "C" {
     fn double_input(input: libc::c_int) -> libc::c_int;
 }
 
-extern {
+extern "C" {
     ///static void gnostr_sha256(int argc, const char* argv[], struct args *args)
     fn gnostr_sha256(input: libc::c_int) -> libc::c_int;
 }
-extern {
+extern "C" {
     ///static int copyx(unsigned char *output, const unsigned char *x32, const unsigned char *y32, void *data)
     fn copyx(input: libc::c_int) -> libc::c_int;
 }
-extern {
+extern "C" {
     ///static void try_subcommand(int argc, const char* argv[])
     fn try_subcommand(input: libc::c_int) -> libc::c_int;
 }
-extern {
+extern "C" {
     ///static void print_hex(unsigned char* data, size_t size)
     fn print_hex(input: libc::c_int) -> libc::c_int;
 }
@@ -56,7 +56,6 @@ pub fn print_input(inp: &str, out: Option<String>) {
 }
 
 fn main() {
-
     let args: Vec<String> = env::args().collect();
     let program = args[0].clone();
     //REF: https://docs.rs/getopts/latest/getopts/struct.Options.html
@@ -90,10 +89,10 @@ fn main() {
             process::exit(0);
         }
 
-    let _output = matches.opt_str("o");
-		//leave input as &Option<String>
-    let _input = matches.opt_str("i");
-		//deref &str
-    let _value = _input.as_deref().unwrap_or("100");
+        let _output = matches.opt_str("o");
+        //leave input as &Option<String>
+        let _input = matches.opt_str("i");
+        //deref &str
+        let _value = _input.as_deref().unwrap_or("100");
     }
 }