From fb0f8a4d9104a1185511ecbabcb4718d9ca9d2cc Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Fri, 13 Sep 2019 22:28:34 +0200
Subject: [PATCH] Integrate ruma-events-macros into the repository

---
 .travis.yml                    |  6 +++---
 Cargo.toml                     |  7 ++++++-
 ruma-events-macros/.gitignore  |  3 ---
 ruma-events-macros/.travis.yml | 20 --------------------
 ruma-events-macros/LICENSE     | 19 -------------------
 5 files changed, 9 insertions(+), 46 deletions(-)
 delete mode 100644 ruma-events-macros/.gitignore
 delete mode 100644 ruma-events-macros/.travis.yml
 delete mode 100644 ruma-events-macros/LICENSE

diff --git a/.travis.yml b/.travis.yml
index bd0cd786..82c57b1f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,9 @@ before_script:
 script:
   - "cargo audit"
   - "cargo fmt --all -- --check"
-  - "cargo clippy --all-targets --all-features -- -D warnings"
-  - "cargo build --verbose"
-  - "cargo test --verbose"
+  - "cargo clippy --all --all-targets --all-features -- -D warnings"
+  - "cargo build --all --verbose"
+  - "cargo test --all --verbose"
 if: "type != push OR (tag IS blank AND branch = master)"
 notifications:
   email: false
diff --git a/Cargo.toml b/Cargo.toml
index 052212f3..d62f71ea 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@ edition = "2018"
 
 [dependencies]
 ruma-identifiers = "0.14.0"
-ruma-events-macros = { version = "0.1.0", path = "../ruma-events-macros" }
+ruma-events-macros = { version = "0.1.0", path = "ruma-events-macros" }
 serde_json = "1.0.40"
 
 [dependencies.js_int]
@@ -24,3 +24,8 @@ features = ["serde"]
 [dependencies.serde]
 version = "1.0.97"
 features = ["derive"]
+
+[workspace]
+members = [
+    "ruma-events-macros",
+]
diff --git a/ruma-events-macros/.gitignore b/ruma-events-macros/.gitignore
deleted file mode 100644
index 69369904..00000000
--- a/ruma-events-macros/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/target
-**/*.rs.bk
-Cargo.lock
diff --git a/ruma-events-macros/.travis.yml b/ruma-events-macros/.travis.yml
deleted file mode 100644
index 681414c3..00000000
--- a/ruma-events-macros/.travis.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-language: "rust"
-cache: "cargo"
-before_script:
-  - "rustup component add rustfmt"
-  - "rustup component add clippy"
-  - "cargo install --force cargo-audit"
-  - "cargo generate-lockfile"
-script:
-  - "cargo audit"
-  - "cargo fmt --all -- --check"
-  - "cargo clippy --all-targets --all-features -- -D warnings"
-  - "cargo build --verbose"
-  - "cargo test --verbose"
-if: "type != push OR (tag IS blank AND branch = master)"
-notifications:
-  email: false
-  irc:
-    channels:
-      - secure: "HvfXk7XMbm+iDeGoNNO886q4xMOUqJncfAxqklG6FJMCVxyrf8afyyXveCxnTH1F5oDvJXw33m6YetEj1oc7RQcB3+36XkxhjC/IzmupfD9KsikGiamL9YDrfQopvY4RXqodTR3YEof7SkFkEAzuobT0QStemX6TCkC9a7BX1QpMvEbo1pS5wlswy2G2WDbiicoiS93su73AKTQ2jOmzFdwUDZdhpNnPNJqVm5TM2Am8tj6hbX6A2y2AecRZISf8rv8LhmgpZi97NjeeK4CbsQO7G4KANGr8RA7oxlgzbW2q7FbDupB6+zLT4a4/R5GjtJoi8pvaJSL9r2GYpP4VLTYF3+tJVfLbvmQVtUjhHE4masGYfnZgpgRtiH6o+DiF/ErSE/SjJEy/S8ujqXS9mjLFtSg6nLM4k4JdCr7MLrX0buNUsv5mtmhyUvYgJtd9E+ZxLHV5TG5lF28JPMrpKrEE5UvQr/xHZh+70AwCTI5jMoSPqpBwsyQ1agxTIDmiyuo60FhVUoLyiXn25m0ZIf7v1sg4A8vFq0zA9xnhpxtZATXa7StZQn1BH2k82kuyO0hkbFhEHTv25sWJdtaFy/vmrGdchxVy7ogdOXOjXkeg+0oAnOHMsRyZlVusQ4mixM/PYet860XNcW4P6P9Nz0u5ZNmagggXSKCpCqs3smY="
-    use_notice: true
diff --git a/ruma-events-macros/LICENSE b/ruma-events-macros/LICENSE
deleted file mode 100644
index 1ea21301..00000000
--- a/ruma-events-macros/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2019 Jimmy Cuadra
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.