Write some tests and fix some issues

_workspace.iml

@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/micronfig/src" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />

micronfig/src/cache.rs

@@ -51,15 +51,14 @@ impl Cache {
 		value
 	}
 
-	/// Register a new `.env` file in the cache.
+	/// Register a new `.env` file in the cache, if it exists.
-	///
-	/// Equivalent to adding an item to [`Cache::envdot`].
 	#[cfg(feature = "envdot")]
 	pub fn register_dotenv<Path>(&mut self, path: Path)
 		where Path: AsRef<std::path::Path> + Debug
 	{
-		self.envdot.push(
+		let dotenv = crate::envdot::parse_dotenv(path);
-			crate::envdot::parse_dotenv(path)
+		if let Some(dotenv) = dotenv {
-		);
+			self.envdot.push(dotenv);
+		}
 	}
 }

micronfig/src/envdot.rs

@@ -12,11 +12,12 @@ use regex::Regex;
 pub type DotEnv = HashMap<OsString, String>;
 
 /// Parse a `.env` file.
-pub fn parse_dotenv<P>(value: P) -> DotEnv
+///
+/// Returns [`None`] if no such file is found.
+pub fn parse_dotenv<P>(value: P) -> Option<DotEnv>
 	where P: AsRef<Path> + Debug
 {
-	let mut file = File::open(&value)
+	let mut file = File::open(&value).ok()?;
-		.expect(&*format!("to be able to open {value:?}"));
 
 	let mut contents: String = String::new();
 	file.read_to_string(&mut contents)
@@ -64,7 +65,7 @@ pub fn parse_dotenv<P>(value: P) -> DotEnv
 		})
 		.map(|(key, value)| keys.insert(key, value));
 
-	keys
+	Some(keys)
 }
 
 /// Get the requested variable from a [`DotEnv`] structure.

micronfig_macros/Cargo.toml

@@ -19,6 +19,7 @@ quote = "1.0"
 
 [dev-dependencies]
 micronfig = { version = "0.3.0", path = "../micronfig" }
+trybuild = "1.0.87"
 
 [lib]
 proc-macro = true

micronfig_macros/src/lib.rs

@@ -32,15 +32,22 @@ impl Parse for ConfigItem {
 	fn parse(input: ParseStream) -> syn::Result<Self> {
 		let identifier = input.parse::<Ident>()?;
 
-		input.parse::<Token![:]>()?;
+		if input.lookahead1().peek(Token![:]) {
-		input.parse::<Type>()?;
+			input.parse::<Token![:]>()?;
+			input.parse::<Type>()?;
 
-		let mut types = vec![];
+			let mut types = vec![];
-		while let Ok(typ) = input.parse::<ConfigPair>() {
+			while let Ok(typ) = input.parse::<ConfigPair>() {
-			types.push(typ)
+				types.push(typ)
+			}
+
+			Ok(Self { identifier, types })
+		}
+		else {
+			let types = vec![];
+			Ok(Self { identifier, types })
 		}
 
-		Ok(Self { identifier, types })
 	}
 }
 
@@ -75,10 +82,12 @@ pub fn config(input: TokenStream) -> TokenStream {
 	let input: Config = parse_macro_input!(input with syn::punctuated::Punctuated::parse_terminated);
 
 	let cache_code = quote! {
+		#[allow(non_snake_case)]
 		mod _cache {
 			pub static lock: std::sync::OnceLock<micronfig::cache::Cache> = std::sync::OnceLock::new();
 		}
 
+		#[allow(non_snake_case)]
 		fn _cache() -> &'static micronfig::cache::Cache {
 			_cache::lock.get_or_init(micronfig::cache::Cache::new)
 		}
@@ -124,10 +133,12 @@ pub fn config(input: TokenStream) -> TokenStream {
 		};
 
 		quote! {
+			#[allow(non_snake_case)]
 			mod #identifier {
 				pub(super) static lock: std::sync::OnceLock<Option<#last_type>> = std::sync::OnceLock::new();
 			}
 
+			#[allow(non_snake_case)]
 			pub(crate) fn #identifier() -> &'static Option<#last_type> {
 				#identifier::lock.get_or_init(|| {
 					let key: std::ffi::OsString = #identifier_string.into();
@@ -154,7 +165,5 @@ pub fn config(input: TokenStream) -> TokenStream {
 		#items_code
 	};
 
-	println!("{quote}");
-
 	quote.into()
 }

micronfig_macros/tests/config.rs

@@ -1,41 +0,0 @@
-use micronfig_macros::config;
-
-#[test]
-fn basic() {
-	config! {
-		GARAS: String,
-		AUTO: String,
-		BUS: String,
-	}
-}
-
-#[test]
-fn empty() {
-	config! {}
-}
-
-#[test]
-fn conversion_simple() {
-	config! {
-		GARAS: String > u32,
-		AUTO: String > u16,
-	}
-}
-
-/*
-#[test]
-fn implicit() {
-	config! {
-		GARAS,
-		AUTO,
-	}
-}
-
-#[test]
-fn conversion_implicit() {
-	config! {
-		GARAS: > u32,
-		AUTO > u16,
-	}
-}
-*/

micronfig_macros/tests/sources/empty.rs

@@ -0,0 +1,7 @@
+micronfig::config! {
+
+}
+
+fn main() {
+
+}

micronfig_macros/tests/sources/string_single_explicit.rs

@@ -0,0 +1,7 @@
+micronfig::config! {
+	GARASAUTO: String,
+}
+
+fn main() {
+	println!("{:?}", GARASAUTO())
+}

micronfig_macros/tests/tests.rs

@@ -0,0 +1,20 @@
+macro_rules! pass {
+	($id:ident) => {
+		#[test]
+		fn $id() {
+			trybuild::TestCases::new().pass(format!("tests/sources/{}.rs", stringify!($id)));
+		}
+	}
+}
+
+macro_rules! fail {
+	($id:ident) => {
+		#[test]
+		fn $id() {
+			trybuild::TestCases::new().compile_fail(format!("tests/sources/{}.rs", stringify!($id)));
+		}
+	}
+}
+
+pass!(empty);
+pass!(string_single_explicit);