Merge pull request #170 from antoyo/fix/merge-crates

Fix/merge crates
antoyo · May 10, 2019 · 4ade1dc · 4ade1dc
2 parents 9948d6a + f12f9ce
commit 4ade1dc
Show file tree

Hide file tree

Showing 84 changed files with 556 additions and 1,492 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -40,10 +40,9 @@ script:
   - cargo test
   - cargo test --examples
   - cargo test --manifest-path examples/buttons-attribute/Cargo.toml
-  #- cargo build --manifest-path examples/http/Cargo.toml
+  - cargo build --manifest-path examples/http/Cargo.toml
   #- cargo build --manifest-path examples/async/Cargo.toml
   - cargo build --manifest-path examples/webkit-test/Cargo.toml
-  - cargo build --manifest-path examples/buttons-derive/Cargo.toml
 
 matrix:
   allow_failures:

diff --git a/Cargo.toml b/Cargo.toml
@@ -8,6 +8,7 @@ name = "relm"
 readme = "README.adoc"
 repository = "https://github.com/antoyo/relm"
 version = "0.16.0"
+
 [badges.appveyor]
 branch = "master"
 repository = "antoyo/relm"
@@ -19,16 +20,16 @@ repository = "antoyo/relm"
 [dependencies]
 cairo-rs = "^0.6.0"
 glib = "^0.7.0"
+glib-sys = "^0.8.0"
 gobject-sys = "^0.8.0"
 gtk = "^0.6.0"
+libc = "^0.2.54"
+log = "^0.4.6"
+quote = "0.6"
 
-[dependencies.relm-core]
-path = "relm-core"
-version = "^0.16.0"
-
-[dependencies.relm-state]
-path = "relm-state"
-version = "^0.16.0"
+[dependencies.syn]
+features = ["full"]
+version = "0.15"
 
 [dev-dependencies]
 chrono = "0.4"
@@ -39,10 +40,6 @@ gtk-test = "^0.3"
 [dev-dependencies.gio]
 version = "^0.6.0"
 
-[dev-dependencies.relm-attributes]
-path = "relm-attributes"
-version = "^0.16.0"
-
 [dev-dependencies.relm-derive]
 path = "relm-derive"
 version = "^0.16.0"

diff --git a/README.adoc b/README.adoc
@@ -158,20 +158,11 @@ This attribute does the following:
  * Automatically create the `Widget` `struct`.
  * Both traits can be implemented at once.
 
-To be able to use this attribute, you need to add the `relm-attributes` crate in your `Cargo.toml`:
-
-[source,toml]
-----
-relm-attributes = "^0.11.0"
-----
-
-and to add the following code:
+To use this attribute, add the following code:
 
 [source,rust]
 ----
-extern crate relm_attributes;
-
-use relm_attributes::widget;
+use relm_derive::widget;
 ----
 
 Here is an example using this attribute:
@@ -246,15 +237,14 @@ You can still provide the method and the associated types if needed, but you can
 To benefit from better error messages, enable the following features:
 
  * relm/unstable
- * relm-attributes/unstable
  * relm-derive/unstable
 
 To do so, add the following lines to your `Cargo.toml`:
 
 [source,toml]
 ----
 [features]
-default = ["relm/unstable", "relm-attributes/unstable", "relm-derive/unstable"]
+default = ["relm/unstable", "relm-derive/unstable"]
 ----
 ====
 

diff --git a/examples/async/Cargo.toml b/examples/async/Cargo.toml
@@ -14,8 +14,5 @@ version = "^0.6.0"
 [dependencies.relm]
 path = "../.."
 
-[dependencies.relm-attributes]
-path = "../../relm-attributes"
-
 [dependencies.relm-derive]
 path = "../../relm-derive"
diff --git a/examples/async/src/main.rs b/examples/async/src/main.rs
@@ -24,7 +24,6 @@ extern crate gtk;
 extern crate gtk_sys;
 #[macro_use]
 extern crate relm;
-extern crate relm_attributes;
 #[macro_use]
 extern crate relm_derive;
 
@@ -48,7 +47,7 @@ use gtk::{
 use gtk_sys::{GTK_RESPONSE_ACCEPT, GTK_RESPONSE_CANCEL};
 use gtk::Orientation::Vertical;
 use relm::{Relm, Widget};
-use relm_attributes::widget;
+use relm_derive::widget;
 
 use self::Msg::*;
 

diff --git a/examples/buttons-attribute.rs b/examples/buttons-attribute.rs
@@ -22,8 +22,6 @@
 extern crate gtk;
 #[macro_use]
 extern crate relm;
-extern crate relm_attributes;
-#[macro_use]
 extern crate relm_derive;
 #[cfg_attr(test, macro_use)]
 extern crate gtk_test;
@@ -37,7 +35,7 @@ use gtk::{
 };
 use gtk::Orientation::Vertical;
 use relm::Widget;
-use relm_attributes::widget;
+use relm_derive::{Msg, widget};
 
 use self::Msg::*;
 

diff --git a/examples/buttons-attribute/Cargo.toml b/examples/buttons-attribute/Cargo.toml
@@ -10,14 +10,11 @@ gtk-test = "^0.3"
 [dependencies.relm]
 path = "../.."
 
-[dependencies.relm-attributes]
-path = "../../relm-attributes"
-
 [dependencies.relm-derive]
 path = "../../relm-derive"
 
 [dependencies.relm-test]
 path = "../../relm-test"
 
 [features]
-default = ["relm/unstable", "relm-attributes/unstable", "relm-derive/unstable"]
+default = ["relm/unstable", "relm-derive/unstable"]
diff --git a/examples/buttons-attribute/src/main.rs b/examples/buttons-attribute/src/main.rs
@@ -22,7 +22,6 @@
 extern crate gtk;
 #[macro_use]
 extern crate relm;
-extern crate relm_attributes;
 #[macro_use]
 extern crate relm_derive;
 #[macro_use]
@@ -37,7 +36,7 @@ use gtk::{
 };
 use gtk::Orientation::Vertical;
 use relm::{Relm, Widget, timeout};
-use relm_attributes::widget;
+use relm_derive::widget;
 
 use self::Msg::*;
 

diff --git a/examples/buttons-derive/Cargo.toml b/examples/buttons-derive/Cargo.toml
diff --git a/examples/buttons-derive/src/main.rs b/examples/buttons-derive/src/main.rs
diff --git a/examples/clock-attribute.rs b/examples/clock-attribute.rs
@@ -23,7 +23,6 @@ extern crate chrono;
 extern crate gtk;
 #[macro_use]
 extern crate relm;
-extern crate relm_attributes;
 #[macro_use]
 extern crate relm_derive;
 extern crate gtk_test;
@@ -35,7 +34,7 @@ use gtk::{
     WidgetExt,
 };
 use relm::{Relm, Widget, interval};
-use relm_attributes::widget;
+use relm_derive::widget;
 
 use self::Msg::*;
 

diff --git a/examples/drawing.rs b/examples/drawing.rs
@@ -24,7 +24,6 @@ extern crate gtk;
 extern crate rand;
 #[macro_use]
 extern crate relm;
-extern crate relm_attributes;
 #[macro_use]
 extern crate relm_derive;
 
@@ -47,7 +46,7 @@ use relm::{
     Widget,
     interval,
 };
-use relm_attributes::widget;
+use relm_derive::widget;
 
 use self::Msg::*;
 

diff --git a/examples/http/Cargo.toml b/examples/http/Cargo.toml
@@ -17,8 +17,5 @@ uhttp_uri = "^0.5.1"
 [dependencies.relm]
 path = "../.."
 
-[dependencies.relm-attributes]
-path = "../../relm-attributes"
-
 [dependencies.relm-derive]
 path = "../../relm-derive"
diff --git a/examples/http/src/main.rs b/examples/http/src/main.rs
@@ -29,7 +29,6 @@ extern crate gtk;
 extern crate json;
 #[macro_use]
 extern crate relm;
-extern crate relm_attributes;
 #[macro_use]
 extern crate relm_derive;
 extern crate simplelog;
@@ -68,7 +67,7 @@ use relm::{
     Widget,
     execute,
 };
-use relm_attributes::widget;
+use relm_derive::widget;
 use simplelog::{Config, TermLogger};
 use simplelog::LevelFilter::Warn;
 use uhttp_uri::HttpUri;

diff --git a/examples/multi-window.rs b/examples/multi-window.rs
@@ -22,7 +22,6 @@
 extern crate gtk;
 #[macro_use]
 extern crate relm;
-extern crate relm_attributes;
 #[macro_use]
 extern crate relm_derive;
 
@@ -31,7 +30,7 @@ use gtk::{
     WidgetExt,
 };
 use relm::{Component, Widget, init};
-use relm_attributes::widget;
+use relm_derive::widget;
 
 use self::Msg::*;
 

diff --git a/examples/multithread.rs b/examples/multithread.rs
@@ -22,7 +22,6 @@
 extern crate gtk;
 #[macro_use]
 extern crate relm;
-extern crate relm_attributes;
 #[macro_use]
 extern crate relm_derive;
 #[cfg_attr(test, macro_use)]
@@ -39,7 +38,7 @@ use gtk::{
 };
 use gtk::Orientation::Vertical;
 use relm::{Channel, Relm, Widget};
-use relm_attributes::widget;
+use relm_derive::widget;
 
 use self::Msg::*;
 

diff --git a/examples/readme-attributes.rs b/examples/readme-attributes.rs
@@ -3,13 +3,12 @@ extern crate gtk;
 extern crate relm;
 #[macro_use]
 extern crate relm_derive;
-extern crate relm_attributes;
 
-use relm_attributes::widget;
+use relm_derive::widget;
 use relm::Widget;
 use gtk::prelude::*;
 use gtk::Inhibit;
-use gtk::Orientation::Vertical; 
+use gtk::Orientation::Vertical;
 
 #[derive(Msg)]
 pub enum Msg {
@@ -72,4 +71,4 @@ impl Widget for Win {
 
 fn main() {
     Win::run(()).unwrap();
-}
+}