oopsies

src/file.rs

@@ -1,24 +1,9 @@
 //file format "sniff"
 
 pub enum Error{
-	Header(HeaderError),
-	Map(crate::map::Error),
-	Bot(crate::bot::Error),
-	Demo(crate::demo::Error),
-}
-
-pub enum MissingData{
-	NeedExactly(usize),//missing exactly this many bytes
-	NeedAtLeast(usize),//missing at least this many bytes
-}
-
-pub enum HeaderError{
 	InvalidMagic,
 	InvalidVersion,
-	UnexpectedEOF{
+	UnexpectedEOF,
-		eof:usize,
-		missing_data:MissingData,
-	},//file ends in the middle of the header
 }
 
 /* spec
@@ -53,7 +38,6 @@ pub enum Magic{
 	Map,	//"SNFM"
 	Bot,	//"SNFB"
 	Demo,	//"SNFD"
-	PlaylistDemo,
 }
 
 pub struct Header{
@@ -71,9 +55,3 @@ pub struct BlockLayout{
 	count:u64,
 	location:Vec<u64>,
 }
-
-pub enum SNF{
-	Map(crate::map::Map),
-	Bot(crate::bot::Bot),
-	Demo(crate::demo::Demo),
-}

src/lib.rs

@@ -1,12 +1,26 @@
 use std::io::Read;
 
-mod file;
+pub mod file;
-mod map;
+pub mod map;
-mod bot;
+pub mod bot;
-mod demo;
+pub mod demo;
 
-pub fn read<R:Read>(input:R)->Result<crate::file::SNF,crate::file::Error>{
+pub enum Error{
-	Err(file::Error::Header(file::HeaderError::InvalidMagic))
+	Header(file::Error),
+	Map(map::Error),
+	Bot(bot::Error),
+	Demo(demo::Error),
+}
+
+pub enum SNF{
+	Map(map::Map),
+	Bot(bot::Bot),
+	Demo(demo::Demo),
+}
+
+pub fn read<R:Read>(input:R)->Result<SNF,Error>{
+	//let header:file::Header=input.read()?;
+	Err(Error::Header(file::Error::InvalidMagic))
 }
 
 #[cfg(test)]