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

Enforce most serde_json import renames through clippy

Browse Source
This commit is contained in:
Jonas Platte 2022-01-03 12:28:15 +01:00
parent 21239bcf1a
commit 3cb728e61a
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
3 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.clippy.toml
View File

@ -1,10 +1,20 @@
msrv = "1.55" msrv = "1.55"
avoid-breaking-exported-api = false avoid-breaking-exported-api = false
disallowed-methods = [
# https://github.com/serde-rs/json/issues/160
"serde_json::from_reader",
]
disallowed-types = [ disallowed-types = [
"std::collections::HashMap", "std::collections::HashMap",
"std::collections::HashSet", "std::collections::HashSet",
] ]
enforced-import-renames = [ enforced-import-renames = [
{ path = "serde_json::from_slice", rename = "from_json_slice" },
{ path = "serde_json::from_str", rename = "from_json_str" },
{ path = "serde_json::from_value", rename = "from_json_value" },
{ path = "serde_json::to_value", rename = "to_json_value" },
{ path = "serde_json::value::to_raw_value", rename = "to_raw_json_value" },
{ path = "serde_json::value::RawValue", rename = "RawJsonValue" },
{ path = "serde_json::Value", rename = "JsonValue" }, { path = "serde_json::Value", rename = "JsonValue" },
] ]
standard-macro-braces = [ standard-macro-braces = [

7
crates/ruma-events/tests/redacted.rs
View File

@ -16,7 +16,8 @@ use ruma_events::{
}; };
use ruma_identifiers::{event_id, room_id, user_id, RoomVersionId}; use ruma_identifiers::{event_id, room_id, user_id, RoomVersionId};
use serde_json::{ use serde_json::{
from_value as from_json_value, json, to_value as to_json_value, value::to_raw_value, from_value as from_json_value, json, to_value as to_json_value,
value::to_raw_value as to_raw_json_value,
}; };
fn unsigned() -> RedactedUnsigned { fn unsigned() -> RedactedUnsigned {
@ -320,7 +321,7 @@ fn redact_message_content() {
"url": "mxc://example.com/AuDi0", "url": "mxc://example.com/AuDi0",
}); });
let raw_json = to_raw_value(&json).unwrap(); let raw_json = to_raw_json_value(&json).unwrap();
let content = RoomMessageEventContent::from_parts("m.room.message", &raw_json).unwrap(); let content = RoomMessageEventContent::from_parts("m.room.message", &raw_json).unwrap();
assert_matches!(content.redact(&RoomVersionId::V6), RedactedRoomMessageEventContent { .. }); assert_matches!(content.redact(&RoomVersionId::V6), RedactedRoomMessageEventContent { .. });
@ -334,7 +335,7 @@ fn redact_state_content() {
"room_version": "4", "room_version": "4",
}); });
let raw_json = to_raw_value(&json).unwrap(); let raw_json = to_raw_json_value(&json).unwrap();
let content = RoomCreateEventContent::from_parts("m.room.create", &raw_json).unwrap(); let content = RoomCreateEventContent::from_parts("m.room.create", &raw_json).unwrap();
assert_matches!( assert_matches!(

14
crates/ruma-state-res/.clippy.toml
View File

@ -1,7 +1,19 @@
msrv = "1.55" msrv = "1.55"
avoid-breaking-exported-api = false avoid-breaking-exported-api = false
disallowed-methods = [
# https://github.com/serde-rs/json/issues/160
"serde_json::from_reader",
]
disallowed-types = [] disallowed-types = []
enforced-import-renames = [ { path = "serde_json::Value", rename = "JsonValue" } ] enforced-import-renames = [
{ path = "serde_json::from_slice", rename = "from_json_slice" },
{ path = "serde_json::from_str", rename = "from_json_str" },
{ path = "serde_json::from_value", rename = "from_json_value" },
{ path = "serde_json::to_value", rename = "to_json_value" },
{ path = "serde_json::value::to_raw_value", rename = "to_raw_json_value" },
{ path = "serde_json::value::RawValue", rename = "RawJsonValue" },
{ path = "serde_json::Value", rename = "JsonValue" },
]
standard-macro-braces = [ standard-macro-braces = [
{ name = "btreeset", brace = "[" }, { name = "btreeset", brace = "[" },
{ name = "btreemap", brace = "{" }, { name = "btreemap", brace = "{" },