chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Re-export ruma-server-util from ruma with a feature flag

Browse Source
This commit is contained in:
Jonas Platte 2023-02-01 14:19:28 +01:00
parent 250d7f84dc
commit b0967d9053
No known key found for this signature in database
GPG Key ID: AAA7A61F696C3E0C
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -22,6 +22,7 @@ ruma-identity-service-api = { version = "0.7.0", path = "crates/ruma-identity-se
ruma-macros = { version = "=0.11.0", path = "crates/ruma-macros" }
ruma-push-gateway-api = { version = "0.7.0", path = "crates/ruma-push-gateway-api" }
ruma-signatures = { version = "0.13.0", path = "crates/ruma-signatures" }
ruma-server-util = { version = "0.1.0", path = "crates/ruma-server-util" }
ruma-state-res = { version = "0.9.0", path = "crates/ruma-state-res" }
serde = { version = "1.0.147", features = ["derive"] }
serde_html_form = "0.2.0"

1
crates/ruma/Cargo.toml
View File

@ -210,6 +210,7 @@ ruma-common = { workspace = true }
ruma-client = { workspace = true, optional = true }
ruma-signatures = { workspace = true, optional = true }
ruma-state-res = { workspace = true, optional = true }
ruma-server-util = { workspace = true, optional = true }
ruma-appservice-api = { workspace = true, optional = true }
ruma-client-api = { workspace = true, optional = true }

3
crates/ruma/src/lib.rs
View File

@ -82,6 +82,9 @@ pub use ruma_client as client;
#[cfg(feature = "events")]
#[doc(inline)]
pub use ruma_common::events;
#[cfg(feature = "server-util")]
#[doc(inline)]
pub use ruma_server_util as server_util;
#[cfg(feature = "signatures")]
#[doc(inline)]
pub use ruma_signatures as signatures;

22
xtask/src/cargo.rs
View File

@ -82,19 +82,19 @@ impl Package {
let mut document = read_file(&workspace_manifest_path)?.parse::<Document>()?;
let workspace_deps = &mut document["workspace"]["dependencies"];
if workspace_deps.get(&self.name).is_some() {
println!("Updating workspace dependency…");
if !dry_run {
let version = if self.name == "ruma-macros" || !self.version.pre.is_empty() {
format!("={}", self.version)
} else {
self.version.to_string()
};
println!("Updating workspace dependency…");
assert!(workspace_deps.get(&self.name).is_some());
workspace_deps[&self.name]["version"] = value(version.as_str());
if !dry_run {
let version = if self.name == "ruma-macros" || !self.version.pre.is_empty() {
format!("={}", self.version)
} else {
self.version.to_string()
};
write_file(&workspace_manifest_path, document.to_string())?;
}
workspace_deps[&self.name]["version"] = value(version.as_str());
write_file(&workspace_manifest_path, document.to_string())?;
}
}