mirror of
https://github.com/servo/servo.git
synced 2025-08-04 21:20:23 +01:00
Upgrade to rust-url 1.0 and hyper 0.9
This commit is contained in:
parent
305c283602
commit
7932ab6ac2
76 changed files with 524 additions and 888 deletions
|
@ -2,9 +2,10 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use std::cell::RefCell;
|
||||
use ref_filter_map::ref_filter_map;
|
||||
use std::cell::{RefCell, Ref};
|
||||
use std::rc::Rc;
|
||||
use url::{OpaqueOrigin, Origin as UrlOrigin};
|
||||
use url::Origin as UrlOrigin;
|
||||
use url::{Url, Host};
|
||||
|
||||
/// A representation of an [origin](https://html.spec.whatwg.org/multipage/#origin-2).
|
||||
|
@ -21,9 +22,8 @@ no_jsmanaged_fields!(Origin);
|
|||
impl Origin {
|
||||
/// Create a new origin comprising a unique, opaque identifier.
|
||||
pub fn opaque_identifier() -> Origin {
|
||||
let opaque = UrlOrigin::UID(OpaqueOrigin::new());
|
||||
Origin {
|
||||
inner: Rc::new(RefCell::new(opaque)),
|
||||
inner: Rc::new(RefCell::new(UrlOrigin::new_opaque())),
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -40,18 +40,15 @@ impl Origin {
|
|||
|
||||
/// Does this origin represent a host/scheme/port tuple?
|
||||
pub fn is_scheme_host_port_tuple(&self) -> bool {
|
||||
match *self.inner.borrow() {
|
||||
UrlOrigin::Tuple(..) => true,
|
||||
UrlOrigin::UID(..) => false,
|
||||
}
|
||||
self.inner.borrow().is_tuple()
|
||||
}
|
||||
|
||||
/// Return the host associated with this origin.
|
||||
pub fn host(&self) -> Option<Host> {
|
||||
match *self.inner.borrow() {
|
||||
UrlOrigin::Tuple(_, ref host, _) => Some(host.clone()),
|
||||
UrlOrigin::UID(..) => None,
|
||||
}
|
||||
pub fn host(&self) -> Option<Ref<Host<String>>> {
|
||||
ref_filter_map(self.inner.borrow(), |origin| match *origin {
|
||||
UrlOrigin::Tuple(_, ref host, _) => Some(host),
|
||||
UrlOrigin::Opaque(..) => None,
|
||||
})
|
||||
}
|
||||
|
||||
/// https://html.spec.whatwg.org/multipage/#same-origin
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue