corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1910552 - Update mapped_hyph to current master. r=jfkthame

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D218044
This commit is contained in:
Mike Hommey
2024-07-30 19:16:27 +00:00
parent 9c64704aca
commit b7064db89a
10 changed files with 10 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.cargo/config.toml.in
View File

@@ -50,9 +50,9 @@ git = "https://github.com/hsivonen/chardetng_c"
rev = "ed8a4c6f900a90d4dbc1d64b856e61490a1c3570" rev = "ed8a4c6f900a90d4dbc1d64b856e61490a1c3570"
replace-with = "vendored-sources" replace-with = "vendored-sources"
[source."git+https://github.com/jfkthame/mapped_hyph.git?rev=c7651a0cffff41996ad13c44f689bd9cd2192c01"] [source."git+https://github.com/jfkthame/mapped_hyph.git?rev=eff105f6ad7ec9b79816cfc1985a28e5340ad14b"]
git = "https://github.com/jfkthame/mapped_hyph.git" git = "https://github.com/jfkthame/mapped_hyph.git"
rev = "c7651a0cffff41996ad13c44f689bd9cd2192c01" rev = "eff105f6ad7ec9b79816cfc1985a28e5340ad14b"
replace-with = "vendored-sources" replace-with = "vendored-sources"
[source."git+https://github.com/mozilla-spidermonkey/jsparagus?rev=61f399c53a641ebd3077c1f39f054f6d396a633c"] [source."git+https://github.com/mozilla-spidermonkey/jsparagus?rev=61f399c53a641ebd3077c1f39f054f6d396a633c"]

24
Cargo.lock generated
View File

@@ -284,7 +284,7 @@ dependencies = [
"iovec", "iovec",
"libc", "libc",
"log", "log",
"memmap2 0.9.3", "memmap2",
"mio 1.999.999", "mio 1.999.999",
"scopeguard", "scopeguard",
"serde", "serde",
@@ -3565,11 +3565,11 @@ dependencies = [
[[package]] [[package]]
name = "mapped_hyph" name = "mapped_hyph"
version = "0.4.3" version = "0.4.3"
source = "git+https://github.com/jfkthame/mapped_hyph.git?rev=c7651a0cffff41996ad13c44f689bd9cd2192c01#c7651a0cffff41996ad13c44f689bd9cd2192c01" source = "git+https://github.com/jfkthame/mapped_hyph.git?rev=eff105f6ad7ec9b79816cfc1985a28e5340ad14b#eff105f6ad7ec9b79816cfc1985a28e5340ad14b"
dependencies = [ dependencies = [
"arrayref", "arrayref",
"log", "log",
"memmap2 0.5.999", "memmap2",
] ]
[[package]] [[package]]
@@ -3620,20 +3620,6 @@ version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
name = "memmap2"
version = "0.5.999"
dependencies = [
"memmap2 0.8.999",
]
[[package]]
name = "memmap2"
version = "0.8.999"
dependencies = [
"memmap2 0.9.3",
]
[[package]] [[package]]
name = "memmap2" name = "memmap2"
version = "0.9.3" version = "0.9.3"
@@ -3753,7 +3739,7 @@ dependencies = [
"libc", "libc",
"log", "log",
"mach2", "mach2",
"memmap2 0.9.3", "memmap2",
"memoffset 0.9.0", "memoffset 0.9.0",
"minidump-common", "minidump-common",
"nix 0.28.0", "nix 0.28.0",
@@ -4744,7 +4730,7 @@ dependencies = [
name = "profiler_helper" name = "profiler_helper"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"memmap2 0.9.3", "memmap2",
"object", "object",
"rustc-demangle", "rustc-demangle",
"thin-vec", "thin-vec",

4
Cargo.toml
View File

@@ -127,10 +127,6 @@ terminal_size = { path = "build/rust/terminal_size" }
# Patch bitflags 1.0 to 2.0 # Patch bitflags 1.0 to 2.0
bitflags = { path = "build/rust/bitflags" } bitflags = { path = "build/rust/bitflags" }
# Patch memmap2 0.5.x and 0.8 to 0.9
memmap2_0_5 = { package = "memmap2", path = "build/rust/memmap2-0.5" }
memmap2 = { path = "build/rust/memmap2" }
# Patch redox_users to an empty crate # Patch redox_users to an empty crate
redox_users = { path = "build/rust/redox_users" } redox_users = { path = "build/rust/redox_users" }

11
build/rust/memmap2-0.5/Cargo.toml
View File

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

5
build/rust/memmap2-0.5/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 memmap2::*;

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

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

5
build/rust/memmap2/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 memmap2::*;

2
third_party/rust/mapped_hyph/.cargo-checksum.json vendored
View File

@@ -1 +1 @@
{"files":{".travis.yml":"4d1af7257c9619f7ae66fc271ba2c1be5f063640ae8ceaa235c8c8aaf32f44ea","COPYRIGHT":"4df931055b82b96e13ad475c4cee3de5afa69a54a4c611c9d7dc6252d858d9c8","Cargo.toml":"95380abd34cc8f5fda2582ceaebe3bf1ed9f77ef7f4f0a597f5a9e19169f8a66","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"4ad721b5b6a3d39ca3e2202f403d897c4a1d42896486dd58963a81f8e64ef61d","README.md":"2c91137faee83f0805a9b9123e105670bf60c2fe45ce6536fb92df7ef85017a5","benches/bench.rs":"ed7143e66ecf8bfb12c87d1f9344157d97696b8194de9132d061129bc80d8d52","cbindgen.toml":"452e79bea00e2a0c16a03ac04e454a0c5955becf2d0306ccce7d1c13d3bcc51a","doc/mapped_hyph_format.md":"2f2487cf536fe4b03db6e4b384be06744ec30b3f299519492288306a93127fbb","hyph_en_US.hyf":"6262b4c5118fe277ab4add8689d9524ca72097564652baec67a8fcd5029ec9b0","src/bin/hyf_compile.rs":"85199ddf171219b61a2da0e6acf675bf0f7a9a11ee2c6c5d1d436ec466aa95b5","src/builder.rs":"4169a89fb3a5025b06edeb8a6435a18814d58799d15861c3639a2ed9c63c628b","src/ffi.rs":"09884728df4910bb430e0d59edf770b04e5b11e2423f75c5782c5152af323476","src/lib.rs":"30c007a5f8bf71af3b4b93227c3fbb76198d6333388e5c156aaff13bfe458c8e","src/main.rs":"666befeb39cb1a7dfb66c6b9218d5f7b6c4ed09dbbbc8cfff6b749a33a99ebcf","tests/base.hyf":"d8bf57c6280cfa1d357d3fdba156ce64afbd9df58e28eeb084dfe3f80972b73f","tests/base.hyph":"a3f1fab24c101701fdf21e8359685d80611ab970304e2bd89ef024768b3700c8","tests/base.word":"1136c9a421b242262661b9a65723f87a5ecf77ae38eabcea057832d036d567fd","tests/compound.hyf":"929c1ba6676e4c43bc649d0abf4275ea9e8b02bffaa5acdf704a710813a7a13c","tests/compound4.hyf":"2093287bc41ee30ff9bdbf278f1f8209cb1d1a78236b46e9060af2a881572b8e","tests/compound5.hyf":"0942a5dfbb8d0ef3a937ab9da0418abb41300357cde49f4c477a59a11b2cb6bd","tests/compound6.hyf":"ebad958c2692a5b439b31e324020ed27c42dc05bd5b8c6a6dea4669e6ccf76b4","tests/hyphen.hyf":"92b8a5c86aac6a0b9f0eb7330a057065d6985fd047e851cae47039995c682d4d","tests/lhmin.hyf":"23c886704fafee7d9c54b2478029cf69a5fa946c2f2442bd86697bca5933c88d","tests/num.hyf":"4834fabe78b5c81815434d4562ce3322541649e1ea1edc555a498574bc8b237e","tests/rhmin.hyf":"239cb3d4d7f904abb43b57241e12cc1396e636220c3806e64666aca7ca46cc42","tests/settings2.hyf":"9fc4855e0b952a3593db1efef080b93ce7f1c6fe6798db0440e2bf0cc986ffa2","tests/settings3.hyf":"867db207b485a06e7d60ad10735c9111f10516ee3a5afd6306c683ace3454491","tests/test.rs":"5c81ae59b9384b70d9461407999dac1fde9214398876c4433fbbde9571cc1d94"},"package":null} {"files":{".travis.yml":"4d1af7257c9619f7ae66fc271ba2c1be5f063640ae8ceaa235c8c8aaf32f44ea","COPYRIGHT":"4df931055b82b96e13ad475c4cee3de5afa69a54a4c611c9d7dc6252d858d9c8","Cargo.toml":"06a6456cc9fa9929cb0fa7aa762f3b1e6362f8b8903111ad9b01881af26dcad9","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"4ad721b5b6a3d39ca3e2202f403d897c4a1d42896486dd58963a81f8e64ef61d","README.md":"2c91137faee83f0805a9b9123e105670bf60c2fe45ce6536fb92df7ef85017a5","benches/bench.rs":"ed7143e66ecf8bfb12c87d1f9344157d97696b8194de9132d061129bc80d8d52","cbindgen.toml":"452e79bea00e2a0c16a03ac04e454a0c5955becf2d0306ccce7d1c13d3bcc51a","doc/mapped_hyph_format.md":"2f2487cf536fe4b03db6e4b384be06744ec30b3f299519492288306a93127fbb","hyph_en_US.hyf":"6262b4c5118fe277ab4add8689d9524ca72097564652baec67a8fcd5029ec9b0","src/bin/hyf_compile.rs":"85199ddf171219b61a2da0e6acf675bf0f7a9a11ee2c6c5d1d436ec466aa95b5","src/builder.rs":"4169a89fb3a5025b06edeb8a6435a18814d58799d15861c3639a2ed9c63c628b","src/ffi.rs":"09884728df4910bb430e0d59edf770b04e5b11e2423f75c5782c5152af323476","src/lib.rs":"30c007a5f8bf71af3b4b93227c3fbb76198d6333388e5c156aaff13bfe458c8e","src/main.rs":"666befeb39cb1a7dfb66c6b9218d5f7b6c4ed09dbbbc8cfff6b749a33a99ebcf","tests/base.hyf":"d8bf57c6280cfa1d357d3fdba156ce64afbd9df58e28eeb084dfe3f80972b73f","tests/base.hyph":"a3f1fab24c101701fdf21e8359685d80611ab970304e2bd89ef024768b3700c8","tests/base.word":"1136c9a421b242262661b9a65723f87a5ecf77ae38eabcea057832d036d567fd","tests/compound.hyf":"929c1ba6676e4c43bc649d0abf4275ea9e8b02bffaa5acdf704a710813a7a13c","tests/compound4.hyf":"2093287bc41ee30ff9bdbf278f1f8209cb1d1a78236b46e9060af2a881572b8e","tests/compound5.hyf":"0942a5dfbb8d0ef3a937ab9da0418abb41300357cde49f4c477a59a11b2cb6bd","tests/compound6.hyf":"ebad958c2692a5b439b31e324020ed27c42dc05bd5b8c6a6dea4669e6ccf76b4","tests/hyphen.hyf":"92b8a5c86aac6a0b9f0eb7330a057065d6985fd047e851cae47039995c682d4d","tests/lhmin.hyf":"23c886704fafee7d9c54b2478029cf69a5fa946c2f2442bd86697bca5933c88d","tests/num.hyf":"4834fabe78b5c81815434d4562ce3322541649e1ea1edc555a498574bc8b237e","tests/rhmin.hyf":"239cb3d4d7f904abb43b57241e12cc1396e636220c3806e64666aca7ca46cc42","tests/settings2.hyf":"9fc4855e0b952a3593db1efef080b93ce7f1c6fe6798db0440e2bf0cc986ffa2","tests/settings3.hyf":"867db207b485a06e7d60ad10735c9111f10516ee3a5afd6306c683ace3454491","tests/test.rs":"5c81ae59b9384b70d9461407999dac1fde9214398876c4433fbbde9571cc1d94"},"package":null}

2
third_party/rust/mapped_hyph/Cargo.toml vendored
View File

@@ -27,7 +27,7 @@ arrayref = "0.3.5"
log = "0.4" log = "0.4"
[dependencies.memmap2] [dependencies.memmap2]
version = ">=0.2,<=0.5" version = ">=0.2,<=0.9"
[dev-dependencies] [dev-dependencies]
criterion = "0.3" criterion = "0.3"

2
toolkit/library/rust/shared/Cargo.toml
View File

@@ -49,7 +49,7 @@ audio_thread_priority = { version = "0.32", default-features = false }
mdns_service = { path="../../../../dom/media/webrtc/transport/mdns_service", optional = true } mdns_service = { path="../../../../dom/media/webrtc/transport/mdns_service", optional = true }
neqo_glue = { path = "../../../../netwerk/socket/neqo_glue" } neqo_glue = { path = "../../../../netwerk/socket/neqo_glue" }
wgpu_bindings = { path = "../../../../gfx/wgpu_bindings" } wgpu_bindings = { path = "../../../../gfx/wgpu_bindings" }
mapped_hyph = { git = "https://github.com/jfkthame/mapped_hyph.git", rev = "c7651a0cffff41996ad13c44f689bd9cd2192c01" } mapped_hyph = { git = "https://github.com/jfkthame/mapped_hyph.git", rev = "eff105f6ad7ec9b79816cfc1985a28e5340ad14b" }
fog_control = { path = "../../../components/glean" } fog_control = { path = "../../../components/glean" }
app_services_logger = { path = "../../../../services/common/app_services_logger" } app_services_logger = { path = "../../../../services/common/app_services_logger" }
http_sfv = { path = "../../../../netwerk/base/http-sfv" } http_sfv = { path = "../../../../netwerk/base/http-sfv" }