Skip to content

Commit a1252d8

Browse files
authored
Merge pull request #184 from H1rono/c-question-mark
C-QUESTION-MARK
2 parents 5b69bcf + f614371 commit a1252d8

File tree

9 files changed

+145
-36
lines changed

9 files changed

+145
-36
lines changed

src/events.rs

+8-2
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,16 @@ use crate::macros::event_converts;
4343
///
4444
/// ## Example
4545
/// ```
46+
/// # fn main() -> Result<(), serde_json::Error> {
4647
/// use traq_bot_http::Event;
4748
/// use traq_bot_http::payloads::PingPayload;
4849
/// let payload = r#"{
4950
/// "eventTime": "2019-05-07T04:50:48.582586882Z"
5051
/// }"#;
51-
/// let payload = serde_json::from_str::<PingPayload>(payload).unwrap();
52+
/// let payload = serde_json::from_str::<PingPayload>(payload)?;
5253
/// let event = Event::Ping(payload);
54+
/// # Ok(())
55+
/// # }
5356
/// ```
5457
#[must_use]
5558
#[derive(Debug, Clone, PartialEq, Eq)]
@@ -150,14 +153,17 @@ event_converts! {
150153
///
151154
/// ## Example
152155
/// ```
156+
/// # fn main() -> Result<(), serde_json::Error> {
153157
/// use traq_bot_http::{Event, EventKind};
154158
/// use traq_bot_http::payloads::PingPayload;
155159
/// let payload = r#"{
156160
/// "eventTime": "2019-05-07T04:50:48.582586882Z"
157161
/// }"#;
158-
/// let payload = serde_json::from_str::<PingPayload>(payload).unwrap();
162+
/// let payload = serde_json::from_str::<PingPayload>(payload)?;
159163
/// let event: Event = payload.into();
160164
/// assert_eq!(event.kind(), EventKind::Ping);
165+
/// # Ok(())
166+
/// # }
161167
/// ```
162168
#[must_use]
163169
#[derive(Debug, Clone, Copy, PartialEq, Eq)]

src/payloads/channel.rs

+8-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ use crate::macros::payload_impl;
1414
///
1515
/// ## Example
1616
/// ```
17+
/// # fn main() -> Result<(), serde_json::Error> {
1718
/// use traq_bot_http::payloads::ChannelCreatedPayload;
1819
/// let payload = r##"{
1920
/// "eventTime": "2019-05-08T13:45:51.506206852Z",
@@ -33,8 +34,10 @@ use crate::macros::payload_impl;
3334
/// "updatedAt": "2019-05-08T13:45:51.487718Z"
3435
/// }
3536
/// }"##;
36-
/// let payload: ChannelCreatedPayload = payload.parse().unwrap();
37+
/// let payload: ChannelCreatedPayload = payload.parse()?;
3738
/// println!("{payload}");
39+
/// # Ok(())
40+
/// # }
3841
/// ```
3942
#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
4043
#[serde(rename_all = "camelCase")]
@@ -52,6 +55,7 @@ payload_impl! {ChannelCreatedPayload}
5255
///
5356
/// ## Example
5457
/// ```
58+
/// # fn main() -> Result<(), serde_json::Error> {
5559
/// use traq_bot_http::payloads::ChannelTopicChangedPayload;
5660
/// let payload = r##"{
5761
/// "eventTime": "2019-05-09T11:32:49.505357701Z",
@@ -79,8 +83,10 @@ payload_impl! {ChannelCreatedPayload}
7983
/// "bot": false
8084
/// }
8185
/// }"##;
82-
/// let payload: ChannelTopicChangedPayload = payload.parse().unwrap();
86+
/// let payload: ChannelTopicChangedPayload = payload.parse()?;
8387
/// println!("{payload}");
88+
/// # Ok(())
89+
/// # }
8490
/// ```
8591
#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
8692
#[serde(rename_all = "camelCase")]

src/payloads/message.rs

+28-7
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ use crate::macros::payload_impl;
1919
///
2020
/// ## Example
2121
/// ```
22+
/// # fn main() -> Result<(), serde_json::Error> {
2223
/// use traq_bot_http::payloads::MessageCreatedPayload;
2324
/// let payload = r##"{
2425
/// "eventTime": "2019-05-08T13:33:51.690308239Z",
@@ -45,8 +46,10 @@ use crate::macros::payload_impl;
4546
/// "updatedAt": "2019-05-08T13:33:51.632149265Z"
4647
/// }
4748
/// }"##;
48-
/// let payload: MessageCreatedPayload = payload.parse().unwrap();
49+
/// let payload: MessageCreatedPayload = payload.parse()?;
4950
/// println!("{payload}");
51+
/// # Ok(())
52+
/// # }
5053
/// ```
5154
#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
5255
#[serde(rename_all = "camelCase")]
@@ -77,6 +80,7 @@ impl From<DirectMessageCreatedPayload> for MessageCreatedPayload {
7780
///
7881
/// ## Example
7982
/// ```
83+
/// # fn main() -> Result<(), serde_json::Error> {
8084
/// use traq_bot_http::payloads::MessageDeletedPayload;
8185
/// let payload = r##"{
8286
/// "eventTime": "2019-05-08T13:33:51.690308239Z",
@@ -85,8 +89,10 @@ impl From<DirectMessageCreatedPayload> for MessageCreatedPayload {
8589
/// "channelId": "9aba50da-f605-4cd0-a428-5e4558cb911e"
8690
/// }
8791
/// }"##;
88-
/// let payload = serde_json::from_str::<MessageDeletedPayload>(payload).unwrap();
92+
/// let payload = serde_json::from_str::<MessageDeletedPayload>(payload)?;
8993
/// println!("{payload}");
94+
/// # Ok(())
95+
/// # }
9096
/// ```
9197
#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
9298
#[serde(rename_all = "camelCase")]
@@ -104,6 +110,7 @@ payload_impl! {MessageDeletedPayload}
104110
///
105111
/// ## Example
106112
/// ```
113+
/// # fn main() -> Result<(), serde_json::Error> {
107114
/// use traq_bot_http::payloads::MessageUpdatedPayload;
108115
/// let payload = r##"{
109116
/// "eventTime": "2019-05-08T13:33:51.690308239Z",
@@ -130,8 +137,10 @@ payload_impl! {MessageDeletedPayload}
130137
/// "updatedAt": "2019-05-08T13:33:51.632149265Z"
131138
/// }
132139
/// }"##;
133-
/// let payload = serde_json::from_str::<MessageUpdatedPayload>(payload).unwrap();
140+
/// let payload = serde_json::from_str::<MessageUpdatedPayload>(payload)?;
134141
/// println!("{payload}");
142+
/// # Ok(())
143+
/// # }
135144
/// ```
136145
#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
137146
#[serde(rename_all = "camelCase")]
@@ -162,6 +171,7 @@ impl From<DirectMessageUpdatedPayload> for MessageUpdatedPayload {
162171
///
163172
/// ## Example
164173
/// ```
174+
/// # fn main() -> Result<(), serde_json::Error> {
165175
/// use traq_bot_http::payloads::DirectMessageCreatedPayload;
166176
/// let payload = r##"{
167177
/// "eventTime": "2019-05-08T13:36:09.421492525Z",
@@ -188,8 +198,10 @@ impl From<DirectMessageUpdatedPayload> for MessageUpdatedPayload {
188198
/// "updatedAt": "2019-05-08T13:36:09.365393261Z"
189199
/// }
190200
/// }"##;
191-
/// let payload = serde_json::from_str::<DirectMessageCreatedPayload>(payload).unwrap();
201+
/// let payload = serde_json::from_str::<DirectMessageCreatedPayload>(payload)?;
192202
/// println!("{payload}");
203+
/// # Ok(())
204+
/// # }
193205
/// ```
194206
#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
195207
#[serde(rename_all = "camelCase")]
@@ -220,6 +232,7 @@ impl From<MessageCreatedPayload> for DirectMessageCreatedPayload {
220232
///
221233
/// ## Example
222234
/// ```
235+
/// # fn main() -> Result<(), serde_json::Error> {
223236
/// use traq_bot_http::payloads::DirectMessageDeletedPayload;
224237
/// let payload = r##"{
225238
/// "eventTime": "2019-05-08T13:36:09.421492525Z",
@@ -229,8 +242,10 @@ impl From<MessageCreatedPayload> for DirectMessageCreatedPayload {
229242
/// "channelId": "c5a5a697-3bad-4540-b2da-93dc88181d34"
230243
/// }
231244
/// }"##;
232-
/// let payload = serde_json::from_str::<DirectMessageDeletedPayload>(payload).unwrap();
245+
/// let payload = serde_json::from_str::<DirectMessageDeletedPayload>(payload)?;
233246
/// println!("{payload}");
247+
/// # Ok(())
248+
/// # }
234249
/// ```
235250
#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
236251
#[serde(rename_all = "camelCase")]
@@ -248,6 +263,7 @@ payload_impl! {DirectMessageDeletedPayload}
248263
///
249264
/// ## Example
250265
/// ```
266+
/// # fn main() -> Result<(), serde_json::Error> {
251267
/// use traq_bot_http::payloads::DirectMessageUpdatedPayload;
252268
/// let payload = r##"{
253269
/// "eventTime": "2019-05-08T13:36:09.421492525Z",
@@ -274,8 +290,10 @@ payload_impl! {DirectMessageDeletedPayload}
274290
/// "updatedAt": "2019-05-08T13:36:09.365393261Z"
275291
/// }
276292
/// }"##;
277-
/// let payload = serde_json::from_str::<DirectMessageUpdatedPayload>(payload).unwrap();
293+
/// let payload = serde_json::from_str::<DirectMessageUpdatedPayload>(payload)?;
278294
/// println!("{payload}");
295+
/// # Ok(())
296+
/// # }
279297
/// ```
280298
#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
281299
#[serde(rename_all = "camelCase")]
@@ -306,6 +324,7 @@ impl From<MessageUpdatedPayload> for DirectMessageUpdatedPayload {
306324
///
307325
/// ## Example
308326
/// ```
327+
/// # fn main() -> Result<(), serde_json::Error> {
309328
/// use traq_bot_http::payloads::BotMessageStampsUpdatedPayload;
310329
/// let payload = r##"{
311330
/// "eventTime": "2020-10-17T03:35:34.5326265Z",
@@ -334,8 +353,10 @@ impl From<MessageUpdatedPayload> for DirectMessageUpdatedPayload {
334353
/// }
335354
/// ]
336355
/// }"##;
337-
/// let payload = serde_json::from_str::<BotMessageStampsUpdatedPayload>(payload).unwrap();
356+
/// let payload = serde_json::from_str::<BotMessageStampsUpdatedPayload>(payload)?;
338357
/// println!("{payload}");
358+
/// # Ok(())
359+
/// # }
339360
/// ```
340361
#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
341362
#[serde(rename_all = "camelCase")]

src/payloads/stamp.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ use crate::macros::payload_impl;
1313
///
1414
/// ## Example
1515
/// ```
16+
/// # fn main() -> Result<(), serde_json::Error> {
1617
/// use traq_bot_http::payloads::StampCreatedPayload;
1718
/// let payload = r##"{
1819
/// "eventTime": "2019-05-08T08:31:06.566228282Z",
@@ -27,8 +28,10 @@ use crate::macros::payload_impl;
2728
/// "bot": false
2829
/// }
2930
/// }"##;
30-
/// let payload: StampCreatedPayload = payload.parse().unwrap();
31+
/// let payload: StampCreatedPayload = payload.parse()?;
3132
/// println!("{payload}");
33+
/// # Ok(())
34+
/// # }
3235
/// ```
3336
#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
3437
#[serde(rename_all = "camelCase")]

src/payloads/system.rs

+12-3
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,15 @@ use crate::macros::payload_impl;
1515
///
1616
/// ## Example
1717
/// ```
18+
/// # fn main() -> Result<(), serde_json::Error> {
1819
/// use traq_bot_http::payloads::PingPayload;
1920
/// let payload = r##"{
2021
/// "eventTime": "2019-05-07T04:50:48.582586882Z"
2122
/// }"##;
22-
/// let payload: PingPayload = payload.parse().unwrap();
23+
/// let payload: PingPayload = payload.parse()?;
2324
/// println!("{payload}");
25+
/// # Ok(())
26+
/// # }
2427
/// ```
2528
#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
2629
#[serde(rename_all = "camelCase")]
@@ -37,6 +40,7 @@ payload_impl! {PingPayload}
3740
///
3841
/// ## Example
3942
/// ```
43+
/// # fn main() -> Result<(), serde_json::Error> {
4044
/// use traq_bot_http::payloads::JoinedPayload;
4145
/// let payload = r##"{
4246
/// "eventTime": "2019-05-08T13:49:13.769110201Z",
@@ -56,8 +60,10 @@ payload_impl! {PingPayload}
5660
/// "updatedAt": "2018-04-25T12:22:02Z"
5761
/// }
5862
/// }"##;
59-
/// let payload: JoinedPayload = payload.parse().unwrap();
63+
/// let payload: JoinedPayload = payload.parse()?;
6064
/// println!("{payload}");
65+
/// # Ok(())
66+
/// # }
6167
/// ```
6268
#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
6369
#[serde(rename_all = "camelCase")]
@@ -88,6 +94,7 @@ impl From<LeftPayload> for JoinedPayload {
8894
///
8995
/// ## Example
9096
/// ```
97+
/// # fn main() -> Result<(), serde_json::Error> {
9198
/// use traq_bot_http::payloads::LeftPayload;
9299
/// let payload = r##"{
93100
/// "eventTime": "2019-05-08T13:49:16.497848449Z",
@@ -107,8 +114,10 @@ impl From<LeftPayload> for JoinedPayload {
107114
/// "updatedAt": "2018-04-25T12:22:02Z"
108115
/// }
109116
/// }"##;
110-
/// let payload: LeftPayload = payload.parse().unwrap();
117+
/// let payload: LeftPayload = payload.parse()?;
111118
/// println!("{payload}");
119+
/// # Ok(())
120+
/// # }
112121
/// ```
113122
#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
114123
#[serde(rename_all = "camelCase")]

src/payloads/tag.rs

+8-2
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,17 @@ use crate::macros::payload_impl;
1414
///
1515
/// ## Example
1616
/// ```
17+
/// # fn main() -> Result<(), serde_json::Error> {
1718
/// use traq_bot_http::payloads::TagAddedPayload;
1819
/// let payload = r##"{
1920
/// "eventTime": "2019-05-08T08:31:06.566228282Z",
2021
/// "tagId": "2bc06cda-bdb9-4a68-8000-62f907f36a92",
2122
/// "tag": "全強"
2223
/// }"##;
23-
/// let payload: TagAddedPayload = payload.parse().unwrap();
24+
/// let payload: TagAddedPayload = payload.parse()?;
2425
/// println!("{payload}");
26+
/// # Ok(())
27+
/// # }
2528
/// ```
2629
#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
2730
#[serde(rename_all = "camelCase")]
@@ -55,14 +58,17 @@ impl From<TagRemovedPayload> for TagAddedPayload {
5558
///
5659
/// ## Example
5760
/// ```
61+
/// # fn main() -> Result<(), serde_json::Error> {
5862
/// use traq_bot_http::payloads::TagRemovedPayload;
5963
/// let payload = r##"{
6064
/// "eventTime": "2019-05-08T08:31:06.566228282Z",
6165
/// "tagId": "2bc06cda-bdb9-4a68-8000-62f907f36a92",
6266
/// "tag": "全強"
6367
/// }"##;
64-
/// let payload: TagRemovedPayload = payload.parse().unwrap();
68+
/// let payload: TagRemovedPayload = payload.parse()?;
6569
/// println!("{payload}");
70+
/// # Ok(())
71+
/// # }
6672
/// ```
6773
#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
6874
#[serde(rename_all = "camelCase")]

0 commit comments

Comments
 (0)