Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-26 12:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1774501 - Update stylo to itertools:0.10, itoa:1.0 and toml:0.5. r=emilio

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D149454
This commit is contained in:
Mike Hommey 2022-06-16 20:44:03 +00:00
parent df77ed0752
commit a211cd2aea
8 changed files with 18 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Cargo.lock generated
View File

@ -1036,7 +1036,7 @@ dependencies = [
"cranelift-codegen",
"cranelift-entity",
"cranelift-frontend",
"itertools 0.10.3",
"itertools",
"log",
"smallvec",
"thiserror",
@ -1171,7 +1171,7 @@ checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa"
dependencies = [
"cssparser-macros",
"dtoa-short",
"itoa 1.0.2",
"itoa",
"matches",
"phf",
"proc-macro2",
@ -2534,7 +2534,7 @@ checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
dependencies = [
"bytes 1.1.0",
"fnv",
"itoa 1.0.2",
"itoa",
]
[[package]]
@ -2608,7 +2608,7 @@ dependencies = [
"http-body",
"httparse",
"httpdate",
"itoa 1.0.2",
"itoa",
"pin-project-lite",
"socket2",
"tokio 1.17.0",
@ -2733,13 +2733,6 @@ dependencies = [
"sha2",
]
[[package]]
name = "itertools"
version = "0.8.999"
dependencies = [
"itertools 0.10.3",
]
[[package]]
name = "itertools"
version = "0.10.3"
@ -2749,13 +2742,6 @@ dependencies = [
"either",
]
[[package]]
name = "itoa"
version = "0.4.999"
dependencies = [
"itoa 1.0.2",
]
[[package]]
name = "itoa"
version = "1.0.2"
@ -4281,7 +4267,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba"
dependencies = [
"anyhow",
"itertools 0.10.3",
"itertools",
"proc-macro2",
"quote",
"syn",
@ -4758,7 +4744,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
dependencies = [
"indexmap",
"itoa 1.0.2",
"itoa",
"ryu",
"serde",
]
@ -4781,7 +4767,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
dependencies = [
"form_urlencoded",
"itoa 1.0.2",
"itoa",
"ryu",
"serde",
]
@ -5027,8 +5013,8 @@ dependencies = [
"fxhash",
"gecko-profiler",
"indexmap",
"itertools 0.8.999",
"itoa 0.4.999",
"itertools",
"itoa",
"lazy_static",
"log",
"malloc_size_of",
@ -5058,7 +5044,7 @@ dependencies = [
"time 0.1.44",
"to_shmem",
"to_shmem_derive",
"toml 0.4.999",
"toml 0.5.9",
"uluru",
"unicode-bidi",
"unicode-segmentation",
@ -5271,7 +5257,7 @@ version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd"
dependencies = [
"itoa 1.0.2",
"itoa",
"libc",
"num_threads",
"time-macros",

6
Cargo.toml
View File

@ -91,18 +91,12 @@ vcpkg = { path = "build/rust/vcpkg" }
# Helper crate for integration in the gecko build system.
mozbuild = { path = "build/rust/mozbuild" }
# Patch itoa 0.4 to 1.0.
itoa = { path = "build/rust/itoa" }
# Patch bindgen 0.56 to 0.59.
bindgen = { path = "build/rust/bindgen" }
# Patch cfg-if 0.1 to 1.0
cfg-if = { path = "build/rust/cfg-if" }
# Patch itertools 0.8 to 1.0
itertools = { path = "build/rust/itertools" }
# Patch redox_users to an empty crate
redox_users = { path = "build/rust/redox_users" }

11
build/rust/itertools/Cargo.toml
View File

@ -1,11 +0,0 @@
[package]
name = "itertools"
version = "0.8.999"
edition = "2018"
license = "MPL-2.0"
[lib]
path = "lib.rs"
[dependencies]
itertools = "0.10"

5
build/rust/itertools/lib.rs
View File

@ -1,5 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
pub use itertools::*;

11
build/rust/itoa/Cargo.toml
View File

@ -1,11 +0,0 @@
[package]
name = "itoa"
version = "0.4.999"
edition = "2018"
license = "MIT OR Apache-2.0"
[lib]
path = "lib.rs"
[dependencies]
itoa = "1.0"

25
build/rust/itoa/lib.rs
View File

@ -1,25 +0,0 @@
// Licensed under the Apache License, Version 2.0
// <http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <http://opensource.org/licenses/MIT>, at your option.
pub use itoa::*;
use std::{fmt, io};
// APIs that were in itoa 0.4 but aren't in 1.0.
#[inline]
pub fn write<W: io::Write, V: Integer>(mut wr: W, value: V) -> io::Result<usize> {
let mut buf = Buffer::new();
let s = buf.format(value);
match wr.write_all(s.as_bytes()) {
Ok(()) => Ok(s.len()),
Err(e) => Err(e),
}
}
/// Write integer to an `fmt::Write`.
#[inline]
pub fn fmt<W: fmt::Write, V: Integer>(mut wr: W, value: V) -> fmt::Result {
let mut buf = Buffer::new();
wr.write_str(buf.format(value))
}

6
servo/components/style/Cargo.toml
View File

@ -41,8 +41,8 @@ euclid = "0.22"
fxhash = "0.2"
html5ever = {version = "0.24", optional = true}
indexmap = {version = "1.0", features = ["std"]}
itertools = "0.8"
itoa = "0.4"
itertools = "0.10"
itoa = "1.0"
lazy_static = "1"
log = "0.4"
malloc_size_of = { path = "../malloc_size_of" }
@ -85,5 +85,5 @@ log = { version = "0.4", features = ["std"] }
bindgen = {version = "0.59", optional = true, default-features = false}
regex = {version = "1.0", optional = true, default-features = false, features = ["perf", "std"]}
walkdir = "2.1.4"
toml = {version = "0.4.5", optional = true, default-features = false}
toml = {version = "0.5", optional = true, default-features = false}
mozbuild = {version = "0.1", optional = true}

5
servo/components/style/values/specified/color.rs
View File

@ -604,7 +604,10 @@ impl Color {
let mut serialization = [b'0'; 6];
let space_padding = 6 - total;
let mut written = space_padding;
written += itoa::write(&mut serialization[written..], value).unwrap();
let mut buf = itoa::Buffer::new();
let s = buf.format(value);
(&mut serialization[written..]).write_all(s.as_bytes()).unwrap();
written += s.len();
if let Some(unit) = unit {
written += (&mut serialization[written..])
.write(unit.as_bytes())