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

Remove workaround for trybuild bug that has been fixed

Browse Source
This commit is contained in:
Jonas Platte 2022-10-07 10:49:55 +02:00
parent d55573a555
commit 86b58cafb8
No known key found for this signature in database
GPG Key ID: AAA7A61F696C3E0C
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/ruma-common/Cargo.toml
View File

@ -27,9 +27,7 @@ compat = ["ruma-macros/compat", "ruma-identifiers-validation/compat"]
events = ["dep:thiserror"] events = ["dep:thiserror"]
js = ["dep:js-sys", "getrandom?/js", "uuid?/js"] js = ["dep:js-sys", "getrandom?/js", "uuid?/js"]
markdown = ["pulldown-cmark"] markdown = ["pulldown-cmark"]
# Dependency should not be renamed, but if it isn't, trybuild breaks: rand = ["dep:rand", "dep:uuid"]
# https://github.com/dtolnay/trybuild/issues/171
rand = ["dep:rand_crate", "dep:uuid"]
unstable-exhaustive-types = [] unstable-exhaustive-types = []
unstable-msc1767 = [] unstable-msc1767 = []
unstable-msc2448 = [] unstable-msc2448 = []
@ -64,7 +62,7 @@ js_option = "0.1.0"
percent-encoding = "2.1.0" percent-encoding = "2.1.0"
phf = { version = "0.10.1", features = ["macros"], optional = true } phf = { version = "0.10.1", features = ["macros"], optional = true }
pulldown-cmark = { version = "0.9.1", default-features = false, optional = true } pulldown-cmark = { version = "0.9.1", default-features = false, optional = true }
rand_crate = { package = "rand", version = "0.8.3", optional = true } rand = { version = "0.8.3", optional = true }
regex = { version = "1.5.6", default-features = false, features = ["std", "perf"] } regex = { version = "1.5.6", default-features = false, features = ["std", "perf"] }
ruma-identifiers-validation = { version = "0.9.0", path = "../ruma-identifiers-validation", default-features = false } ruma-identifiers-validation = { version = "0.9.0", path = "../ruma-identifiers-validation", default-features = false }
ruma-macros = { version = "0.10.3", path = "../ruma-macros" } ruma-macros = { version = "0.10.3", path = "../ruma-macros" }

5
crates/ruma-common/src/lib.rs
View File

@ -13,11 +13,6 @@ compile_error!(
"ruma_common's `client` and `server` Cargo features only exist as a workaround are not meant to be disabled" "ruma_common's `client` and `server` Cargo features only exist as a workaround are not meant to be disabled"
); );
// Renamed in `Cargo.toml` so we can features with the same name as the package.
// Rename them back here because the `Cargo.toml` names are ugly.
#[cfg(feature = "rand")]
extern crate rand_crate as rand;
// Hack to allow both ruma-common itself and external crates (or tests) to use procedural macros // Hack to allow both ruma-common itself and external crates (or tests) to use procedural macros
// that expect `ruma_common` to exist in the prelude. // that expect `ruma_common` to exist in the prelude.
extern crate self as ruma_common; extern crate self as ruma_common;