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

Merge remote-tracking branch 'upstream/main' into conduwuit-changes

Browse Source
This commit is contained in:
strawberry 2024-03-21 22:11:05 -04:00
commit 8afdd5b602
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/ruma-common/CHANGELOG.md
View File

@ -14,6 +14,9 @@ Breaking changes:
Improvements: Improvements:
- Use the [web-time](https://github.com/daxpedda/web-time) crate to return a
`SystemTime` that works under WASM in the
`MilliSecondsSinceUnixEpoch::to_system_time()` method.
- Stabilize support for `.m.rule.suppress_edits` push rule (MSC3958 / Matrix 1.9) - Stabilize support for `.m.rule.suppress_edits` push rule (MSC3958 / Matrix 1.9)
- Add `MatrixVersion::V1_9` - Add `MatrixVersion::V1_9`
- Point links to the Matrix 1.9 specification - Point links to the Matrix 1.9 specification

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

@ -77,6 +77,7 @@ time = "0.3.34"
tracing = { workspace = true, features = ["attributes"] } tracing = { workspace = true, features = ["attributes"] }
url = "2.2.2" url = "2.2.2"
uuid = { version = "1.0.0", optional = true, features = ["v4"] } uuid = { version = "1.0.0", optional = true, features = ["v4"] }
web-time = "1.1.0"
wildmatch = "2.0.0" wildmatch = "2.0.0"
[target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies] [target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies]

6
crates/ruma-common/src/time.rs
View File

@ -1,11 +1,9 @@
use std::{ use std::fmt;
fmt,
time::{Duration, SystemTime, UNIX_EPOCH},
};
use js_int::{uint, UInt}; use js_int::{uint, UInt};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use time::OffsetDateTime; use time::OffsetDateTime;
use web_time::{Duration, SystemTime, UNIX_EPOCH};
/// A timestamp represented as the number of milliseconds since the unix epoch. /// A timestamp represented as the number of milliseconds since the unix epoch.
#[derive(Clone, Copy, Hash, PartialEq, Eq, PartialOrd, Ord, Deserialize, Serialize)] #[derive(Clone, Copy, Hash, PartialEq, Eq, PartialOrd, Ord, Deserialize, Serialize)]