From 58fdc5c7566323427d62754b8c1fd4b7b30a92e6 Mon Sep 17 00:00:00 2001 From: Till Höppner Date: Thu, 25 Feb 2016 07:29:43 +0100 Subject: Remove bootstrapping path deps --- Cargo.toml | 3 +-- base/src/dummy.rs | 30 +++++++++++++++++++++++++++ base/src/lib.rs | 5 +---- base/src/mod.rs | 47 ------------------------------------------- cli/Cargo.toml | 12 ++++------- formats/energymech/Cargo.toml | 3 +-- formats/weechat/Cargo.toml | 3 +-- ops/Cargo.toml | 3 +-- 8 files changed, 39 insertions(+), 67 deletions(-) create mode 100644 base/src/dummy.rs delete mode 100644 base/src/mod.rs diff --git a/Cargo.toml b/Cargo.toml index 1b06b77..0178b8b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,8 +12,7 @@ name = "ilc" doc = false [dependencies] -# ilc-cli = "*" -ilc-cli = { path = "cli" } +ilc-cli = "0.1.0" [profile.release] debug = false diff --git a/base/src/dummy.rs b/base/src/dummy.rs new file mode 100644 index 0000000..9317c4e --- /dev/null +++ b/base/src/dummy.rs @@ -0,0 +1,30 @@ +// Copyright 2015 Till Höppner +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +use std::iter; +use std::io::BufRead; + +use event::Event; +use context::Context; + +pub struct Dummy; + +impl ::Decode for Dummy { + fn decode<'a>(&'a mut self, + _context: &'a Context, + _input: &'a mut BufRead) + -> Box>> + 'a> { + Box::new(iter::empty()) + } +} diff --git a/base/src/lib.rs b/base/src/lib.rs index 9e96478..44f6110 100644 --- a/base/src/lib.rs +++ b/base/src/lib.rs @@ -17,15 +17,12 @@ extern crate chrono; #[macro_use] extern crate log; extern crate rustc_serialize; -// extern crate bincode; -// extern crate rmp; -// extern crate rmp_serialize as msgpack; pub mod event; -// pub mod format; pub mod context; pub mod error; pub mod format; +pub mod dummy; use std::io::{BufRead, Write}; diff --git a/base/src/mod.rs b/base/src/mod.rs deleted file mode 100644 index 5374598..0000000 --- a/base/src/mod.rs +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright 2015 Till Höppner -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! Traits and structs for conversion between various formats. -//! As the source format may not provide the same information as the -//! target format, all formats must allow for omittable information. - -use std::iter; -use std::io::{BufRead, Write}; -use std::borrow::Cow; - -use event::Event; -use context::Context; - -pub use self::energymech::Energymech; -pub use self::weechat::Weechat; -pub use self::binary::Binary; -pub use self::msgpack::Msgpack; - -mod energymech; -mod weechat; -// pub mod irssi; -mod binary; -mod msgpack; - - -pub struct Dummy; - -impl Decode for Dummy { - fn decode<'a>(&'a mut self, - _context: &'a Context, - _input: &'a mut BufRead) - -> Box>> + 'a> { - Box::new(iter::empty()) - } -} diff --git a/cli/Cargo.toml b/cli/Cargo.toml index b5bf1d5..62b47b9 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -16,11 +16,7 @@ clap = "2.1.2" chrono = "0.2.19" env_logger = "0.3.2" glob = "0.2.10" -# ilc-base = "*" -ilc-base = { path = "../base" } -# ilc-ops = "*" -ilc-ops = { path = "../ops" } -# ilc-format-weechat = { optional = true, version = "*" } -ilc-format-weechat = { optional = true, path = "../formats/weechat" } -# ilc-format-energymech = { optional = true, version = "*" } -ilc-format-energymech = { optional = true, path = "../formats/energymech" } +ilc-base = "0.1.0" +ilc-ops = "0.1.0" +ilc-format-weechat = { optional = true, version = "0.1.0" } +ilc-format-energymech = { optional = true, version = "0.1.0" } diff --git a/formats/energymech/Cargo.toml b/formats/energymech/Cargo.toml index 3c6fe80..c450b02 100644 --- a/formats/energymech/Cargo.toml +++ b/formats/energymech/Cargo.toml @@ -10,5 +10,4 @@ authors = ["Till Höppner "] [dependencies] log = "0.3.5" chrono = "0.2.19" -# ilc-base = "*" -ilc-base = { path = "../../base" } +ilc-base = "0.1.0" diff --git a/formats/weechat/Cargo.toml b/formats/weechat/Cargo.toml index 10d3ccb..2a7af9e 100644 --- a/formats/weechat/Cargo.toml +++ b/formats/weechat/Cargo.toml @@ -10,5 +10,4 @@ authors = ["Till Höppner "] [dependencies] log = "0.3.5" chrono = "0.2.19" -# ilc-base = "*" -ilc-base = { path = "../../base" } +ilc-base = "0.1.0" diff --git a/ops/Cargo.toml b/ops/Cargo.toml index ce52481..adcbb34 100644 --- a/ops/Cargo.toml +++ b/ops/Cargo.toml @@ -8,6 +8,5 @@ repository = "https://github.com/tilpner/ilc" authors = ["Till Höppner "] [dependencies] -# ilc-base = "*" -ilc-base = { path = "../base" } +ilc-base = "0.1.0" blist = "0.0.4" -- cgit v1.2.3