mirror of
https://github.com/servo/servo.git
synced 2025-08-07 14:35:33 +01:00
Fix build errors after rebase
This commit is contained in:
parent
4059e16a15
commit
1649b6a528
8 changed files with 383 additions and 13 deletions
|
@ -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`
|
||||
|
|
|
@ -36,7 +36,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"]}
|
||||
|
|
|
@ -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"]}
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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(
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue