mirror of
https://github.com/servo/servo.git
synced 2025-08-03 20:50:07 +01:00
Fix deprecation warnings
This commit is contained in:
parent
12d19760b3
commit
7cf98f6b01
6 changed files with 12 additions and 12 deletions
|
@ -18,7 +18,7 @@ use std::fs::{self, File};
|
||||||
use std::io::{self, Read, Write};
|
use std::io::{self, Read, Write};
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
use std::process;
|
use std::process;
|
||||||
use std::sync::atomic::{AtomicBool, Ordering, ATOMIC_BOOL_INIT};
|
use std::sync::atomic::{AtomicBool, Ordering};
|
||||||
use std::sync::{RwLock, RwLockReadGuard};
|
use std::sync::{RwLock, RwLockReadGuard};
|
||||||
use url::{self, Url};
|
use url::{self, Url};
|
||||||
|
|
||||||
|
@ -490,7 +490,7 @@ fn args_fail(msg: &str) -> ! {
|
||||||
process::exit(1)
|
process::exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
static MULTIPROCESS: AtomicBool = ATOMIC_BOOL_INIT;
|
static MULTIPROCESS: AtomicBool = AtomicBool::new(false);
|
||||||
|
|
||||||
#[inline]
|
#[inline]
|
||||||
pub fn multiprocess() -> bool {
|
pub fn multiprocess() -> bool {
|
||||||
|
|
|
@ -22,7 +22,7 @@ use std::collections::HashMap;
|
||||||
use std::iter;
|
use std::iter;
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
use std::str;
|
use std::str;
|
||||||
use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT};
|
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use style::computed_values::{font_stretch, font_style, font_variant_caps, font_weight};
|
use style::computed_values::{font_stretch, font_style, font_variant_caps, font_weight};
|
||||||
use style::properties::style_structs::Font as FontStyleStruct;
|
use style::properties::style_structs::Font as FontStyleStruct;
|
||||||
|
@ -39,7 +39,7 @@ pub const GPOS: u32 = ot_tag!('G', 'P', 'O', 'S');
|
||||||
pub const GSUB: u32 = ot_tag!('G', 'S', 'U', 'B');
|
pub const GSUB: u32 = ot_tag!('G', 'S', 'U', 'B');
|
||||||
pub const KERN: u32 = ot_tag!('k', 'e', 'r', 'n');
|
pub const KERN: u32 = ot_tag!('k', 'e', 'r', 'n');
|
||||||
|
|
||||||
static TEXT_SHAPING_PERFORMANCE_COUNTER: AtomicUsize = ATOMIC_USIZE_INIT;
|
static TEXT_SHAPING_PERFORMANCE_COUNTER: AtomicUsize = AtomicUsize::new(0);
|
||||||
|
|
||||||
// FontHandle encapsulates access to the platform's font API,
|
// FontHandle encapsulates access to the platform's font API,
|
||||||
// e.g. quartz, FreeType. It provides access to metrics and tables
|
// e.g. quartz, FreeType. It provides access to metrics and tables
|
||||||
|
|
|
@ -18,7 +18,7 @@ use std::collections::HashMap;
|
||||||
use std::default::Default;
|
use std::default::Default;
|
||||||
use std::hash::{BuildHasherDefault, Hash, Hasher};
|
use std::hash::{BuildHasherDefault, Hash, Hasher};
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT};
|
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||||
use style::computed_values::font_variant_caps::T as FontVariantCaps;
|
use style::computed_values::font_variant_caps::T as FontVariantCaps;
|
||||||
use style::properties::style_structs::Font as FontStyleStruct;
|
use style::properties::style_structs::Font as FontStyleStruct;
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ static SMALL_CAPS_SCALE_FACTOR: f32 = 0.8; // Matches FireFox (see gfxFont.h)
|
||||||
|
|
||||||
/// An epoch for the font context cache. The cache is flushed if the current epoch does not match
|
/// An epoch for the font context cache. The cache is flushed if the current epoch does not match
|
||||||
/// this one.
|
/// this one.
|
||||||
static FONT_CACHE_EPOCH: AtomicUsize = ATOMIC_USIZE_INIT;
|
static FONT_CACHE_EPOCH: AtomicUsize = AtomicUsize::new(0);
|
||||||
|
|
||||||
pub trait FontSource {
|
pub trait FontSource {
|
||||||
fn get_font_instance(
|
fn get_font_instance(
|
||||||
|
|
|
@ -16,7 +16,7 @@ extern crate serde;
|
||||||
pub mod print_tree;
|
pub mod print_tree;
|
||||||
|
|
||||||
use range::RangeIndex;
|
use range::RangeIndex;
|
||||||
use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT};
|
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||||
|
|
||||||
/// A newtype struct for denoting the age of messages; prevents race conditions.
|
/// A newtype struct for denoting the age of messages; prevents race conditions.
|
||||||
#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)]
|
#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)]
|
||||||
|
@ -75,7 +75,7 @@ pub enum FragmentType {
|
||||||
/// The next ID that will be used for a special scroll root id.
|
/// The next ID that will be used for a special scroll root id.
|
||||||
///
|
///
|
||||||
/// A special scroll root is a scroll root that is created for generated content.
|
/// A special scroll root is a scroll root that is created for generated content.
|
||||||
static NEXT_SPECIAL_SCROLL_ROOT_ID: AtomicUsize = ATOMIC_USIZE_INIT;
|
static NEXT_SPECIAL_SCROLL_ROOT_ID: AtomicUsize = AtomicUsize::new(0);
|
||||||
|
|
||||||
/// If none of the bits outside this mask are set, the scroll root is a special scroll root.
|
/// If none of the bits outside this mask are set, the scroll root is a special scroll root.
|
||||||
/// Note that we assume that the top 16 bits of the address space are unused on the platform.
|
/// Note that we assume that the top 16 bits of the address space are unused on the platform.
|
||||||
|
|
|
@ -13,12 +13,12 @@ use std::cell::RefCell;
|
||||||
use std::fs::File;
|
use std::fs::File;
|
||||||
use std::io::Write;
|
use std::io::Write;
|
||||||
#[cfg(debug_assertions)]
|
#[cfg(debug_assertions)]
|
||||||
use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT};
|
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||||
|
|
||||||
thread_local!(static STATE_KEY: RefCell<Option<State>> = RefCell::new(None));
|
thread_local!(static STATE_KEY: RefCell<Option<State>> = RefCell::new(None));
|
||||||
|
|
||||||
#[cfg(debug_assertions)]
|
#[cfg(debug_assertions)]
|
||||||
static DEBUG_ID_COUNTER: AtomicUsize = ATOMIC_USIZE_INIT;
|
static DEBUG_ID_COUNTER: AtomicUsize = AtomicUsize::new(0);
|
||||||
|
|
||||||
pub struct Scope;
|
pub struct Scope;
|
||||||
|
|
||||||
|
|
|
@ -144,12 +144,12 @@ mod synchronized_heartbeat {
|
||||||
use heartbeats_simple::HeartbeatPowContext as HeartbeatContext;
|
use heartbeats_simple::HeartbeatPowContext as HeartbeatContext;
|
||||||
use profile_traits::time::ProfilerCategory;
|
use profile_traits::time::ProfilerCategory;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::sync::atomic::{AtomicBool, Ordering, ATOMIC_BOOL_INIT};
|
use std::sync::atomic::{AtomicBool, Ordering};
|
||||||
|
|
||||||
static mut HBS: Option<*mut HashMap<ProfilerCategory, Heartbeat>> = None;
|
static mut HBS: Option<*mut HashMap<ProfilerCategory, Heartbeat>> = None;
|
||||||
|
|
||||||
// unfortunately can't encompass the actual hashmap in a Mutex (Heartbeat isn't Send/Sync), so we'll use a spinlock
|
// unfortunately can't encompass the actual hashmap in a Mutex (Heartbeat isn't Send/Sync), so we'll use a spinlock
|
||||||
static HBS_SPINLOCK: AtomicBool = ATOMIC_BOOL_INIT;
|
static HBS_SPINLOCK: AtomicBool = AtomicBool::new(false);
|
||||||
|
|
||||||
pub fn lock_and_work<F, R>(work: F) -> R
|
pub fn lock_and_work<F, R>(work: F) -> R
|
||||||
where
|
where
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue