Skip to content
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

Jump to bottom

Remove redundant field names in struct init #526

Merged
merged 1 commit into from Jul 23, 2019
Merged

Remove redundant field names in struct init #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/form_urlencoded.rs
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@ use std::str;
/// converted to `[("#first", "%try%")]`.
#[inline]
pub fn parse(input: &[u8]) -> Parse {
Parse { input: input }
Parse { input }
}
/// The return type of `parse()`.
#[derive(Copy, Clone)]
Expand Down Expand Up @@ -233,7 +233,7 @@ impl<'a, T: Target> Serializer<'a, T> {
&target.as_mut_string()[start_position..]; // Panic if out of bounds
Serializer {
target: Some(target),
start_position: start_position,
start_position,
encoding: None,
}
}
Expand Down
30 changes: 15 additions & 15 deletions src/lib.rs
View file
Open in desktop
Expand Up @@ -1282,7 +1282,7 @@ impl Url {

let query = UrlQuery {
url: Some(self),
fragment: fragment,
fragment,
};
form_urlencoded::Serializer::for_suffix(query, query_start + "?".len())
}
Expand Down Expand Up @@ -1984,12 +1984,12 @@ impl Url {
let host_start = serialization.len() as u32;
let (host_end, host) = path_to_file_url_segments(path.as_ref(), &mut serialization)?;
Ok(Url {
serialization: serialization,
serialization,
scheme_end: "file".len() as u32,
username_end: host_start,
host_start: host_start,
host_end: host_end,
host: host,
host_start,
host_end,
host,
port: None,
path_start: host_end,
query_start: None,
Expand Down Expand Up @@ -2091,16 +2091,16 @@ impl Url {
fragment_start,
) = Deserialize::deserialize(deserializer)?;
let url = Url {
serialization: serialization,
scheme_end: scheme_end,
username_end: username_end,
host_start: host_start,
host_end: host_end,
host: host,
port: port,
path_start: path_start,
query_start: query_start,
fragment_start: fragment_start,
serialization,
scheme_end,
username_end,
host_start,
host_end,
host,
port,
path_start,
query_start,
fragment_start,
};
if cfg!(debug_assertions) {
url.check_invariants().map_err(|reason| {
Expand Down
72 changes: 36 additions & 36 deletions src/parser.rs
View file
Open in desktop
Expand Up @@ -323,7 +323,7 @@ impl<'a> Parser<'a> {

pub fn for_setter(serialization: String) -> Parser<'a> {
Parser {
serialization: serialization,
serialization,
base_url: None,
query_encoding_override: None,
violation_fn: None,
Expand Down Expand Up @@ -496,13 +496,13 @@ impl<'a> Parser<'a> {
let path_start = "file://".len() as u32;
Ok(Url {
serialization: self.serialization,
scheme_end: scheme_end,
scheme_end,
username_end: path_start,
host_start: path_start,
host_end: path_start,
host: HostInternal::None,
port: None,
path_start: path_start,
path_start,
query_start: None,
fragment_start: None,
})
Expand All @@ -520,8 +520,8 @@ impl<'a> Parser<'a> {
self.parse_query_and_fragment(scheme_type, base_url.scheme_end, input)?;
Ok(Url {
serialization: self.serialization,
query_start: query_start,
fragment_start: fragment_start,
query_start,
fragment_start,
..*base_url
})
} else {
Expand All @@ -532,15 +532,15 @@ impl<'a> Parser<'a> {
self.parse_query_and_fragment(scheme_type, scheme_end, input)?;
Ok(Url {
serialization: self.serialization,
scheme_end: scheme_end,
scheme_end,
username_end: path_start,
host_start: path_start,
host_end: path_start,
host: HostInternal::None,
port: None,
path_start: path_start,
query_start: query_start,
fragment_start: fragment_start,
path_start,
query_start,
fragment_start,
})
}
}
Expand All @@ -556,13 +556,13 @@ impl<'a> Parser<'a> {
self.parse_fragment(input_after_first_char);
Ok(Url {
serialization: self.serialization,
scheme_end: scheme_end,
scheme_end,
username_end: path_start,
host_start: path_start,
host_end: path_start,
host: HostInternal::None,
port: None,
path_start: path_start,
path_start,
query_start: None,
fragment_start: Some(fragment_start),
})
Expand Down Expand Up @@ -601,15 +601,15 @@ impl<'a> Parser<'a> {
self.parse_query_and_fragment(scheme_type, scheme_end, remaining)?;
Ok(Url {
serialization: self.serialization,
scheme_end: scheme_end,
scheme_end,
username_end: host_start,
host_start: host_start,
host_end: host_end,
host: host,
host_start,
host_end,
host,
port: None,
path_start: host_end,
query_start: query_start,
fragment_start: fragment_start,
query_start,
fragment_start,
})
} else {
self.serialization.push_str("file:///");
Expand All @@ -634,15 +634,15 @@ impl<'a> Parser<'a> {
let path_start = path_start as u32;
Ok(Url {
serialization: self.serialization,
scheme_end: scheme_end,
scheme_end,
username_end: path_start,
host_start: path_start,
host_end: path_start,
host: HostInternal::None,
port: None,
path_start: path_start,
query_start: query_start,
fragment_start: fragment_start,
path_start,
query_start,
fragment_start,
})
}
}
Expand Down Expand Up @@ -685,15 +685,15 @@ impl<'a> Parser<'a> {
let path_start = path_start as u32;
Ok(Url {
serialization: self.serialization,
scheme_end: scheme_end,
scheme_end,
username_end: path_start,
host_start: path_start,
host_end: path_start,
host: HostInternal::None,
port: None,
path_start: path_start,
query_start: query_start,
fragment_start: fragment_start,
path_start,
query_start,
fragment_start,
})
}
}
Expand Down Expand Up @@ -734,8 +734,8 @@ impl<'a> Parser<'a> {
self.parse_query_and_fragment(scheme_type, base_url.scheme_end, input)?;
Ok(Url {
serialization: self.serialization,
query_start: query_start,
fragment_start: fragment_start,
query_start,
fragment_start,
..*base_url
})
}
Expand Down Expand Up @@ -1211,15 +1211,15 @@ impl<'a> Parser<'a> {
self.parse_query_and_fragment(scheme_type, scheme_end, remaining)?;
Ok(Url {
serialization: self.serialization,
scheme_end: scheme_end,
username_end: username_end,
host_start: host_start,
host_end: host_end,
host: host,
port: port,
path_start: path_start,
query_start: query_start,
fragment_start: fragment_start,
scheme_end,
username_end,
host_start,
host_end,
host,
port,
path_start,
query_start,
fragment_start,
})
}

Expand Down
6 changes: 3 additions & 3 deletions src/path_segments.rs
View file
Open in desktop
Expand Up @@ -48,9 +48,9 @@ pub fn new(url: &mut Url) -> PathSegmentsMut {
debug_assert!(url.byte_at(url.path_start) == b'/');
PathSegmentsMut {
after_first_slash: url.path_start as usize + "/".len(),
url: url,
old_after_path_position: old_after_path_position,
after_path: after_path,
url,
old_after_path_position,
after_path,
}
}

Expand Down