mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
Remove usage of phf_macros.
It’s a compiler plugin that uses unstable compiler APIs that are not on a path to stabilization. With this changes, there is one less thing that might break when we update the compiler. For example: https://github.com/sfackler/rust-phf/pull/101
This commit is contained in:
parent
80c6383140
commit
71fb02953c
5 changed files with 53 additions and 15 deletions
14
Cargo.lock
generated
14
Cargo.lock
generated
|
@ -2015,15 +2015,6 @@ dependencies = [
|
||||||
"rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
|
"rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "phf_macros"
|
|
||||||
version = "0.7.20"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
dependencies = [
|
|
||||||
"phf_generator 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
||||||
"phf_shared 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "phf_shared"
|
name = "phf_shared"
|
||||||
version = "0.7.20"
|
version = "0.7.20"
|
||||||
|
@ -2295,7 +2286,8 @@ dependencies = [
|
||||||
"open 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"open 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"parking_lot 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
"parking_lot 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"phf 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)",
|
"phf 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"phf_macros 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)",
|
"phf_codegen 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"phf_shared 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"plugins 0.0.1",
|
"plugins 0.0.1",
|
||||||
"profile_traits 0.0.1",
|
"profile_traits 0.0.1",
|
||||||
"range 0.0.1",
|
"range 0.0.1",
|
||||||
|
@ -2483,7 +2475,6 @@ dependencies = [
|
||||||
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"net_tests 0.0.1",
|
"net_tests 0.0.1",
|
||||||
"net_traits_tests 0.0.1",
|
"net_traits_tests 0.0.1",
|
||||||
"phf_macros 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
||||||
"plugin_compiletest 0.0.1",
|
"plugin_compiletest 0.0.1",
|
||||||
"profile_tests 0.0.1",
|
"profile_tests 0.0.1",
|
||||||
"script_tests 0.0.1",
|
"script_tests 0.0.1",
|
||||||
|
@ -3541,7 +3532,6 @@ dependencies = [
|
||||||
"checksum phf 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "0c6afb2057bb5f846a7b75703f90bc1cef4970c35209f712925db7768e999202"
|
"checksum phf 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "0c6afb2057bb5f846a7b75703f90bc1cef4970c35209f712925db7768e999202"
|
||||||
"checksum phf_codegen 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "6b63f121bf9a128f2172a65d8313a8e0e79d63874eeb4b4b7d82e6dda6b62f7c"
|
"checksum phf_codegen 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "6b63f121bf9a128f2172a65d8313a8e0e79d63874eeb4b4b7d82e6dda6b62f7c"
|
||||||
"checksum phf_generator 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "50ffbd7970f75afa083c5dd7b6830c97b72b81579c7a92d8134ef2ee6c0c7eb0"
|
"checksum phf_generator 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "50ffbd7970f75afa083c5dd7b6830c97b72b81579c7a92d8134ef2ee6c0c7eb0"
|
||||||
"checksum phf_macros 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "619b2c128703c63376de760377600b924fc0257487f51bc156f596cf8762e497"
|
|
||||||
"checksum phf_shared 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "286385a0e50d4147bce15b2c19f0cf84c395b0e061aaf840898a7bf664c2cfb7"
|
"checksum phf_shared 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "286385a0e50d4147bce15b2c19f0cf84c395b0e061aaf840898a7bf664c2cfb7"
|
||||||
"checksum pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8cee804ecc7eaf201a4a207241472cc870e825206f6c031e3ee2a72fa425f2fa"
|
"checksum pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8cee804ecc7eaf201a4a207241472cc870e825206f6c031e3ee2a72fa425f2fa"
|
||||||
"checksum pnacl-build-helper 1.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "61c9231d31aea845007443d62fcbb58bb6949ab9c18081ee1e09920e0cf1118b"
|
"checksum pnacl-build-helper 1.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "61c9231d31aea845007443d62fcbb58bb6949ab9c18081ee1e09920e0cf1118b"
|
||||||
|
|
|
@ -16,6 +16,9 @@ debugmozjs = ['js/debugmozjs']
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
cmake = "0.1"
|
cmake = "0.1"
|
||||||
|
phf_codegen = "0.7.18"
|
||||||
|
phf_shared = "0.7.18"
|
||||||
|
regex = "0.2"
|
||||||
|
|
||||||
[target.'cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))'.dependencies]
|
[target.'cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))'.dependencies]
|
||||||
tinyfiledialogs = "2.5.9"
|
tinyfiledialogs = "2.5.9"
|
||||||
|
@ -57,7 +60,6 @@ offscreen_gl_context = "0.5.0"
|
||||||
open = "1.1.1"
|
open = "1.1.1"
|
||||||
parking_lot = "0.3"
|
parking_lot = "0.3"
|
||||||
phf = "0.7.18"
|
phf = "0.7.18"
|
||||||
phf_macros = "0.7.18"
|
|
||||||
plugins = {path = "../plugins"}
|
plugins = {path = "../plugins"}
|
||||||
profile_traits = {path = "../profile_traits"}
|
profile_traits = {path = "../profile_traits"}
|
||||||
range = {path = "../range"}
|
range = {path = "../range"}
|
||||||
|
|
|
@ -3,7 +3,16 @@
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
extern crate cmake;
|
extern crate cmake;
|
||||||
|
extern crate phf_codegen;
|
||||||
|
extern crate phf_shared;
|
||||||
|
extern crate regex;
|
||||||
|
|
||||||
|
use regex::Regex;
|
||||||
use std::env;
|
use std::env;
|
||||||
|
use std::fmt;
|
||||||
|
use std::fs::File;
|
||||||
|
use std::io::{Read, Write};
|
||||||
|
use std::path::PathBuf;
|
||||||
use std::time::Instant;
|
use std::time::Instant;
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
|
@ -34,4 +43,43 @@ fn main() {
|
||||||
build.build();
|
build.build();
|
||||||
|
|
||||||
println!("Binding generation completed in {}s", start.elapsed().as_secs());
|
println!("Binding generation completed in {}s", start.elapsed().as_secs());
|
||||||
|
|
||||||
|
convert_phf();
|
||||||
|
}
|
||||||
|
|
||||||
|
fn convert_phf() {
|
||||||
|
let filename = PathBuf::from(env::var("OUT_DIR").unwrap()).join("InterfaceObjectMap.rs");
|
||||||
|
let mut source = String::new();
|
||||||
|
File::open(&filename).unwrap().read_to_string(&mut source).unwrap();
|
||||||
|
let map_macro = Regex::new("phf_map! \\{([^}]+)\\}").unwrap().captures(&source).unwrap();
|
||||||
|
let entries_re = Regex::new("b\"([^\"]+)\" => ([^\n]+),\n").unwrap();
|
||||||
|
let entries = entries_re.captures_iter(&map_macro[1]);
|
||||||
|
|
||||||
|
let mut map = phf_codegen::Map::new();
|
||||||
|
for entry in entries {
|
||||||
|
map.entry(Bytes(entry.get(1).unwrap().as_str()), entry.get(2).unwrap().as_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut file = File::create(&filename).unwrap();
|
||||||
|
let map_macro = map_macro.get(0).unwrap();
|
||||||
|
file.write_all(source[..map_macro.start()].as_bytes()).unwrap();
|
||||||
|
map.build(&mut file).unwrap();
|
||||||
|
file.write_all(source[map_macro.end()..].as_bytes()).unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Eq, PartialEq, Hash)]
|
||||||
|
struct Bytes<'a>(&'a str);
|
||||||
|
|
||||||
|
impl<'a> fmt::Debug for Bytes<'a> {
|
||||||
|
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
|
||||||
|
formatter.write_str("b\"")?;
|
||||||
|
formatter.write_str(self.0)?;
|
||||||
|
formatter.write_str("\" as &'static [u8]")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a> phf_shared::PhfHash for Bytes<'a> {
|
||||||
|
fn phf_hash<H: std::hash::Hasher>(&self, hasher: &mut H) {
|
||||||
|
self.0.as_bytes().phf_hash(hasher)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,6 @@
|
||||||
|
|
||||||
#![doc = "The script crate contains all matters DOM."]
|
#![doc = "The script crate contains all matters DOM."]
|
||||||
|
|
||||||
#![plugin(phf_macros)]
|
|
||||||
#![plugin(plugins)]
|
#![plugin(plugins)]
|
||||||
|
|
||||||
extern crate angle;
|
extern crate angle;
|
||||||
|
|
|
@ -41,7 +41,6 @@ browserhtml = {git = "https://github.com/browserhtml/browserhtml", branch = "cra
|
||||||
glutin_app = {path = "../../ports/glutin"}
|
glutin_app = {path = "../../ports/glutin"}
|
||||||
log = "0.3"
|
log = "0.3"
|
||||||
libservo = {path = "../../components/servo"}
|
libservo = {path = "../../components/servo"}
|
||||||
phf_macros = "0.7.19"
|
|
||||||
|
|
||||||
[target.'cfg(not(target_os = "android"))'.dependencies]
|
[target.'cfg(not(target_os = "android"))'.dependencies]
|
||||||
sig = "0.1"
|
sig = "0.1"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue