Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 15:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Auto merge of #25898 - jdm:rustup, r=asajeffrey"

Browse source 
This reverts commit ea8aed1ba9, reversing
changes made to 3749eb5397.
This commit is contained in:
Josh Matthews 2020-03-06 00:06:15 -05:00
parent ea8aed1ba9
commit a29f4a9afe
7 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/dom/baseaudiocontext.rs
View file

@ -331,7 +331,7 @@ impl BaseAudioContextMethods for BaseAudioContext {
self.listener.or_init(|| AudioListener::new(&window, self)) self.listener.or_init(|| AudioListener::new(&window, self))
} }
// https://webaudio.github.io/web-audio-api/#dom-baseaudiocontext-onstatechange /// https://webaudio.github.io/web-audio-api/#dom-baseaudiocontext-onstatechange
event_handler!(statechange, GetOnstatechange, SetOnstatechange); event_handler!(statechange, GetOnstatechange, SetOnstatechange);
/// https://webaudio.github.io/web-audio-api/#dom-baseaudiocontext-createoscillator /// https://webaudio.github.io/web-audio-api/#dom-baseaudiocontext-createoscillator

4
components/script/dom/broadcastchannel.rs
View file

@ -98,9 +98,9 @@ impl BroadcastChannelMethods for BroadcastChannel {
self.closed.set(true); self.closed.set(true);
} }
// <https://html.spec.whatwg.org/multipage/#handler-broadcastchannel-onmessageerror> /// <https://html.spec.whatwg.org/multipage/#handler-broadcastchannel-onmessageerror>
event_handler!(messageerror, GetOnmessageerror, SetOnmessageerror); event_handler!(messageerror, GetOnmessageerror, SetOnmessageerror);
// <https://html.spec.whatwg.org/multipage/#handler-broadcastchannel-onmessage> /// <https://html.spec.whatwg.org/multipage/#handler-broadcastchannel-onmessage>
event_handler!(message, GetOnmessage, SetOnmessage); event_handler!(message, GetOnmessage, SetOnmessage);
} }

2
components/script/dom/messageport.rs
View file

@ -338,6 +338,6 @@ impl MessagePortMethods for MessagePort {
self.global().start_message_port(self.message_port_id()); self.global().start_message_port(self.message_port_id());
} }
// <https://html.spec.whatwg.org/multipage/#handler-messageport-onmessageerror> /// <https://html.spec.whatwg.org/multipage/#handler-messageport-onmessageerror>
event_handler!(messageerror, GetOnmessageerror, SetOnmessageerror); event_handler!(messageerror, GetOnmessageerror, SetOnmessageerror);
} }

16
components/script/dom/rtcpeerconnection.rs
View file

@ -55,8 +55,8 @@ pub struct RTCPeerConnection {
#[ignore_malloc_size_of = "defined in servo-media"] #[ignore_malloc_size_of = "defined in servo-media"]
controller: DomRefCell<Option<WebRtcController>>, controller: DomRefCell<Option<WebRtcController>>,
closed: Cell<bool>, closed: Cell<bool>,
// Helps track state changes between the time createOffer/createAnswer /// Helps track state changes between the time createOffer/createAnswer
// is called and resolved /// is called and resolved
offer_answer_generation: Cell<u32>, offer_answer_generation: Cell<u32>,
#[ignore_malloc_size_of = "promises are hard"] #[ignore_malloc_size_of = "promises are hard"]
offer_promises: DomRefCell<Vec<Rc<Promise>>>, offer_promises: DomRefCell<Vec<Rc<Promise>>>,
@ -419,34 +419,34 @@ impl RTCPeerConnection {
} }
impl RTCPeerConnectionMethods for RTCPeerConnection { impl RTCPeerConnectionMethods for RTCPeerConnection {
// https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-icecandidate /// https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-icecandidate
event_handler!(icecandidate, GetOnicecandidate, SetOnicecandidate); event_handler!(icecandidate, GetOnicecandidate, SetOnicecandidate);
// https://www.w3.org/TR/webrtc/#dom-rtcpeerconnection-ontrack /// https://www.w3.org/TR/webrtc/#dom-rtcpeerconnection-ontrack
event_handler!(track, GetOntrack, SetOntrack); event_handler!(track, GetOntrack, SetOntrack);
// https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-iceconnectionstatechange /// https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-iceconnectionstatechange
event_handler!( event_handler!(
iceconnectionstatechange, iceconnectionstatechange,
GetOniceconnectionstatechange, GetOniceconnectionstatechange,
SetOniceconnectionstatechange SetOniceconnectionstatechange
); );
// https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-icegatheringstatechange /// https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-icegatheringstatechange
event_handler!( event_handler!(
icegatheringstatechange, icegatheringstatechange,
GetOnicegatheringstatechange, GetOnicegatheringstatechange,
SetOnicegatheringstatechange SetOnicegatheringstatechange
); );
// https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-onnegotiationneeded /// https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-onnegotiationneeded
event_handler!( event_handler!(
negotiationneeded, negotiationneeded,
GetOnnegotiationneeded, GetOnnegotiationneeded,
SetOnnegotiationneeded SetOnnegotiationneeded
); );
// https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-signalingstatechange /// https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-signalingstatechange
event_handler!( event_handler!(
signalingstatechange, signalingstatechange,
GetOnsignalingstatechange, GetOnsignalingstatechange,

18
components/script/dom/xrsession.rs
View file

@ -465,35 +465,35 @@ impl XRSession {
} }
impl XRSessionMethods for XRSession { impl XRSessionMethods for XRSession {
// https://immersive-web.github.io/webxr/#eventdef-xrsession-end /// https://immersive-web.github.io/webxr/#eventdef-xrsession-end
event_handler!(end, GetOnend, SetOnend); event_handler!(end, GetOnend, SetOnend);
// https://immersive-web.github.io/webxr/#eventdef-xrsession-select /// https://immersive-web.github.io/webxr/#eventdef-xrsession-select
event_handler!(select, GetOnselect, SetOnselect); event_handler!(select, GetOnselect, SetOnselect);
// https://immersive-web.github.io/webxr/#eventdef-xrsession-selectstart /// https://immersive-web.github.io/webxr/#eventdef-xrsession-selectstart
event_handler!(selectstart, GetOnselectstart, SetOnselectstart); event_handler!(selectstart, GetOnselectstart, SetOnselectstart);
// https://immersive-web.github.io/webxr/#eventdef-xrsession-selectend /// https://immersive-web.github.io/webxr/#eventdef-xrsession-selectend
event_handler!(selectend, GetOnselectend, SetOnselectend); event_handler!(selectend, GetOnselectend, SetOnselectend);
// https://immersive-web.github.io/webxr/#eventdef-xrsession-squeeze /// https://immersive-web.github.io/webxr/#eventdef-xrsession-squeeze
event_handler!(squeeze, GetOnsqueeze, SetOnsqueeze); event_handler!(squeeze, GetOnsqueeze, SetOnsqueeze);
// https://immersive-web.github.io/webxr/#eventdef-xrsession-squeezestart /// https://immersive-web.github.io/webxr/#eventdef-xrsession-squeezestart
event_handler!(squeezestart, GetOnsqueezestart, SetOnsqueezestart); event_handler!(squeezestart, GetOnsqueezestart, SetOnsqueezestart);
// https://immersive-web.github.io/webxr/#eventdef-xrsession-squeezeend /// https://immersive-web.github.io/webxr/#eventdef-xrsession-squeezeend
event_handler!(squeezeend, GetOnsqueezeend, SetOnsqueezeend); event_handler!(squeezeend, GetOnsqueezeend, SetOnsqueezeend);
// https://immersive-web.github.io/webxr/#eventdef-xrsession-visibilitychange /// https://immersive-web.github.io/webxr/#eventdef-xrsession-visibilitychange
event_handler!( event_handler!(
visibilitychange, visibilitychange,
GetOnvisibilitychange, GetOnvisibilitychange,
SetOnvisibilitychange SetOnvisibilitychange
); );
// https://immersive-web.github.io/webxr/#eventdef-xrsession-inputsourceschange /// https://immersive-web.github.io/webxr/#eventdef-xrsession-inputsourceschange
event_handler!( event_handler!(
inputsourceschange, inputsourceschange,
GetOninputsourceschange, GetOninputsourceschange,

4
components/script_plugins/lib.rs
View file

@ -20,15 +20,14 @@
#![cfg(feature = "unrooted_must_root_lint")] #![cfg(feature = "unrooted_must_root_lint")]
extern crate rustc; extern crate rustc;
extern crate rustc_ast;
extern crate rustc_driver; extern crate rustc_driver;
extern crate rustc_hir; extern crate rustc_hir;
extern crate rustc_lint; extern crate rustc_lint;
extern crate rustc_session; extern crate rustc_session;
extern crate rustc_span; extern crate rustc_span;
extern crate syntax;
use rustc::ty; use rustc::ty;
use rustc_ast::ast::{AttrKind, Attribute};
use rustc_driver::plugin::Registry; use rustc_driver::plugin::Registry;
use rustc_hir::def_id::DefId; use rustc_hir::def_id::DefId;
use rustc_hir::intravisit as visit; use rustc_hir::intravisit as visit;
@ -39,6 +38,7 @@ use rustc_span::source_map;
use rustc_span::source_map::{ExpnKind, MacroKind, Span}; use rustc_span::source_map::{ExpnKind, MacroKind, Span};
use rustc_span::symbol::sym; use rustc_span::symbol::sym;
use rustc_span::symbol::Symbol; use rustc_span::symbol::Symbol;
use syntax::ast::{AttrKind, Attribute};
#[allow(deprecated)] #[allow(deprecated)]
#[plugin_registrar] #[plugin_registrar]

2
rust-toolchain
View file

@ -1 +1 @@
nightly-2020-03-04 nightly-2020-02-14