Integrate ruma-appservice-api

.builds/beta.yml

@@ -2,26 +2,26 @@ image: archlinux
 packages:
   - rustup
 sources:
-  - https://github.com/ruma/ruma-appservice-api
+  - https://github.com/ruma/ruma
 tasks:
   - rustup: |
       # We specify --profile minimal because we'd otherwise download docs
       rustup toolchain install beta --profile minimal -c rustfmt -c clippy
       rustup default beta
   - test: |
-      cd ruma-appservice-api
+      cd ruma
 
       # We don't want the build to stop on individual failure of independent
       # tools, so capture tool exit codes and set the task exit code manually
       set +e
 
-      cargo fmt -- --check
+      cargo fmt --all -- --check
       fmt_exit=$?
 
-      cargo clippy --all-targets --all-features -- -D warnings
+      cargo clippy --all --all-targets --all-features -- -D warnings
       clippy_exit=$?
 
-      cargo test --verbose
+      cargo test --all --verbose
       test_exit=$?
 
       exit $(( $fmt_exit || $clippy_exit || $test_exit ))

.builds/nightly.yml

@@ -2,7 +2,7 @@ image: archlinux
 packages:
   - rustup
 sources:
-  - https://github.com/ruma/ruma-appservice-api
+  - https://github.com/ruma/ruma
 tasks:
   - rustup: |
       rustup toolchain install nightly --profile minimal
@@ -13,19 +13,19 @@ tasks:
       rustup component add rustfmt || true
       rustup component add clippy || true
   - test: |
-      cd ruma-appservice-api
+      cd ruma
 
       # We don't want the build to stop on individual failure of independent
       # tools, so capture tool exit codes and set the task exit code manually
       set +e
 
       if ( rustup component list | grep -q rustfmt ); then
-        cargo fmt -- --check
+        cargo fmt --all -- --check
       fi
       fmt_exit=$?
 
       if ( rustup component list | grep -q clippy ); then
-        cargo clippy --all-targets --all-features -- -D warnings
+        cargo clippy --all --all-targets --all-features -- -D warnings
       fi
       clippy_exit=$?
 

.builds/stable.yml

@@ -2,26 +2,26 @@ image: archlinux
 packages:
   - rustup
 sources:
-  - https://github.com/ruma/ruma-appservice-api
+  - https://github.com/ruma/ruma
 tasks:
   - rustup: |
       # We specify --profile minimal because we'd otherwise download docs
       rustup toolchain install stable --profile minimal -c rustfmt -c clippy
       rustup default stable
   - test: |
-      cd ruma-appservice-api
+      cd ruma
 
       # We don't want the build to stop on individual failure of independent
       # tools, so capture tool exit codes and set the task exit code manually
       set +e
 
-      cargo fmt -- --check
+      cargo fmt --all -- --check
       fmt_exit=$?
 
-      cargo clippy --all-targets --all-features -- -D warnings
+      cargo clippy --all --all-targets --all-features -- -D warnings
       clippy_exit=$?
 
-      cargo test --verbose
+      cargo test --all --verbose
       test_exit=$?
 
       exit $(( $fmt_exit || $clippy_exit || $test_exit ))

Cargo.toml

@@ -25,6 +25,9 @@ ruma-events = { version = "0.21.3", optional = true }
 ruma-signatures = { version = "0.5.0", optional = true }
 
 ruma-api = { version = "0.16.1", optional = true }
-ruma-appservice-api = { version = "0.1.0", optional = true }
+ruma-appservice-api = { version = "0.1.0", path = "ruma-appservice-api", optional = true }
 ruma-client-api = { version = "0.9.0", optional = true }
 ruma-federation-api = { version = "0.0.2", optional = true }
+
+[workspace]
+members = ["ruma-*"]

ruma-appservice-api/.builds/msrv.yml

@@ -1,16 +0,0 @@
-image: archlinux
-packages:
-  - rustup
-sources:
-  - https://github.com/ruma/ruma-appservice-api
-tasks:
-  - rustup: |
-      # We specify --profile minimal because we'd otherwise download docs
-      rustup toolchain install 1.39.0 --profile minimal
-      rustup default 1.39.0
-  - test: |
-      cd ruma-appservice-api
-
-      # Only make sure the code builds with the MSRV. Tests can require later
-      # Rust versions, don't compile or run them.
-      cargo build --verbose