Merge branch '0.2.3'

CHANGELOG.md

@@ -1,7 +1,11 @@
+# 0.2.3
+
+Upgraded package versions to latest (except nom, which is currently stuck at
+3.x) and fixed the paths in the doc tests 
+
 # 0.2.2
 
-Updated most dependencies to their latest version. nom is still stuck at 0.3.x
-due to some difficulties in porting to a newer version.
+Yanked due to accidental breaking API change
 
 # 0.2.1
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tree_magic"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Allison Hancock <[email protected]>"]
 description = "Determines the MIME type of a file by traversing a filetype tree."
 repository = "https://github.com/aahancoc/tree_magic/"

src/lib.rs

@@ -24,7 +24,7 @@
 //! extern crate tree_magic;
 //! 
 //! // Load a GIF file
-//! let input: &[u8] = include_bytes!("tests/image/gif");
+//! let input: &[u8] = include_bytes!("../tests/image/gif");
 //!
 //! // Find the MIME type of the GIF
 //! let result = tree_magic::from_u8(input);
@@ -338,7 +338,7 @@ fn match_u8_noalias(mimetype: &str, bytes: &[u8]) -> bool
 /// # Examples
 /// ```rust
 /// // Load a GIF file
-/// let input: &[u8] = include_bytes!("tests/image/gif");
+/// let input: &[u8] = include_bytes!("../tests/image/gif");
 ///
 /// // Check if the MIME and the file are a match
 /// let result = tree_magic::match_u8("image/gif", input);
@@ -372,7 +372,7 @@ pub fn match_u8(mimetype: &str, bytes: &[u8]) -> bool
 /// /// it will return None.
 ///
 /// // Load a ZIP file
-/// let input: &[u8] = include_bytes!("tests/application/zip");
+/// let input: &[u8] = include_bytes!("../tests/application/zip");
 /// 
 /// // Get the graph node for ZIP
 /// let zipnode = tree_magic::TYPE.hash.get("application/zip").unwrap();
@@ -393,7 +393,7 @@ pub fn from_u8_node(parentnode: NodeIndex, bytes: &[u8]) -> Option<MIME>
 /// # Examples
 /// ```rust
 /// // Load a GIF file
-/// let input: &[u8] = include_bytes!("tests/image/gif");
+/// let input: &[u8] = include_bytes!("../tests/image/gif");
 ///
 /// // Find the MIME type of the GIF
 /// let result = tree_magic::from_u8(input);