From eca90a051b4daebe12a8421c6c4f57d5b5b9fbbd Mon Sep 17 00:00:00 2001
From: Till Höppner
Date: Wed, 9 Mar 2016 16:59:15 +0100
Subject: Allow ARM failure

---
 src/lib.rs  | 15 +++++++--------
 src/main.rs |  9 ++++++++-
 2 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/lib.rs b/src/lib.rs
index ab8040a..9f63e70 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -6,16 +6,15 @@ extern crate ilc_format_weechat;
 extern crate ilc_format_energymech;
 
 pub use ilc_base::{Context, Decode, Encode, Event, context, dummy, error, event, format};
-pub use ilc_ops::{convert, dedup, freq, parse, seen, sort};
-
 pub use ilc_cli::{decoder, encoder, force_decoder, force_encoder, open_files};
 
-pub use ilc_ops::convert::convert;
-pub use ilc_ops::dedup::dedup;
-pub use ilc_ops::freq::freq;
-pub use ilc_ops::parse::parse;
-pub use ilc_ops::seen::seen;
-pub use ilc_ops::sort::sort;
+pub use ilc_ops::convert::{self, convert};
+pub use ilc_ops::dedup::{self, dedup};
+pub use ilc_ops::stats::{self, stats};
+pub use ilc_ops::parse::{self, parse};
+pub use ilc_ops::seen::{self, seen};
+pub use ilc_ops::sort::{self, sort};
+pub use ilc_ops::merge::{self, merge};
 
 pub use ilc_format_weechat::Weechat;
 pub use ilc_format_energymech::Energymech;
diff --git a/src/main.rs b/src/main.rs
index 3371a9f..0cdab68 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,12 @@
 extern crate ilc_cli;
 
+use ilc_cli::Cli;
+
+static MASTER: &'static str = include_str!("../.git/refs/heads/master");
+
 fn main() {
-    ilc_cli::main();
+    ilc_cli::main(Cli {
+        version: env!("CARGO_PKG_VERSION").into(),
+        master_hash: MASTER.trim_right().into(),
+    });
 }
-- 
cgit v1.2.3