Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 16:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1599671 - Remove lazy_static dependency from wrench. r=kvark,jrmuizel

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D54870

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Glenn Watson 2019-11-27 20:47:54 +00:00
parent 93d3e01a91
commit 9127bd83e9
4 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gfx/wr/Cargo.lock generated
View File

@ -1975,7 +1975,6 @@ dependencies = [
"gleam 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
"glutin 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)",
"image 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"mozangle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"osmesa-src 0.1.1 (git+https://github.com/servo/osmesa-src)",

1
gfx/wr/wrench/Cargo.toml
View File

@ -16,7 +16,6 @@ gleam = "0.6.2"
glutin = "0.21"
app_units = "0.7"
clap = { version = "2", features = ["yaml"] }
lazy_static = "1"
log = "0.4"
yaml-rust = "0.4"
serde_json = "1.0"

6
gfx/wr/wrench/src/main.rs
View File

@ -5,8 +5,6 @@
#[macro_use]
extern crate clap;
#[macro_use]
extern crate lazy_static;
#[macro_use]
extern crate log;
#[macro_use]
extern crate serde;
@ -56,9 +54,7 @@ use winit::VirtualKeyCode;
use crate::wrench::{Wrench, WrenchThing};
use crate::yaml_frame_reader::YamlFrameReader;
lazy_static! {
static ref PLATFORM_DEFAULT_FACE_NAME: String = String::from("Arial");
}
pub const PLATFORM_DEFAULT_FACE_NAME: &str = "Arial";
pub static mut CURRENT_FRAME_NUMBER: u32 = 0;

2
gfx/wr/wrench/src/yaml_frame_reader.rs
View File

@ -56,7 +56,7 @@ impl FontDescriptor {
}
} else {
FontDescriptor::Family {
name: PLATFORM_DEFAULT_FACE_NAME.clone(),
name: PLATFORM_DEFAULT_FACE_NAME.to_string(),
}
}
}