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.

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

New IntoUrl trait #177

Closed
wants to merge 40 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
918352b
Make it possible to define new encode sets in other crates.
SimonSapin Dec 4, 2015
db9de70
Define encode sets based on another set.
SimonSapin Dec 4, 2015
691aec2
Remove the HTTP_VALUE encode set. It can be defined in another crate.
SimonSapin Dec 4, 2015
d140dc8
Rewrite ALL THE THINGS!
SimonSapin Dec 9, 2015
9edff44
Remove the dependency on uuid.
SimonSapin Feb 8, 2016
576bd2a
Add URL slicing/indexing by component.
SimonSapin Feb 8, 2016
7b11445
Add stubs with partial implementation for the WebIDL API.
SimonSapin Feb 8, 2016
c617ed1
Shorter Cargo.toml syntax.
SimonSapin Feb 8, 2016
22cf104
serde_serialization -> serde
SimonSapin Feb 8, 2016
0cb3f2b
Make rustc-serialize an optional dependency.
SimonSapin Feb 8, 2016
61a8185
Rename *{Start,End} posititons to {Before,After}*
SimonSapin Feb 9, 2016
813d270
Replace from_hex() with char::to_digit(16)
SimonSapin Feb 9, 2016
0b5ffb4
Make percent-decoding an iterator.
SimonSapin Feb 9, 2016
244d999
Make percent-encoding an iterator.
SimonSapin Feb 9, 2016
7b33b33
Add percent-encoding convienience wrappers.
SimonSapin Feb 9, 2016
ca9f87d
Update tests from https://github.com/w3c/web-platform-tests/blob/mast…
SimonSapin Feb 10, 2016
7a0e467
Remove Url::has_host
SimonSapin Feb 11, 2016
9a8d394
Remove unused ParseError variants
SimonSapin Feb 12, 2016
903f1d2
Make context a field of Parser.
SimonSapin Feb 11, 2016
a9b4e71
Remove the redundant is_relative field.
SimonSapin Feb 15, 2016
ded48a2
Add Url::domain and Url::ip_address
SimonSapin Feb 15, 2016
d3dba86
Implement ToSocketAddrs
SimonSapin Feb 15, 2016
088c3ed
Remove Url::ip_address for now
SimonSapin Feb 15, 2016
641f940
Add Unicode and ASCII serializations of origins
SimonSapin Feb 16, 2016
946d950
Test WebIdl::origin
SimonSapin Feb 16, 2016
4dff876
Add a fragment setter
SimonSapin Feb 11, 2016
0ae07ed
Add a query setter.
SimonSapin Feb 12, 2016
542feb0
Make Url::parse_with usable. (EncodingOverride is private.)
SimonSapin Feb 19, 2016
dd0436a
Add Origin::is_tuple
SimonSapin Feb 19, 2016
f7e0d7c
More consistent checks for URL with authority or path-only.
SimonSapin Feb 19, 2016
fd16b74
Re-export OpaqueOrigin. It is exposed publicly through Origin::Opaque
SimonSapin Feb 19, 2016
f1bdaa6
Add a scheme setter
SimonSapin Feb 19, 2016
158145f
Add host setters.
SimonSapin Feb 19, 2016
b1b0916
More setters
SimonSapin Feb 23, 2016
47e31ef
Add a path setter
SimonSapin Feb 26, 2016
e7a4dc0
Username and passowrd setters
SimonSapin Feb 26, 2016
5b26c89
More WebIDL implementations.
SimonSapin Feb 26, 2016
bf0f670
Port setters
SimonSapin Mar 1, 2016
b89d7d7
All setters.
SimonSapin Mar 1, 2016
3f9dcd4
New IntoUrl trait
cmbrandenburg Mar 4, 2016
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Add host setters.

  • Loading branch information
SimonSapin committed Mar 3, 2016
commit 158145f7e84ad3d0ea84c78511f4e68a96e8288d
@@ -130,11 +130,11 @@ use host::HostInternal;
use parser::{Parser, Context};
use percent_encoding::{PATH_SEGMENT_ENCODE_SET, percent_encode, percent_decode};
use std::cmp;
use std::fmt;
use std::fmt::{self, Write};
use std::hash;
use std::io;
use std::mem;
use std::net::ToSocketAddrs;
use std::net::{ToSocketAddrs, Ipv4Addr, Ipv6Addr};
use std::ops::{Range, RangeFrom, RangeTo};
use std::path::{Path, PathBuf};
use std::str;
@@ -474,6 +474,100 @@ impl Url {
}
}

/// Change this URL’s host.
///
/// If this URL is non-relative, do nothing and return `Err`.
///
/// Removing the host (calling this with `None`)
/// will also remove any username, password, and port number.
pub fn set_host(&mut self, host: Option<&str>) -> Result<(), ()> {
if self.non_relative() {
return Err(())
}

if let Some(host) = host {
self.set_host_internal(try!(Host::parse(host).map_err(|_| ())))
} else if self.has_host() {
// Not debug_assert! since this proves that `unsafe` below is OK:
assert!(self.byte_at(self.scheme_end) == b':');
assert!(self.byte_at(self.path_start) == b'/');
let new_path_start = self.scheme_end + 1;
unsafe {
self.serialization.as_mut_vec()
.drain(self.path_start as usize..new_path_start as usize);
}
let offset = self.path_start - new_path_start;
self.path_start = new_path_start;
self.username_end = new_path_start;
self.host_start = new_path_start;
self.host_end = new_path_start;
self.port = None;
if let Some(ref mut index) = self.query_start { *index -= offset }
if let Some(ref mut index) = self.fragment_start { *index -= offset }
}
Ok(())
}

fn set_host_internal(&mut self, host: Host<String>) {
let after_host = self.slice(self.host_end..).to_owned();
self.serialization.truncate(self.host_start as usize);
if !self.has_host() {
debug_assert!(self.slice(self.scheme_end..self.host_start) == ":");
debug_assert!(self.username_end == self.host_start);
self.serialization.push('/');
self.serialization.push('/');
self.username_end += 2;
self.host_start += 2;
}
let old_host_end = self.host_end;
write!(&mut self.serialization, "{}", host).unwrap();
let new_host_end = to_u32(self.serialization.len()).unwrap();
self.serialization.push_str(&after_host);

self.host = match host {
Host::Domain(_) => HostInternal::Domain,
Host::Ipv4(address) => HostInternal::Ipv4(address),
Host::Ipv6(address) => HostInternal::Ipv6(address),
};
self.host_end = new_host_end;
let adjust = |index: &mut u32| {
*index -= old_host_end;
*index += new_host_end;
};
adjust(&mut self.host_end);
adjust(&mut self.path_start);
if let Some(ref mut index) = self.query_start { adjust(index) }
if let Some(ref mut index) = self.fragment_start { adjust(index) }
}

/// Change this URL’s host to the given IPv4 address.
///
/// If this URL is non-relative, do nothing and return `Err`.
///
/// Compared to `Url::set_host`, this skips the host parser.
pub fn set_ipv4_host(&mut self, address: Ipv4Addr) -> Result<(), ()> {
if self.non_relative() {
return Err(())
}

self.set_host_internal(Host::Ipv4(address));
Ok(())
}

/// Change this URL’s host to the given IPv6 address.
///
/// If this URL is non-relative, do nothing and return `Err`.
///
/// Compared to `Url::set_host`, this skips the host parser.
pub fn set_ipv6_host(&mut self, address: Ipv6Addr) -> Result<(), ()> {
if self.non_relative() {
return Err(())
}

self.set_host_internal(Host::Ipv6(address));
Ok(())
}

/// Change this URL’s scheme.
///
/// Do nothing and return `Err` if:
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.