Merge remote-tracking branch 'upstream/master' into reparse

2019-09-10 08:54:43 +00:00
parent 31c12e5182 db8340181f
commit 99c577be60
13 changed files with 27 additions and 1391 deletions
--- a/src/lib.rs
+++ b/src/lib.rs
@ -1,10 +1,9 @@
 #[macro_use]
+extern crate bitflags;
+#[macro_use]
 extern crate maplit;
 extern crate serde;

-#[macro_use]
-mod bitflags;
-
 mod data;
 mod float_ord;
 mod imservice;