Skip to content

Commit 7d57ad4

Browse files
calaveracalavera
committed
Remove old idioms
So people don't have to learn 2015 idioms like `extern crate` and implicit macro imports. Signed-off-by: David Calavera <[email protected]>
1 parent e7b229a commit 7d57ad4

File tree

67 files changed

+139
-121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+139
-121
lines changed

‎Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,7 @@ check-event-features:
100100
cargo test --package aws_lambda_events --no-default-features --features ses
101101
cargo test --package aws_lambda_events --no-default-features --features sns
102102
cargo test --package aws_lambda_events --no-default-features --features sqs
103-
cargo test --package aws_lambda_events --no-default-features --features streams
103+
cargo test --package aws_lambda_events --no-default-features --features streams
104+
105+
fmt:
106+
cargo +nightly fmt --all

‎lambda-events/Cargo.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ base64 = "0.21"
2020
http = { version = "0.2", optional = true }
2121
http-body = { version = "0.4", optional = true }
2222
http-serde = { version = "^1", optional = true }
23-
serde = "^1"
24-
serde_derive = "^1"
23+
serde = { version = "^1", features = ["derive"] }
2524
serde_with = { version = "^3", features = ["json"], optional = true }
2625
serde_json = "^1"
2726
serde_dynamo = { version = "^4.1", optional = true }
@@ -34,9 +33,6 @@ chrono = { version = "0.4.23", default-features = false, features = [
3433
query_map = { version = "^0.6", features = ["serde", "url-query"], optional = true }
3534
flate2 = { version = "1.0.24", optional = true }
3635

37-
[dev-dependencies]
38-
pretty_assertions = "1.3"
39-
4036
[features]
4137
default = [
4238
"activemq",

‎lambda-events/src/custom_serde/codebuild_time.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
use chrono::{DateTime, TimeZone, Utc};
2-
use serde::de::{Deserialize, Deserializer, Error as DeError, Visitor};
32
use serde::ser::Serializer;
3+
use serde::{
4+
de::{Deserializer, Error as DeError, Visitor},
5+
Deserialize,
6+
};
47
use std::fmt;
58

69
// Jan 2, 2006 3:04:05 PM
@@ -10,7 +13,7 @@ struct TimeVisitor;
1013
impl<'de> Visitor<'de> for TimeVisitor {
1114
type Value = DateTime<Utc>;
1215

13-
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
16+
fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
1417
write!(formatter, "valid codebuild time: {}", CODEBUILD_TIME_FORMAT)
1518
}
1619

@@ -74,7 +77,7 @@ mod tests {
7477
#[serde(with = "str_time")]
7578
pub date: TestTime,
7679
}
77-
let data = json!({
80+
let data = serde_json::json!({
7881
"date": "Sep 1, 2017 4:12:29 PM"
7982
});
8083

@@ -92,7 +95,7 @@ mod tests {
9295
#[serde(with = "optional_time")]
9396
pub date: Option<TestTime>,
9497
}
95-
let data = json!({
98+
let data = serde_json::json!({
9699
"date": "Sep 1, 2017 4:12:29 PM"
97100
});
98101

‎lambda-events/src/custom_serde/float_unix_epoch.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ fn ne_timestamp<T: fmt::Display>(ts: T) -> SerdeError<T, u8> {
1414
}
1515

1616
impl<V: fmt::Display, D: fmt::Display> fmt::Debug for SerdeError<V, D> {
17-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
17+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
1818
write!(f, "ChronoSerdeError({})", self)
1919
}
2020
}
2121

2222
impl<V: fmt::Display, D: fmt::Display> fmt::Display for SerdeError<V, D> {
23-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
23+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
2424
match *self {
2525
SerdeError::NonExistent { ref timestamp } => {
2626
write!(f, "value is not a legal timestamp: {}", timestamp)
@@ -77,7 +77,7 @@ where
7777
impl<'de> de::Visitor<'de> for SecondsFloatTimestampVisitor {
7878
type Value = DateTime<Utc>;
7979

80-
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
80+
fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
8181
formatter.write_str("a unix timestamp as a float")
8282
}
8383

‎lambda-events/src/custom_serde/headers.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ impl<'de> Visitor<'de> for HeaderMapVisitor {
4949
type Value = HeaderMap;
5050

5151
// Format a message stating what data this Visitor expects to receive.
52-
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
52+
fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
5353
formatter.write_str("lots of things can go wrong with HeaderMap")
5454
}
5555

@@ -81,7 +81,7 @@ impl<'de> Visitor<'de> for HeaderMapVisitor {
8181
let mut map = HeaderMap::with_capacity(access.size_hint().unwrap_or(0));
8282

8383
if !self.is_human_readable {
84-
while let Some((key, arr)) = access.next_entry::<Cow<str>, Vec<Cow<[u8]>>>()? {
84+
while let Some((key, arr)) = access.next_entry::<Cow<'_, str>, Vec<Cow<'_, [u8]>>>()? {
8585
let key = HeaderName::from_bytes(key.as_bytes())
8686
.map_err(|_| de::Error::invalid_value(Unexpected::Str(&key), &self))?;
8787
for val in arr {
@@ -91,7 +91,7 @@ impl<'de> Visitor<'de> for HeaderMapVisitor {
9191
}
9292
}
9393
} else {
94-
while let Some((key, val)) = access.next_entry::<Cow<str>, OneOrMore>()? {
94+
while let Some((key, val)) = access.next_entry::<Cow<'_, str>, OneOrMore<'_>>()? {
9595
let key = HeaderName::from_bytes(key.as_bytes())
9696
.map_err(|_| de::Error::invalid_value(Unexpected::Str(&key), &self))?;
9797
match val {
@@ -135,6 +135,7 @@ where
135135
#[cfg(test)]
136136
mod tests {
137137
use super::*;
138+
use serde::{Deserialize, Serialize};
138139

139140
#[test]
140141
fn test_deserialize_missing_http_headers() {
@@ -143,7 +144,7 @@ mod tests {
143144
#[serde(deserialize_with = "deserialize_headers", default)]
144145
pub headers: HeaderMap,
145146
}
146-
let data = json!({
147+
let data = serde_json::json!({
147148
"not_headers": {}
148149
});
149150

@@ -161,7 +162,7 @@ mod tests {
161162
#[serde(serialize_with = "serialize_multi_value_headers")]
162163
headers: HeaderMap,
163164
}
164-
let data = json!({
165+
let data = serde_json::json!({
165166
"headers": {
166167
"Accept": ["*/*"]
167168
}
@@ -181,7 +182,7 @@ mod tests {
181182
#[serde(deserialize_with = "deserialize_headers")]
182183
headers: HeaderMap,
183184
}
184-
let data = json!({ "headers": null });
185+
let data = serde_json::json!({ "headers": null });
185186

186187
let decoded: Test = serde_json::from_value(data).unwrap();
187188
assert!(decoded.headers.is_empty());

‎lambda-events/src/custom_serde/http_method.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ struct MethodVisitor;
1111
impl<'de> Visitor<'de> for MethodVisitor {
1212
type Value = Method;
1313

14-
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
14+
fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
1515
write!(formatter, "valid method name")
1616
}
1717

@@ -56,6 +56,7 @@ pub fn serialize_optional<S: Serializer>(method: &Option<Method>, ser: S) -> Res
5656
#[cfg(test)]
5757
mod tests {
5858
use super::*;
59+
use serde::{Deserialize, Serialize};
5960

6061
#[test]
6162
fn test_http_method_serializer() {
@@ -64,7 +65,7 @@ mod tests {
6465
#[serde(with = "crate::custom_serde::http_method")]
6566
pub method: http::Method,
6667
}
67-
let data = json!({
68+
let data = serde_json::json!({
6869
"method": "DELETE"
6970
});
7071
let decoded: Test = serde_json::from_value(data.clone()).unwrap();
@@ -83,7 +84,7 @@ mod tests {
8384
#[serde(default)]
8485
pub method: Option<http::Method>,
8586
}
86-
let data = json!({
87+
let data = serde_json::json!({
8788
"method": "DELETE"
8889
});
8990
let decoded: Test = serde_json::from_value(data.clone()).unwrap();
@@ -92,11 +93,11 @@ mod tests {
9293
let recoded = serde_json::to_value(decoded).unwrap();
9394
assert_eq!(data, recoded);
9495

95-
let data = json!({ "method": null });
96+
let data = serde_json::json!({ "method": null });
9697
let decoded: Test = serde_json::from_value(data).unwrap();
9798
assert_eq!(None, decoded.method);
9899

99-
let data = json!({});
100+
let data = serde_json::json!({});
100101
let decoded: Test = serde_json::from_value(data).unwrap();
101102
assert_eq!(None, decoded.method);
102103
}

‎lambda-events/src/custom_serde/mod.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ where
9595
#[allow(deprecated)]
9696
mod test {
9797
use super::*;
98+
use serde::{Deserialize, Serialize};
9899
use serde_json;
99100

100101
#[test]
@@ -104,7 +105,7 @@ mod test {
104105
#[serde(deserialize_with = "deserialize_base64")]
105106
v: Vec<u8>,
106107
}
107-
let data = json!({
108+
let data = serde_json::json!({
108109
"v": "SGVsbG8gV29ybGQ=",
109110
});
110111
let decoded: Test = serde_json::from_value(data).unwrap();
@@ -132,13 +133,13 @@ mod test {
132133
#[serde(deserialize_with = "deserialize_lambda_map")]
133134
v: HashMap<String, String>,
134135
}
135-
let input = json!({
136+
let input = serde_json::json!({
136137
"v": {},
137138
});
138139
let decoded: Test = serde_json::from_value(input).unwrap();
139140
assert_eq!(HashMap::new(), decoded.v);
140141

141-
let input = json!({
142+
let input = serde_json::json!({
142143
"v": null,
143144
});
144145
let decoded: Test = serde_json::from_value(input).unwrap();
@@ -153,13 +154,13 @@ mod test {
153154
#[serde(deserialize_with = "deserialize_lambda_dynamodb_item")]
154155
v: serde_dynamo::Item,
155156
}
156-
let input = json!({
157+
let input = serde_json::json!({
157158
"v": {},
158159
});
159160
let decoded: Test = serde_json::from_value(input).unwrap();
160161
assert_eq!(serde_dynamo::Item::from(HashMap::new()), decoded.v);
161162

162-
let input = json!({
163+
let input = serde_json::json!({
163164
"v": null,
164165
});
165166
let decoded: Test = serde_json::from_value(input).unwrap();

‎lambda-events/src/encodings/http.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ impl<'de> Deserialize<'de> for Body {
198198
impl<'de> Visitor<'de> for BodyVisitor {
199199
type Value = Body;
200200

201-
fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
201+
fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
202202
formatter.write_str("string")
203203
}
204204

‎lambda-events/src/encodings/mod.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1+
use serde::{Deserialize, Serialize};
12
use std::{ops::Deref, ops::DerefMut};
23

3-
pub type Error = Box<dyn std::error::Error + Send + Sync>;
4-
54
#[cfg(feature = "chrono")]
65
mod time;
76
use crate::custom_serde::{deserialize_base64, serialize_base64};
@@ -13,6 +12,8 @@ mod http;
1312
#[cfg(feature = "http")]
1413
pub use self::http::*;
1514

15+
pub type Error = Box<dyn std::error::Error + Send + Sync>;
16+
1617
/// Binary data encoded in base64.
1718
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
1819
pub struct Base64Data(

‎lambda-events/src/encodings/time.rs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
use chrono::{DateTime, Duration, TimeZone, Utc};
2-
use serde::de::{Deserialize, Deserializer, Error as DeError};
32
use serde::ser::Serializer;
3+
use serde::{
4+
de::{Deserializer, Error as DeError},
5+
Deserialize, Serialize,
6+
};
47
use std::ops::{Deref, DerefMut};
58

69
/// Timestamp with millisecond precision.
@@ -224,7 +227,7 @@ mod test {
224227
let expected = Utc.ymd(2017, 10, 5).and_hms_nano(15, 33, 44, 302_000_000);
225228

226229
// Test parsing strings.
227-
let data = json!({
230+
let data = serde_json::json!({
228231
"v": "1507217624302",
229232
});
230233
let decoded: Test = serde_json::from_value(data).unwrap();
@@ -233,7 +236,7 @@ mod test {
233236
let decoded: Test = serde_json::from_slice(r#"{"v":1507217624302}"#.as_bytes()).unwrap();
234237
assert_eq!(expected, decoded.v,);
235238
// Test parsing floats.
236-
let data = json!({
239+
let data = serde_json::json!({
237240
"v": 1507217624302.0,
238241
});
239242
let decoded: Test = serde_json::from_value(data).unwrap();
@@ -294,13 +297,13 @@ mod test {
294297

295298
let expected = Duration::seconds(36);
296299

297-
let data = json!({
300+
let data = serde_json::json!({
298301
"v": 36,
299302
});
300303
let decoded: Test = serde_json::from_value(data).unwrap();
301304
assert_eq!(expected, decoded.v,);
302305

303-
let data = json!({
306+
let data = serde_json::json!({
304307
"v": 36.1,
305308
});
306309
let decoded: Test = serde_json::from_value(data).unwrap();
@@ -331,13 +334,13 @@ mod test {
331334

332335
let expected = Duration::minutes(36);
333336

334-
let data = json!({
337+
let data = serde_json::json!({
335338
"v": 36,
336339
});
337340
let decoded: Test = serde_json::from_value(data).unwrap();
338341
assert_eq!(expected, decoded.v,);
339342

340-
let data = json!({
343+
let data = serde_json::json!({
341344
"v": 36.1,
342345
});
343346
let decoded: Test = serde_json::from_value(data).unwrap();

‎lambda-events/src/event/activemq/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use serde::{Deserialize, Serialize};
12
use std::collections::HashMap;
23

34
use crate::custom_serde::deserialize_lambda_map;
@@ -53,7 +54,7 @@ pub struct ActiveMqDestination {
5354
mod test {
5455
use super::*;
5556

56-
extern crate serde_json;
57+
use serde_json;
5758

5859
#[test]
5960
#[cfg(feature = "activemq")]

‎lambda-events/src/event/alb/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use crate::custom_serde::{
44
use crate::encodings::Body;
55
use http::{HeaderMap, Method};
66
use query_map::QueryMap;
7+
use serde::{Deserialize, Serialize};
78

89
/// `AlbTargetGroupRequest` contains data originating from the ALB Lambda target group integration
910
#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)]
@@ -68,7 +69,7 @@ pub struct AlbTargetGroupResponse {
6869
mod test {
6970
use super::*;
7071

71-
extern crate serde_json;
72+
use serde_json;
7273

7374
#[test]
7475
#[cfg(feature = "alb")]

‎lambda-events/src/event/apigw/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::encodings::Body;
66
use http::{HeaderMap, Method};
77
use query_map::QueryMap;
88
use serde::de::DeserializeOwned;
9-
use serde::ser::Serialize;
9+
use serde::{Deserialize, Serialize};
1010
use serde_json::Value;
1111
use std::collections::HashMap;
1212

@@ -751,7 +751,7 @@ pub struct IamPolicyStatement {
751751
mod test {
752752
use super::*;
753753

754-
extern crate serde_json;
754+
use serde_json;
755755

756756
#[test]
757757
#[cfg(feature = "apigw")]

0 commit comments

Comments
 (0)