mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-25 05:41:12 +00:00
Bug 1804178 - [3/6] Remove explicit sorting of TOML output r=glandium
Remove explicit sorting, as this is no longer needed to guarantee determinism as of Python 3.6 (our minimum-supported version). (This is a separate commit solely to make it clear that the reordering of `.cargo/config.in` is indeed merely a reordering and contains no hidden functional changes.) Differential Revision: https://phabricator.services.mozilla.com/D164152
This commit is contained in:
Ray Kraesig
parent
a6f024ad59
commit
2ba26991d4
210
.cargo/config.in
210
.cargo/config.in
@ -2,117 +2,117 @@
|
||||
# It was generated by `mach vendor rust`.
|
||||
# Please do not edit.
|
||||
|
||||
[source."https://github.com/smol-rs/async-task"]
|
||||
git = "https://github.com/smol-rs/async-task"
|
||||
[source.crates-io]
|
||||
replace-with = "vendored-sources"
|
||||
rev = "f6488e35beccb26eb6e85847b02aa78a42cd3d0e"
|
||||
|
||||
[source."https://github.com/rust-minidump/minidump-writer.git"]
|
||||
git = "https://github.com/rust-minidump/minidump-writer.git"
|
||||
replace-with = "vendored-sources"
|
||||
rev = "75ada456c92a429704691a85e1cb42fef8cafc0d"
|
||||
|
||||
[source."https://github.com/mozilla/uniffi-rs.git"]
|
||||
git = "https://github.com/mozilla/uniffi-rs.git"
|
||||
replace-with = "vendored-sources"
|
||||
rev = "bb2039f077a29dba0879372a67e764e6ace8e33f"
|
||||
|
||||
[source."https://github.com/mozilla/neqo"]
|
||||
git = "https://github.com/mozilla/neqo"
|
||||
replace-with = "vendored-sources"
|
||||
tag = "v0.6.1"
|
||||
|
||||
[source."https://github.com/mozilla/mp4parse-rust"]
|
||||
git = "https://github.com/mozilla/mp4parse-rust"
|
||||
replace-with = "vendored-sources"
|
||||
rev = "3bfc47d9a571d0842676043ba60716318e946c06"
|
||||
|
||||
[source."https://github.com/mozilla/midir.git"]
|
||||
git = "https://github.com/mozilla/midir.git"
|
||||
replace-with = "vendored-sources"
|
||||
rev = "519e651241e867af3391db08f9ae6400bc023e18"
|
||||
|
||||
[source."https://github.com/mozilla/cubeb-pulse-rs"]
|
||||
git = "https://github.com/mozilla/cubeb-pulse-rs"
|
||||
replace-with = "vendored-sources"
|
||||
rev = "cf48897be5cbe147d051ebbbe1eaf5fd8fb6bbc9"
|
||||
|
||||
[source."https://github.com/mozilla/cubeb-coreaudio-rs"]
|
||||
git = "https://github.com/mozilla/cubeb-coreaudio-rs"
|
||||
replace-with = "vendored-sources"
|
||||
rev = "93b5c01a131f65c83c11aeb317f4583405c5eb79"
|
||||
|
||||
[source."https://github.com/mozilla/audioipc"]
|
||||
git = "https://github.com/mozilla/audioipc"
|
||||
replace-with = "vendored-sources"
|
||||
rev = "fb7a2b12ced3b43e6a268621989c6191d1ed7e39"
|
||||
|
||||
[source."https://github.com/mozilla/application-services"]
|
||||
git = "https://github.com/mozilla/application-services"
|
||||
replace-with = "vendored-sources"
|
||||
rev = "51b984ecb21ba00694c3eee33364123a064a7cbb"
|
||||
|
||||
[source."https://github.com/mozilla-spidermonkey/jsparagus"]
|
||||
git = "https://github.com/mozilla-spidermonkey/jsparagus"
|
||||
replace-with = "vendored-sources"
|
||||
rev = "688a6574cf830b4a3adaf9c5d41efc1f7dd4017f"
|
||||
|
||||
[source."https://github.com/kinetiknz/mio-named-pipes"]
|
||||
git = "https://github.com/kinetiknz/mio-named-pipes"
|
||||
replace-with = "vendored-sources"
|
||||
rev = "21c26326f5f45f415c49eac4ba5bc41a2f961321"
|
||||
|
||||
[source."https://github.com/kinetiknz/audioipc-2"]
|
||||
git = "https://github.com/kinetiknz/audioipc-2"
|
||||
replace-with = "vendored-sources"
|
||||
rev = "42eb59ab3b86cd43d3dbe37d159ce102a8eaf2a5"
|
||||
|
||||
[source."https://github.com/jfkthame/mapped_hyph.git"]
|
||||
git = "https://github.com/jfkthame/mapped_hyph.git"
|
||||
replace-with = "vendored-sources"
|
||||
rev = "746743227485a83123784df0c53227ab466612ed"
|
||||
|
||||
[source."https://github.com/hsivonen/packed_simd"]
|
||||
git = "https://github.com/hsivonen/packed_simd"
|
||||
replace-with = "vendored-sources"
|
||||
rev = "412f9a0aa556611de021bde89dee8fefe6e0fbbd"
|
||||
|
||||
[source."https://github.com/hsivonen/chardetng_c"]
|
||||
git = "https://github.com/hsivonen/chardetng_c"
|
||||
replace-with = "vendored-sources"
|
||||
rev = "ed8a4c6f900a90d4dbc1d64b856e61490a1c3570"
|
||||
|
||||
[source."https://github.com/hsivonen/chardetng"]
|
||||
git = "https://github.com/hsivonen/chardetng"
|
||||
replace-with = "vendored-sources"
|
||||
rev = "3484d3e3ebdc8931493aa5df4d7ee9360a90e76b"
|
||||
|
||||
[source."https://github.com/gfx-rs/wgpu"]
|
||||
git = "https://github.com/gfx-rs/wgpu"
|
||||
replace-with = "vendored-sources"
|
||||
rev = "f14bee67"
|
||||
|
||||
[source."https://github.com/gfx-rs/naga"]
|
||||
git = "https://github.com/gfx-rs/naga"
|
||||
replace-with = "vendored-sources"
|
||||
rev = "e7fc8e6"
|
||||
|
||||
[source."https://github.com/chris-zen/coremidi.git"]
|
||||
git = "https://github.com/chris-zen/coremidi.git"
|
||||
replace-with = "vendored-sources"
|
||||
rev = "fc68464b5445caf111e41f643a2e69ccce0b4f83"
|
||||
|
||||
[source."https://github.com/FirefoxGraphics/wpf-gpu-raster"]
|
||||
git = "https://github.com/FirefoxGraphics/wpf-gpu-raster"
|
||||
replace-with = "vendored-sources"
|
||||
rev = "e07e3741d1613b1b7ddb85a1120ed4071b3d6a56"
|
||||
|
||||
[source."https://github.com/FirefoxGraphics/aa-stroke"]
|
||||
git = "https://github.com/FirefoxGraphics/aa-stroke"
|
||||
replace-with = "vendored-sources"
|
||||
rev = "07d3c25322518f294300e96246e09b95e118555d"
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source.crates-io]
|
||||
[source."https://github.com/FirefoxGraphics/wpf-gpu-raster"]
|
||||
git = "https://github.com/FirefoxGraphics/wpf-gpu-raster"
|
||||
rev = "e07e3741d1613b1b7ddb85a1120ed4071b3d6a56"
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source."https://github.com/chris-zen/coremidi.git"]
|
||||
git = "https://github.com/chris-zen/coremidi.git"
|
||||
rev = "fc68464b5445caf111e41f643a2e69ccce0b4f83"
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source."https://github.com/gfx-rs/naga"]
|
||||
git = "https://github.com/gfx-rs/naga"
|
||||
rev = "e7fc8e6"
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source."https://github.com/gfx-rs/wgpu"]
|
||||
git = "https://github.com/gfx-rs/wgpu"
|
||||
rev = "f14bee67"
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source."https://github.com/hsivonen/chardetng"]
|
||||
git = "https://github.com/hsivonen/chardetng"
|
||||
rev = "3484d3e3ebdc8931493aa5df4d7ee9360a90e76b"
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source."https://github.com/hsivonen/chardetng_c"]
|
||||
git = "https://github.com/hsivonen/chardetng_c"
|
||||
rev = "ed8a4c6f900a90d4dbc1d64b856e61490a1c3570"
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source."https://github.com/hsivonen/packed_simd"]
|
||||
git = "https://github.com/hsivonen/packed_simd"
|
||||
rev = "412f9a0aa556611de021bde89dee8fefe6e0fbbd"
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source."https://github.com/jfkthame/mapped_hyph.git"]
|
||||
git = "https://github.com/jfkthame/mapped_hyph.git"
|
||||
rev = "746743227485a83123784df0c53227ab466612ed"
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source."https://github.com/kinetiknz/audioipc-2"]
|
||||
git = "https://github.com/kinetiknz/audioipc-2"
|
||||
rev = "42eb59ab3b86cd43d3dbe37d159ce102a8eaf2a5"
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source."https://github.com/kinetiknz/mio-named-pipes"]
|
||||
git = "https://github.com/kinetiknz/mio-named-pipes"
|
||||
rev = "21c26326f5f45f415c49eac4ba5bc41a2f961321"
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source."https://github.com/mozilla-spidermonkey/jsparagus"]
|
||||
git = "https://github.com/mozilla-spidermonkey/jsparagus"
|
||||
rev = "688a6574cf830b4a3adaf9c5d41efc1f7dd4017f"
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source."https://github.com/mozilla/application-services"]
|
||||
git = "https://github.com/mozilla/application-services"
|
||||
rev = "51b984ecb21ba00694c3eee33364123a064a7cbb"
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source."https://github.com/mozilla/audioipc"]
|
||||
git = "https://github.com/mozilla/audioipc"
|
||||
rev = "fb7a2b12ced3b43e6a268621989c6191d1ed7e39"
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source."https://github.com/mozilla/cubeb-coreaudio-rs"]
|
||||
git = "https://github.com/mozilla/cubeb-coreaudio-rs"
|
||||
rev = "93b5c01a131f65c83c11aeb317f4583405c5eb79"
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source."https://github.com/mozilla/cubeb-pulse-rs"]
|
||||
git = "https://github.com/mozilla/cubeb-pulse-rs"
|
||||
rev = "cf48897be5cbe147d051ebbbe1eaf5fd8fb6bbc9"
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source."https://github.com/mozilla/midir.git"]
|
||||
git = "https://github.com/mozilla/midir.git"
|
||||
rev = "519e651241e867af3391db08f9ae6400bc023e18"
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source."https://github.com/mozilla/mp4parse-rust"]
|
||||
git = "https://github.com/mozilla/mp4parse-rust"
|
||||
rev = "3bfc47d9a571d0842676043ba60716318e946c06"
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source."https://github.com/mozilla/neqo"]
|
||||
git = "https://github.com/mozilla/neqo"
|
||||
tag = "v0.6.1"
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source."https://github.com/mozilla/uniffi-rs.git"]
|
||||
git = "https://github.com/mozilla/uniffi-rs.git"
|
||||
rev = "bb2039f077a29dba0879372a67e764e6ace8e33f"
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source."https://github.com/rust-minidump/minidump-writer.git"]
|
||||
git = "https://github.com/rust-minidump/minidump-writer.git"
|
||||
rev = "75ada456c92a429704691a85e1cb42fef8cafc0d"
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source."https://github.com/smol-rs/async-task"]
|
||||
git = "https://github.com/smol-rs/async-task"
|
||||
rev = "f6488e35beccb26eb6e85847b02aa78a42cd3d0e"
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
# Take advantage of the fact that cargo will treat lines starting with #
|
||||
|
||||
16
python/mozbuild/mozbuild/vendor/vendor_rust.py
vendored
16
python/mozbuild/mozbuild/vendor/vendor_rust.py
vendored
@ -885,22 +885,6 @@ license file's hash.
|
||||
mozpath.normsep(os.path.normcase(self.topsrcdir)),
|
||||
)
|
||||
|
||||
# Temporary hack: sort the output to end up in the particular and
|
||||
# peculiar way that `pytoml` sorted it, for stability across commits.
|
||||
def recursive_sort(
|
||||
obj: TomlItem, name: typing.Optional[str] = None
|
||||
) -> TomlItem:
|
||||
if isinstance(obj, dict):
|
||||
return {
|
||||
k: recursive_sort(v, k)
|
||||
for k, v in sorted(obj.items(), reverse=(name == "source"))
|
||||
}
|
||||
if isinstance(obj, list):
|
||||
return [recursive_sort(o) for o in obj]
|
||||
return obj
|
||||
|
||||
config = recursive_sort(config)
|
||||
|
||||
# Normalize pytoml output:
|
||||
# - removing empty lines
|
||||
# - remove empty [section]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user