Merge pull request #164 from willemneal/chore/rust_fmt

chore(rust): cargo fmt and refactor into two workspace with two crates

Cargo.toml

@@ -0,0 +1,4 @@
+[workspace]
+members = [
+  "api/rust/*"
+]

api/rust/codegen/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "suborbital-macro"
+version = "0.1.0"
+edition = "2021"
+authors = ["cohix <[email protected]>", "Florian Fromm <[email protected]>"]
+description = "Macro for setting up a Runnable"
+license = "Apache-2.0"
+repository = "https://github.com/suborbital/reactr"
+homepage = "https://suborbital.dev"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+proc-macro = true
+
+[dependencies]
+syn = "1.0.80"
+quote = "1.0.10"

api/rust/suborbital/codegen/src/lib.rs → api/rust/codegen/src/lib.rs

@@ -6,7 +6,7 @@ use syn::DeriveInput;
 #[proc_macro_derive(Runnable)]
 pub fn derive_runnable(token_stream: TokenStream) -> TokenStream {
 	let input = parse_macro_input!(token_stream as DeriveInput);
-	
+
 	let runnable_name = input.ident;
 
 	let expanded = quote! {

api/rust/suborbital/Cargo.toml → api/rust/core/Cargo.toml

@@ -12,4 +12,4 @@ homepage = "https://suborbital.dev"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-codegen = { path = "./codegen" }
+suborbital-macro = { path = "../codegen", version = "0.1.0" }

api/rust/suborbital/src/cache.rs → api/rust/core/src/cache.rs

@@ -2,8 +2,15 @@ use crate::ffi;
 use crate::runnable::HostErr;
 use crate::STATE;
 
-extern {
-	fn cache_set(key_pointer: *const u8, key_size: i32, value_pointer: *const u8, value_size: i32, ttl: i32, ident: i32) -> i32;
+extern "C" {
+	fn cache_set(
+		key_pointer: *const u8,
+		key_size: i32,
+		value_pointer: *const u8,
+		value_size: i32,
+		ttl: i32,
+		ident: i32,
+	) -> i32;
 	fn cache_get(key_pointer: *const u8, key_size: i32, ident: i32) -> i32;
 }
 
@@ -12,7 +19,14 @@ pub fn set(key: &str, val: Vec<u8>, ttl: i32) {
 	let val_ptr = val_slice.as_ptr();
 
 	unsafe {
-		cache_set(key.as_ptr(), key.len() as i32, val_ptr, val.len() as i32, ttl, super::STATE.ident);
+		cache_set(
+			key.as_ptr(),
+			key.len() as i32,
+			val_ptr,
+			val.len() as i32,
+			ttl,
+			super::STATE.ident,
+		);
 	}
 }
 
@@ -21,6 +35,6 @@ pub fn set(key: &str, val: Vec<u8>, ttl: i32) {
 /// Then retreives the result from the host and returns it
 pub fn get(key: &str) -> Result<Vec<u8>, HostErr> {
 	let result_size = unsafe { cache_get(key.as_ptr(), key.len() as i32, STATE.ident) };
-	
+
 	ffi::result(result_size)
 }

api/rust/suborbital/src/db.rs → api/rust/core/src/db.rs

@@ -6,7 +6,7 @@ use crate::STATE;
 
 use query::{QueryArg, QueryType};
 
-extern {
+extern "C" {
 	fn db_exec(query_type: i32, name_ptr: *const u8, name_size: i32, ident: i32) -> i32;
 }
 
@@ -16,8 +16,7 @@ extern {
 // the return value is the inserted auto-increment ID from the query result, if any,
 // formatted as JSON with the key `lastInsertID`
 pub fn insert(name: &str, args: Vec<QueryArg>) -> Result<Vec<u8>, runnable::HostErr> {
-	args.iter()
-		.for_each(|arg| ffi::add_var(&arg.name, &arg.value));
+	args.iter().for_each(|arg| ffi::add_var(&arg.name, &arg.value));
 
 	let result_size = unsafe { db_exec(QueryType::INSERT.into(), name.as_ptr(), name.len() as i32, STATE.ident) };
 
@@ -30,11 +29,10 @@ pub fn insert(name: &str, args: Vec<QueryArg>) -> Result<Vec<u8>, runnable::Host
 //
 // the return value is the query result formatted as JSON, with each column name as a top-level key
 pub fn select(name: &str, args: Vec<QueryArg>) -> Result<Vec<u8>, runnable::HostErr> {
-	args.iter()
-		.for_each(|arg| ffi::add_var(&arg.name, &arg.value));
+	args.iter().for_each(|arg| ffi::add_var(&arg.name, &arg.value));
 
 	let result_size = unsafe { db_exec(QueryType::SELECT.into(), name.as_ptr(), name.len() as i32, STATE.ident) };
 
 	// retreive the result from the host and return it
 	ffi::result(result_size)
-}
+}

api/rust/suborbital/src/db/query.rs → api/rust/core/src/db/query.rs

@@ -1,12 +1,11 @@
-
 pub struct QueryArg {
 	pub name: String,
-	pub value: String
+	pub value: String,
 }
 
 impl QueryArg {
-	pub fn new(name: &str, value: &str) -> Self{
-		QueryArg{
+	pub fn new(name: &str, value: &str) -> Self {
+		QueryArg {
 			name: String::from(name),
 			value: String::from(value),
 		}
@@ -25,4 +24,4 @@ impl From<QueryType> for i32 {
 			QueryType::SELECT => 1,
 		}
 	}
-}
+}

api/rust/suborbital/src/ffi.rs → api/rust/core/src/ffi.rs

@@ -4,18 +4,18 @@ use crate::runnable::HostErr;
 use crate::util;
 use crate::STATE;
 
-extern {
+extern "C" {
 	fn get_ffi_result(pointer: *const u8, ident: i32) -> i32;
 	fn add_ffi_var(name_ptr: *const u8, name_len: i32, val_ptr: *const u8, val_len: i32, ident: i32) -> i32;
 }
 
-pub (crate) fn result(size: i32) -> Result<Vec<u8>, HostErr> {
+pub(crate) fn result(size: i32) -> Result<Vec<u8>, HostErr> {
 	let mut alloc_size = size;
 
 	// FFI functions return negative values when an error occurs
 	if size < 0 {
 		if size == -1 {
-			return Err(HostErr::new("unknown error returned from host"))
+			return Err(HostErr::new("unknown error returned from host"));
 		}
 
 		alloc_size = -size
@@ -25,29 +25,31 @@ pub (crate) fn result(size: i32) -> Result<Vec<u8>, HostErr> {
 	let mut result_mem = Vec::with_capacity(alloc_size as usize);
 	let result_ptr = result_mem.as_mut_slice().as_mut_ptr() as *const u8;
 
-	let code = unsafe {
-			get_ffi_result(result_ptr, STATE.ident)
-	};
+	let code = unsafe { get_ffi_result(result_ptr, STATE.ident) };
 
 	// check if it was successful, and then re-build the memory
 	if code != 0 {
 		return Err(HostErr::new("unknown error returned from host"));
 	}
 
-	let data: &[u8] = unsafe {
-		slice::from_raw_parts(result_ptr, alloc_size as usize)
-	};
+	let data: &[u8] = unsafe { slice::from_raw_parts(result_ptr, alloc_size as usize) };
 
 	if size < 0 {
 		let msg = Vec::from(data);
-		return Err(HostErr::new(util::to_string(msg).as_str()))
+		return Err(HostErr::new(util::to_string(msg).as_str()));
 	}
 
 	Ok(Vec::from(data))
 }
 
 pub(crate) fn add_var(name: &str, value: &str) {
 	unsafe {
-		add_ffi_var(name.as_ptr(), name.len() as i32, value.as_ptr(), value.len() as i32, STATE.ident);
+		add_ffi_var(
+			name.as_ptr(),
+			name.len() as i32,
+			value.as_ptr(),
+			value.len() as i32,
+			STATE.ident,
+		);
 	}
-}
+}

api/rust/suborbital/src/file.rs → api/rust/core/src/file.rs

@@ -1,7 +1,7 @@
-use crate::STATE;
 use crate::ffi;
+use crate::STATE;
 
-extern {
+extern "C" {
 	fn get_static_file(name_ptr: *const u8, name_size: i32, ident: i32) -> i32;
 }
 
@@ -13,8 +13,6 @@ pub fn get_static(name: &str) -> Option<Vec<u8>> {
 
 	match ffi::result(result_size) {
 		Ok(res) => Some(res),
-		Err(_) => {
-			None
-		}
+		Err(_) => None,
 	}
 }

api/rust/suborbital/src/graphql.rs → api/rust/core/src/graphql.rs

@@ -1,18 +1,30 @@
+use crate::ffi;
 use crate::runnable::HostErr;
 use crate::STATE;
-use crate::ffi;
 
-extern {
-	fn graphql_query(endpoint_pointer: *const u8, endpoint_size: i32, query_pointer: *const u8, query_size: i32, ident: i32) -> i32;
+extern "C" {
+	fn graphql_query(
+		endpoint_pointer: *const u8,
+		endpoint_size: i32,
+		query_pointer: *const u8,
+		query_size: i32,
+		ident: i32,
+	) -> i32;
 }
 
 /// Retreives the result from the host and returns it
 pub fn query(endpoint: &str, query: &str) -> Result<Vec<u8>, HostErr> {
 	let endpoint_size = endpoint.len() as i32;
 	let query_size = query.len() as i32;
 
-	let result_size = unsafe { 
-		graphql_query(endpoint.as_ptr(), endpoint_size, query.as_ptr(), query_size, STATE.ident) 
+	let result_size = unsafe {
+		graphql_query(
+			endpoint.as_ptr(),
+			endpoint_size,
+			query.as_ptr(),
+			query_size,
+			STATE.ident,
+		)
 	};
 
 	ffi::result(result_size)

api/rust/suborbital/src/http.rs → api/rust/core/src/http.rs

@@ -2,13 +2,20 @@ pub mod method;
 
 use std::collections::BTreeMap;
 
-use crate::runnable::HostErr;
 use crate::ffi;
+use crate::runnable::HostErr;
 use crate::STATE;
 use method::Method;
 
-extern {
-	fn fetch_url(method: i32, url_pointer: *const u8, url_size: i32, body_pointer: *const u8, body_size: i32, ident: i32) -> i32;
+extern "C" {
+	fn fetch_url(
+		method: i32,
+		url_pointer: *const u8,
+		url_size: i32,
+		body_pointer: *const u8,
+		body_size: i32,
+		ident: i32,
+	) -> i32;
 }
 
 pub fn get(url: &str, headers: Option<BTreeMap<&str, &str>>) -> Result<Vec<u8>, HostErr> {
@@ -33,12 +40,17 @@ pub fn delete(url: &str, headers: Option<BTreeMap<&str, &str>>) -> Result<Vec<u8
 ///
 /// > Remark: The URL gets encoded with headers added on the end, seperated by ::
 /// > eg. https://google.com/somepage::authorization:bearer qdouwrnvgoquwnrg::anotherheader:nicetomeetyou
-fn do_request(method: i32, url: &str, body: Option<Vec<u8>>, headers: Option<BTreeMap<&str, &str>>) -> Result<Vec<u8>, HostErr> {
+fn do_request(
+	method: i32,
+	url: &str,
+	body: Option<Vec<u8>>,
+	headers: Option<BTreeMap<&str, &str>>,
+) -> Result<Vec<u8>, HostErr> {
 	let header_string = render_header_string(headers);
-	
+
 	let url_string = match header_string {
 		Some(h) => format!("{}::{}", url, h),
-		None => String::from(url)
+		None => String::from(url),
 	};
 
 	let body_pointer: *const u8;
@@ -49,20 +61,27 @@ fn do_request(method: i32, url: &str, body: Option<Vec<u8>>, headers: Option<BTr
 			let body_slice = b.as_slice();
 			body_pointer = body_slice.as_ptr();
 			body_size = b.len() as i32;
-		},
-		None => body_pointer = std::ptr::null::<u8>()
+		}
+		None => body_pointer = std::ptr::null::<u8>(),
 	}
-	
+
 	let result_size = unsafe {
-		fetch_url(method, url_string.as_str().as_ptr(), url_string.len() as i32, body_pointer, body_size, STATE.ident)
+		fetch_url(
+			method,
+			url_string.as_str().as_ptr(),
+			url_string.len() as i32,
+			body_pointer,
+			body_size,
+			STATE.ident,
+		)
 	};
 
 	ffi::result(result_size)
 }
 
 fn render_header_string(headers: Option<BTreeMap<&str, &str>>) -> Option<String> {
 	let mut rendered: String = String::from("");
-	
+
 	let header_map = headers?;
 
 	for key in header_map.keys() {

api/rust/suborbital/src/http/method.rs → api/rust/core/src/http/method.rs

@@ -2,16 +2,16 @@ pub enum Method {
 	GET,
 	POST,
 	PATCH,
-	DELETE
+	DELETE,
 }
 
 impl From<Method> for i32 {
-    fn from(field_type: Method) -> Self {
+	fn from(field_type: Method) -> Self {
 		match field_type {
 			Method::GET => 0,
 			Method::POST => 1,
 			Method::PATCH => 2,
 			Method::DELETE => 3,
 		}
-    }
-}
+	}
+}