Skip to content

Commit 255aaa9

Browse files
author
bors-servo
authored
Auto merge of #526 - dekellum:fix-redundant-field-names-lint, r=SimonSapin
Remove redundant field names in struct init Besides the obvious minimization, these changes avoid lints of the following form from clippy: ``` txt warning: redundant field names in struct initialization --> src/form_urlencoded.rs:30:13 | 30 | Parse { input: input } | ^^^^^^^^^^^^ help: replace it with: `input` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#redundant_field_names ``` <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-url/526) <!-- Reviewable:end -->
2 parents 0ab166e + cce2d32 commit 255aaa9

File tree

4 files changed

+56
-56
lines changed

4 files changed

+56
-56
lines changed

‎src/form_urlencoded.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use std::str;
2727
/// converted to `[("#first", "%try%")]`.
2828
#[inline]
2929
pub fn parse(input: &[u8]) -> Parse {
30-
Parse { input: input }
30+
Parse { input }
3131
}
3232
/// The return type of `parse()`.
3333
#[derive(Copy, Clone)]
@@ -233,7 +233,7 @@ impl<'a, T: Target> Serializer<'a, T> {
233233
&target.as_mut_string()[start_position..]; // Panic if out of bounds
234234
Serializer {
235235
target: Some(target),
236-
start_position: start_position,
236+
start_position,
237237
encoding: None,
238238
}
239239
}

‎src/lib.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1282,7 +1282,7 @@ impl Url {
12821282

12831283
let query = UrlQuery {
12841284
url: Some(self),
1285-
fragment: fragment,
1285+
fragment,
12861286
};
12871287
form_urlencoded::Serializer::for_suffix(query, query_start + "?".len())
12881288
}
@@ -1984,12 +1984,12 @@ impl Url {
19841984
let host_start = serialization.len() as u32;
19851985
let (host_end, host) = path_to_file_url_segments(path.as_ref(), &mut serialization)?;
19861986
Ok(Url {
1987-
serialization: serialization,
1987+
serialization,
19881988
scheme_end: "file".len() as u32,
19891989
username_end: host_start,
1990-
host_start: host_start,
1991-
host_end: host_end,
1992-
host: host,
1990+
host_start,
1991+
host_end,
1992+
host,
19931993
port: None,
19941994
path_start: host_end,
19951995
query_start: None,
@@ -2091,16 +2091,16 @@ impl Url {
20912091
fragment_start,
20922092
) = Deserialize::deserialize(deserializer)?;
20932093
let url = Url {
2094-
serialization: serialization,
2095-
scheme_end: scheme_end,
2096-
username_end: username_end,
2097-
host_start: host_start,
2098-
host_end: host_end,
2099-
host: host,
2100-
port: port,
2101-
path_start: path_start,
2102-
query_start: query_start,
2103-
fragment_start: fragment_start,
2094+
serialization,
2095+
scheme_end,
2096+
username_end,
2097+
host_start,
2098+
host_end,
2099+
host,
2100+
port,
2101+
path_start,
2102+
query_start,
2103+
fragment_start,
21042104
};
21052105
if cfg!(debug_assertions) {
21062106
url.check_invariants().map_err(|reason| {

‎src/parser.rs

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ impl<'a> Parser<'a> {
323323

324324
pub fn for_setter(serialization: String) -> Parser<'a> {
325325
Parser {
326-
serialization: serialization,
326+
serialization,
327327
base_url: None,
328328
query_encoding_override: None,
329329
violation_fn: None,
@@ -496,13 +496,13 @@ impl<'a> Parser<'a> {
496496
let path_start = "file://".len() as u32;
497497
Ok(Url {
498498
serialization: self.serialization,
499-
scheme_end: scheme_end,
499+
scheme_end,
500500
username_end: path_start,
501501
host_start: path_start,
502502
host_end: path_start,
503503
host: HostInternal::None,
504504
port: None,
505-
path_start: path_start,
505+
path_start,
506506
query_start: None,
507507
fragment_start: None,
508508
})
@@ -520,8 +520,8 @@ impl<'a> Parser<'a> {
520520
self.parse_query_and_fragment(scheme_type, base_url.scheme_end, input)?;
521521
Ok(Url {
522522
serialization: self.serialization,
523-
query_start: query_start,
524-
fragment_start: fragment_start,
523+
query_start,
524+
fragment_start,
525525
..*base_url
526526
})
527527
} else {
@@ -532,15 +532,15 @@ impl<'a> Parser<'a> {
532532
self.parse_query_and_fragment(scheme_type, scheme_end, input)?;
533533
Ok(Url {
534534
serialization: self.serialization,
535-
scheme_end: scheme_end,
535+
scheme_end,
536536
username_end: path_start,
537537
host_start: path_start,
538538
host_end: path_start,
539539
host: HostInternal::None,
540540
port: None,
541-
path_start: path_start,
542-
query_start: query_start,
543-
fragment_start: fragment_start,
541+
path_start,
542+
query_start,
543+
fragment_start,
544544
})
545545
}
546546
}
@@ -556,13 +556,13 @@ impl<'a> Parser<'a> {
556556
self.parse_fragment(input_after_first_char);
557557
Ok(Url {
558558
serialization: self.serialization,
559-
scheme_end: scheme_end,
559+
scheme_end,
560560
username_end: path_start,
561561
host_start: path_start,
562562
host_end: path_start,
563563
host: HostInternal::None,
564564
port: None,
565-
path_start: path_start,
565+
path_start,
566566
query_start: None,
567567
fragment_start: Some(fragment_start),
568568
})
@@ -601,15 +601,15 @@ impl<'a> Parser<'a> {
601601
self.parse_query_and_fragment(scheme_type, scheme_end, remaining)?;
602602
Ok(Url {
603603
serialization: self.serialization,
604-
scheme_end: scheme_end,
604+
scheme_end,
605605
username_end: host_start,
606-
host_start: host_start,
607-
host_end: host_end,
608-
host: host,
606+
host_start,
607+
host_end,
608+
host,
609609
port: None,
610610
path_start: host_end,
611-
query_start: query_start,
612-
fragment_start: fragment_start,
611+
query_start,
612+
fragment_start,
613613
})
614614
} else {
615615
self.serialization.push_str("file:///");
@@ -634,15 +634,15 @@ impl<'a> Parser<'a> {
634634
let path_start = path_start as u32;
635635
Ok(Url {
636636
serialization: self.serialization,
637-
scheme_end: scheme_end,
637+
scheme_end,
638638
username_end: path_start,
639639
host_start: path_start,
640640
host_end: path_start,
641641
host: HostInternal::None,
642642
port: None,
643-
path_start: path_start,
644-
query_start: query_start,
645-
fragment_start: fragment_start,
643+
path_start,
644+
query_start,
645+
fragment_start,
646646
})
647647
}
648648
}
@@ -685,15 +685,15 @@ impl<'a> Parser<'a> {
685685
let path_start = path_start as u32;
686686
Ok(Url {
687687
serialization: self.serialization,
688-
scheme_end: scheme_end,
688+
scheme_end,
689689
username_end: path_start,
690690
host_start: path_start,
691691
host_end: path_start,
692692
host: HostInternal::None,
693693
port: None,
694-
path_start: path_start,
695-
query_start: query_start,
696-
fragment_start: fragment_start,
694+
path_start,
695+
query_start,
696+
fragment_start,
697697
})
698698
}
699699
}
@@ -734,8 +734,8 @@ impl<'a> Parser<'a> {
734734
self.parse_query_and_fragment(scheme_type, base_url.scheme_end, input)?;
735735
Ok(Url {
736736
serialization: self.serialization,
737-
query_start: query_start,
738-
fragment_start: fragment_start,
737+
query_start,
738+
fragment_start,
739739
..*base_url
740740
})
741741
}
@@ -1211,15 +1211,15 @@ impl<'a> Parser<'a> {
12111211
self.parse_query_and_fragment(scheme_type, scheme_end, remaining)?;
12121212
Ok(Url {
12131213
serialization: self.serialization,
1214-
scheme_end: scheme_end,
1215-
username_end: username_end,
1216-
host_start: host_start,
1217-
host_end: host_end,
1218-
host: host,
1219-
port: port,
1220-
path_start: path_start,
1221-
query_start: query_start,
1222-
fragment_start: fragment_start,
1214+
scheme_end,
1215+
username_end,
1216+
host_start,
1217+
host_end,
1218+
host,
1219+
port,
1220+
path_start,
1221+
query_start,
1222+
fragment_start,
12231223
})
12241224
}
12251225

‎src/path_segments.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ pub fn new(url: &mut Url) -> PathSegmentsMut {
4848
debug_assert!(url.byte_at(url.path_start) == b'/');
4949
PathSegmentsMut {
5050
after_first_slash: url.path_start as usize + "/".len(),
51-
url: url,
52-
old_after_path_position: old_after_path_position,
53-
after_path: after_path,
51+
url,
52+
old_after_path_position,
53+
after_path,
5454
}
5555
}
5656

0 commit comments

Comments
 (0)