Skip to content

fix(clippy): Fix clippy warnings #965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 26, 2021
Merged

fix(clippy): Fix clippy warnings #965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
11378de
fix: ExpectCt lowercase acronym
jjbayer Mar 26, 2021
64e8281
fix: vec_init_then_push
jjbayer Mar 26, 2021
e7d1a07
fix: Use string literal in asserts
jjbayer Mar 26, 2021
94069da
fix: Suppress upper_case_acronyms warning for parser
jjbayer Mar 26, 2021
647c382
fix: Remove unused variants
jjbayer Mar 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions relay-common/src/constants.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ pub enum EventType {
/// An HPKP violation payload.
Hpkp,
/// An ExpectCT violation payload.
ExpectCT,
ExpectCt,
/// An ExpectStaple violation payload.
ExpectStaple,
/// Performance monitoring transactions carrying spans.
Expand Down Expand Up @@ -68,7 +68,7 @@ impl FromStr for EventType {
"error" => EventType::Error,
"csp" => EventType::Csp,
"hpkp" => EventType::Hpkp,
"expectct" => EventType::ExpectCT,
"expectct" => EventType::ExpectCt,
"expectstaple" => EventType::ExpectStaple,
"transaction" => EventType::Transaction,
_ => return Err(ParseEventTypeError),
Expand All @@ -83,7 +83,7 @@ impl fmt::Display for EventType {
EventType::Error => write!(f, "error"),
EventType::Csp => write!(f, "csp"),
EventType::Hpkp => write!(f, "hpkp"),
EventType::ExpectCT => write!(f, "expectct"),
EventType::ExpectCt => write!(f, "expectct"),
EventType::ExpectStaple => write!(f, "expectstaple"),
EventType::Transaction => write!(f, "transaction"),
}
Expand Down Expand Up @@ -169,7 +169,7 @@ impl From<EventType> for DataCategory {
match ty {
EventType::Default | EventType::Error => Self::Error,
EventType::Transaction => Self::Transaction,
EventType::Csp | EventType::Hpkp | EventType::ExpectCT | EventType::ExpectStaple => {
EventType::Csp | EventType::Hpkp | EventType::ExpectCt | EventType::ExpectStaple => {
Self::Security
}
}
Expand Down
19 changes: 10 additions & 9 deletions relay-general/src/pii/processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,15 +400,16 @@ fn test_basic_stripping() {
Annotated::new(rv)
},
headers: {
let mut rv = Vec::new();
rv.push(Annotated::new((
Annotated::new("Cookie".to_string().into()),
Annotated::new("super secret".to_string().into()),
)));
rv.push(Annotated::new((
Annotated::new("X-Forwarded-For".to_string().into()),
Annotated::new("127.0.0.1".to_string().into()),
)));
let rv = vec![
Annotated::new((
Annotated::new("Cookie".to_string().into()),
Annotated::new("super secret".to_string().into()),
)),
Annotated::new((
Annotated::new("X-Forwarded-For".to_string().into()),
Annotated::new("127.0.0.1".to_string().into()),
)),
];
Annotated::new(Headers(PairList(rv)))
},
..Default::default()
Expand Down
12 changes: 5 additions & 7 deletions relay-general/src/processor/attrs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,13 +677,11 @@ mod tests {
let actual = $state.path().matches_selector(&$selector.parse().unwrap());
assert!(
actual == $expected,
format!(
"Matched {} against {}, expected {:?}, actually {:?}",
$selector,
$state.path(),
$expected,
actual
)
"Matched {} against {}, expected {:?}, actually {:?}",
$selector,
$state.path(),
$expected,
actual
);
}};
}
Expand Down
1 change: 1 addition & 0 deletions relay-general/src/processor/selector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ pub enum InvalidSelectorError {
}

mod parser {
#![allow(clippy::upper_case_acronyms)]
use pest_derive::Parser;

#[derive(Parser)]
Expand Down
5 changes: 2 additions & 3 deletions relay-general/src/protocol/event.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,11 +593,10 @@ fn test_event_roundtrip() {
dist: Annotated::new("mydist".to_string()),
environment: Annotated::new("myenv".to_string()),
tags: {
let mut items = Array::new();
items.push(Annotated::new(TagEntry(
let items = vec![Annotated::new(TagEntry(
Annotated::new("tag".to_string()),
Annotated::new("value".to_string()),
)));
))];
Annotated::new(Tags(items.into()))
},
extra: {
Expand Down
121 changes: 59 additions & 62 deletions relay-general/src/protocol/request.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,23 +509,24 @@ fn test_header_normalization() {
"x-sentry": "version=8"
}"#;

let mut headers = Vec::new();
headers.push(Annotated::new((
Annotated::new("-Other-".to_string().into()),
Annotated::new("header".to_string().into()),
)));
headers.push(Annotated::new((
Annotated::new("Accept".to_string().into()),
Annotated::new("application/json".to_string().into()),
)));
headers.push(Annotated::new((
Annotated::new("WWW-Authenticate".to_string().into()),
Annotated::new("basic".to_string().into()),
)));
headers.push(Annotated::new((
Annotated::new("X-Sentry".to_string().into()),
Annotated::new("version=8".to_string().into()),
)));
let headers = vec![
Annotated::new((
Annotated::new("-Other-".to_string().into()),
Annotated::new("header".to_string().into()),
)),
Annotated::new((
Annotated::new("Accept".to_string().into()),
Annotated::new("application/json".to_string().into()),
)),
Annotated::new((
Annotated::new("WWW-Authenticate".to_string().into()),
Annotated::new("basic".to_string().into()),
)),
Annotated::new((
Annotated::new("X-Sentry".to_string().into()),
Annotated::new("version=8".to_string().into()),
)),
];

let headers = Annotated::new(Headers(PairList(headers)));
assert_eq_dbg!(headers, Annotated::from_json(json).unwrap());
Expand All @@ -537,11 +538,10 @@ fn test_header_from_sequence() {
["accept", "application/json"]
]"#;

let mut headers = Vec::new();
headers.push(Annotated::new((
let headers = vec![Annotated::new((
Annotated::new("Accept".to_string().into()),
Annotated::new("application/json".to_string().into()),
)));
))];

let headers = Annotated::new(Headers(PairList(headers)));
assert_eq_dbg!(headers, Annotated::from_json(json).unwrap());
Expand Down Expand Up @@ -678,19 +678,16 @@ fn test_request_roundtrip() {
)),
fragment: Annotated::new("home".to_string()),
cookies: Annotated::new(Cookies({
let mut map = Vec::new();
map.push(Annotated::new((
PairList(vec![Annotated::new((
Annotated::new("GOOGLE".to_string()),
Annotated::new("1".to_string()),
)));
PairList(map)
))])
})),
headers: Annotated::new(Headers({
let mut headers = Vec::new();
headers.push(Annotated::new((
let headers = vec![Annotated::new((
Annotated::new("Referer".to_string().into()),
Annotated::new("https://google.com/".to_string().into()),
)));
))];
PairList(headers)
})),
env: Annotated::new({
Expand Down Expand Up @@ -798,19 +795,20 @@ fn test_query_invalid() {
fn test_cookies_parsing() {
let json = "\" PHPSESSID=298zf09hf012fh2; csrftoken=u32t4o3tb3gg43; _gat=1;\"";

let mut map = Vec::new();
map.push(Annotated::new((
Annotated::new("PHPSESSID".to_string()),
Annotated::new("298zf09hf012fh2".to_string()),
)));
map.push(Annotated::new((
Annotated::new("csrftoken".to_string()),
Annotated::new("u32t4o3tb3gg43".to_string()),
)));
map.push(Annotated::new((
Annotated::new("_gat".to_string()),
Annotated::new("1".to_string()),
)));
let map = vec![
Annotated::new((
Annotated::new("PHPSESSID".to_string()),
Annotated::new("298zf09hf012fh2".to_string()),
)),
Annotated::new((
Annotated::new("csrftoken".to_string()),
Annotated::new("u32t4o3tb3gg43".to_string()),
)),
Annotated::new((
Annotated::new("_gat".to_string()),
Annotated::new("1".to_string()),
)),
];

let cookies = Annotated::new(Cookies(PairList(map)));
assert_eq_dbg!(cookies, Annotated::from_json(json).unwrap());
Expand All @@ -821,19 +819,17 @@ fn test_cookies_array() {
let input = r#"{"cookies":[["foo","bar"],["invalid", 42],["none",null]]}"#;
let output = r#"{"cookies":[["foo","bar"],["invalid",null],["none",null]],"_meta":{"cookies":{"1":{"1":{"":{"err":[["invalid_data",{"reason":"expected a string"}]],"val":42}}}}}}"#;

let mut map = Vec::new();
map.push(Annotated::new((
Annotated::new("foo".to_string()),
Annotated::new("bar".to_string()),
)));
map.push(Annotated::new((
Annotated::new("invalid".to_string()),
Annotated::from_error(Error::expected("a string"), Some(Value::I64(42))),
)));
map.push(Annotated::new((
Annotated::new("none".to_string()),
Annotated::empty(),
)));
let map = vec![
Annotated::new((
Annotated::new("foo".to_string()),
Annotated::new("bar".to_string()),
)),
Annotated::new((
Annotated::new("invalid".to_string()),
Annotated::from_error(Error::expected("a string"), Some(Value::I64(42))),
)),
Annotated::new((Annotated::new("none".to_string()), Annotated::empty())),
];

let cookies = Annotated::new(Cookies(PairList(map)));
let request = Annotated::new(Request {
Expand All @@ -848,15 +844,16 @@ fn test_cookies_array() {
fn test_cookies_object() {
let json = r#"{"foo":"bar", "invalid": 42}"#;

let mut map = Vec::new();
map.push(Annotated::new((
Annotated::new("foo".to_string()),
Annotated::new("bar".to_string()),
)));
map.push(Annotated::new((
Annotated::new("invalid".to_string()),
Annotated::from_error(Error::expected("a string"), Some(Value::I64(42))),
)));
let map = vec![
Annotated::new((
Annotated::new("foo".to_string()),
Annotated::new("bar".to_string()),
)),
Annotated::new((
Annotated::new("invalid".to_string()),
Annotated::from_error(Error::expected("a string"), Some(Value::I64(42))),
)),
];

let cookies = Annotated::new(Cookies(PairList(map)));
assert_eq_dbg!(cookies, Annotated::from_json(json).unwrap());
Expand Down
87 changes: 44 additions & 43 deletions relay-general/src/protocol/tags.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,28 +70,28 @@ fn test_tags_from_object() {
"bam": null
}"#;

let mut arr = Array::new();
arr.push(Annotated::new(TagEntry(
Annotated::new("bam".to_string()),
Annotated::empty(),
)));
arr.push(Annotated::new(TagEntry(
Annotated::new("blah".to_string()),
Annotated::new("blub".to_string()),
)));
arr.push(Annotated::new(TagEntry(
Annotated::new("bool".to_string()),
Annotated::new("True".to_string()),
)));
arr.push(Annotated::new(TagEntry(
Annotated::new("foo-bar".to_string()),
Annotated::new("baz".to_string()),
)));
arr.push(Annotated::new(TagEntry(
Annotated::new("non-string".to_string()),
Annotated::new("42".to_string()),
)));

let arr = vec![
Annotated::new(TagEntry(
Annotated::new("bam".to_string()),
Annotated::empty(),
)),
Annotated::new(TagEntry(
Annotated::new("blah".to_string()),
Annotated::new("blub".to_string()),
)),
Annotated::new(TagEntry(
Annotated::new("bool".to_string()),
Annotated::new("True".to_string()),
)),
Annotated::new(TagEntry(
Annotated::new("foo-bar".to_string()),
Annotated::new("baz".to_string()),
)),
Annotated::new(TagEntry(
Annotated::new("non-string".to_string()),
Annotated::new("42".to_string()),
)),
];
let tags = Annotated::new(Tags(arr.into()));
assert_eq_dbg!(tags, Annotated::from_json(json).unwrap());
}
Expand Down Expand Up @@ -150,27 +150,28 @@ fn test_tags_from_array() {
]
}"#;

let mut arr = Array::new();
arr.push(Annotated::new(TagEntry(
Annotated::new("bool".to_string()),
Annotated::new("True".to_string()),
)));
arr.push(Annotated::new(TagEntry(
Annotated::new("foo-bar".to_string()),
Annotated::new("baz".to_string()),
)));
arr.push(Annotated::new(TagEntry(
Annotated::new("23".to_string()),
Annotated::new("42".to_string()),
)));
arr.push(Annotated::new(TagEntry(
Annotated::new("blah".to_string()),
Annotated::new("blub".to_string()),
)));
arr.push(Annotated::new(TagEntry(
Annotated::new("bam".to_string()),
Annotated::empty(),
)));
let arr = vec![
Annotated::new(TagEntry(
Annotated::new("bool".to_string()),
Annotated::new("True".to_string()),
)),
Annotated::new(TagEntry(
Annotated::new("foo-bar".to_string()),
Annotated::new("baz".to_string()),
)),
Annotated::new(TagEntry(
Annotated::new("23".to_string()),
Annotated::new("42".to_string()),
)),
Annotated::new(TagEntry(
Annotated::new("blah".to_string()),
Annotated::new("blub".to_string()),
)),
Annotated::new(TagEntry(
Annotated::new("bam".to_string()),
Annotated::empty(),
)),
];

let tags = Annotated::new(Tags(arr.into()));
let event = Annotated::new(Event {
Expand Down
2 changes: 1 addition & 1 deletion relay-general/src/store/normalize.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ impl<'a> NormalizeProcessor<'a> {
} else if event.hpkp.value().is_some() {
EventType::Hpkp
} else if event.expectct.value().is_some() {
EventType::ExpectCT
EventType::ExpectCt
} else if event.expectstaple.value().is_some() {
EventType::ExpectStaple
} else {
Expand Down
Loading