Fix build errors after rebase

servo · Jul 13, 2018 · 2a6e95a · 2a6e95a
1 parent 401b720
commit 2a6e95a
Show file tree

Hide file tree

Showing 8 changed files with 396 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/fallible/Cargo.toml b/components/fallible/Cargo.toml
@@ -10,7 +10,7 @@ name = "fallible"
 path = "lib.rs"
 
 [dependencies]
-smallvec = "0.6"
+smallvec = "0.6.2"
 hashglobe = { path = "../hashglobe" }
 
 # This crate effectively does nothing except if the `known_system_malloc`

diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml
@@ -35,7 +35,7 @@ serde = "1.0"
 servo_arc = {path = "../servo_arc"}
 servo_atoms = {path = "../atoms"}
 servo_url = {path = "../url"}
-smallvec = "0.6"
+smallvec = "0.6.2"
 style = {path = "../style"}
 time = "0.1.12"
 unicode-bidi = {version = "0.3", features = ["with_serde"]}

diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
@@ -42,7 +42,7 @@ servo_geometry = {path = "../geometry"}
 serde_json = "1.0"
 servo_config = {path = "../config"}
 servo_url = {path = "../url"}
-smallvec = "0.6"
+smallvec = "0.6.2"
 style = {path = "../style", features = ["servo"]}
 style_traits = {path = "../style_traits"}
 unicode-bidi = {version = "0.3", features = ["with_serde"]}

diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
@@ -90,7 +90,7 @@ servo_geometry = {path = "../geometry" }
 servo-media = {git = "https://github.com/servo/media"}
 servo_rand = {path = "../rand"}
 servo_url = {path = "../url"}
-smallvec = "0.6"
+smallvec = "0.6.2"
 style = {path = "../style", features = ["servo"]}
 style_traits = {path = "../style_traits"}
 swapper = "0.1"

diff --git a/components/script/dom/baseaudiocontext.rs b/components/script/dom/baseaudiocontext.rs
@@ -43,7 +43,7 @@ use std::collections::{HashMap, VecDeque};
 use std::mem;
 use std::rc::Rc;
 use std::sync::{Arc, Mutex};
-use task_source::TaskSource;
+use task_source::{TaskSource, TaskSourceName};
 use uuid::Uuid;
 
 #[allow(dead_code)]
@@ -380,8 +380,8 @@ impl BaseAudioContextMethods for BaseAudioContext {
             let this_ = this.clone();
             let task_source = window.dom_manipulation_task_source();
             let task_source_ = window.dom_manipulation_task_source();
-            let canceller = window.task_canceller();
-            let canceller_ = window.task_canceller();
+            let canceller = window.task_canceller(TaskSourceName::DOMManipulation);
+            let canceller_ = window.task_canceller(TaskSourceName::DOMManipulation);
             let callbacks = AudioDecoderCallbacks::new()
                 .eos(move || {
                     let _ = task_source.queue_with_canceller(

diff --git a/components/selectors/Cargo.toml b/components/selectors/Cargo.toml
@@ -28,7 +28,7 @@ fnv = "1.0"
 phf = "0.7.18"
 precomputed-hash = "0.1"
 servo_arc = { version = "0.1", path = "../servo_arc" }
-smallvec = "0.6"
+smallvec = "0.6.2"
 
 [build-dependencies]
 phf_codegen = "0.7.18"
diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
@@ -60,7 +60,7 @@ servo_arc = { path = "../servo_arc" }
 servo_atoms = {path = "../atoms", optional = true}
 servo_config = {path = "../config", optional = true}
 smallbitvec = "2.1.1"
-smallvec = "0.6"
+smallvec = "0.6.2"
 string_cache = { version = "0.7", optional = true }
 style_derive = {path = "../style_derive"}
 style_traits = {path = "../style_traits"}