From b715911189d9168d191d0b1529e3d4b64143cfad Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Wed, 21 Sep 2022 17:28:36 +0200 Subject: [PATCH] ruma: Glob-reexport ruma-common Previously this would result in rustdoc showing two `api` modules, but that is now fixed: https://github.com/rust-lang/rust/issues/83375 --- crates/ruma/src/lib.rs | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/crates/ruma/src/lib.rs b/crates/ruma/src/lib.rs index 5004821a..bbe85791 100644 --- a/crates/ruma/src/lib.rs +++ b/crates/ruma/src/lib.rs @@ -122,20 +122,4 @@ pub use js_int::{int, uint, Int, UInt}; pub use js_option::JsOption; #[cfg(feature = "client-ext-client-api")] pub use ruma_client::Client; -pub use ruma_common::{ - authentication, device_id, device_key_id, directory, encryption, event_id, exports, matrix_uri, - mxc_uri, power_levels, presence, push, room, room_alias_id, room_id, room_version_id, serde, - server_name, server_signing_key_id, thirdparty, to_device, user_id, ClientSecret, DeviceId, - DeviceKeyAlgorithm, DeviceKeyId, DeviceSignatures, DeviceSigningKeyId, EntitySignatures, - EventEncryptionAlgorithm, EventId, IdParseError, KeyId, KeyName, MatrixToUri, MatrixUri, - MilliSecondsSinceUnixEpoch, MxcUri, OwnedClientSecret, OwnedDeviceId, OwnedDeviceKeyId, - OwnedDeviceSigningKeyId, OwnedEventId, OwnedKeyId, OwnedKeyName, OwnedMxcUri, OwnedRoomAliasId, - OwnedRoomId, OwnedRoomOrAliasId, OwnedServerName, OwnedServerSigningKeyId, OwnedSessionId, - OwnedSigningKeyId, OwnedTransactionId, OwnedUserId, PrivOwnedStr, RoomAliasId, RoomId, - RoomOrAliasId, RoomVersionId, SecondsSinceUnixEpoch, ServerName, ServerSignatures, - ServerSigningKeyId, SessionId, Signatures, SigningKeyAlgorithm, TransactionId, UserId, -}; -#[cfg(feature = "canonical-json")] -pub use ruma_common::{ - canonical_json, CanonicalJsonError, CanonicalJsonObject, CanonicalJsonValue, -}; +pub use ruma_common::*;