Skip to content

Commit

Permalink
[hakari] add a new format version that sorts dependencies alphabetically
Browse files Browse the repository at this point in the history
In some cases, we weren't producing output that was exactly sorted.

Fixes guppy-rs#65.
  • Loading branch information
sunshowers committed Jan 19, 2023
1 parent d317d08 commit 6de7f75
Show file tree
Hide file tree
Showing 51 changed files with 390 additions and 368 deletions.
2 changes: 1 addition & 1 deletion fixtures/guppy/hakari/metadata_guppy_44b62fa-0.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# resolver = '1'
# unify-target-host = 'unify-if-both'
# output-single-feature = false
# dep-format-version = '2'
# dep-format-version = '3'
# platforms = ['powerpc-wrs-vxworks-spe', 'thumbv7em-none-eabihf']
# [[traversal-excludes.ids]]
# name = 'cargo-compare'
Expand Down
2 changes: 1 addition & 1 deletion fixtures/guppy/hakari/metadata_guppy_44b62fa-2.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# resolver = '2'
# unify-target-host = 'replicate-target-on-host'
# output-single-feature = true
# dep-format-version = '1'
# dep-format-version = '2'
# platforms = ['aarch64-unknown-freebsd', 'armv7-apple-ios']
#
# [traversal-excludes]
Expand Down
2 changes: 1 addition & 1 deletion fixtures/guppy/hakari/metadata_guppy_44b62fa-3.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# resolver = '1'
# unify-target-host = 'unify-if-both'
# output-single-feature = true
# dep-format-version = '3'
# dep-format-version = '4'
# platforms = []
# [[traversal-excludes.ids]]
# name = 'guppy-cmdlib'
Expand Down
10 changes: 5 additions & 5 deletions fixtures/guppy/hakari/metadata_guppy_78cb7e8-2.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# resolver = '2'
# unify-target-host = 'replicate-target-on-host'
# output-single-feature = true
# dep-format-version = '3'
# dep-format-version = '4'
# platforms = ['aarch64-fuchsia']
#
# [traversal-excludes]
Expand Down Expand Up @@ -76,8 +76,8 @@ idna = { version = "0.2", default-features = false }
ignore = { version = "0.4", default-features = false }
im-rc = { version = "15", default-features = false }
indexmap = { version = "1", default-features = false }
itertools-c38e5c1d305a1b54 = { package = "itertools", version = "0.8" }
itertools-274715c4dabd11b0 = { package = "itertools", version = "0.9" }
itertools-c38e5c1d305a1b54 = { package = "itertools", version = "0.8" }
itoa = { version = "0.4" }
jobserver = { version = "0.1", default-features = false }
lazy_static = { version = "1", default-features = false }
Expand Down Expand Up @@ -228,8 +228,8 @@ idna = { version = "0.2", default-features = false }
ignore = { version = "0.4", default-features = false }
im-rc = { version = "15", default-features = false }
indexmap = { version = "1", default-features = false }
itertools-c38e5c1d305a1b54 = { package = "itertools", version = "0.8" }
itertools-274715c4dabd11b0 = { package = "itertools", version = "0.9" }
itertools-c38e5c1d305a1b54 = { package = "itertools", version = "0.8" }
itoa = { version = "0.4" }
jobserver = { version = "0.1", default-features = false }
lazy_static = { version = "1", default-features = false }
Expand Down Expand Up @@ -286,8 +286,8 @@ rusty-fork = { version = "0.3", default-features = false, features = ["timeout"]
ryu = { version = "1", default-features = false }
same-file = { version = "1", default-features = false }
scopeguard = { version = "1", default-features = false }
semver-93f6ce9d446188ac = { package = "semver", version = "0.10", features = ["serde"] }
semver-274715c4dabd11b0 = { package = "semver", version = "0.9" }
semver-93f6ce9d446188ac = { package = "semver", version = "0.10", features = ["serde"] }
semver-parser = { version = "0.7", default-features = false }
serde = { version = "1", features = ["derive"] }
serde_cbor = { version = "0.11" }
Expand Down Expand Up @@ -321,8 +321,8 @@ unicode-bidi = { version = "0.3" }
unicode-normalization = { version = "0.1" }
unicode-segmentation = { version = "1", default-features = false }
unicode-width = { version = "0.1" }
unicode-xid-c65f7effa3be6d31 = { package = "unicode-xid", version = "0.1" }
unicode-xid-6f8ce4dd05d13bba = { package = "unicode-xid", version = "0.2" }
unicode-xid-c65f7effa3be6d31 = { package = "unicode-xid", version = "0.1" }
unreachable = { version = "1", default-features = false }
url = { version = "2", default-features = false }
utf8parse = { version = "0.1", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion fixtures/guppy/hakari/metadata_guppy_78cb7e8-3.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# resolver = '1'
# unify-target-host = 'auto'
# output-single-feature = false
# dep-format-version = '3'
# dep-format-version = '4'
# platforms = ['powerpc-unknown-freebsd', 'x86_64-unknown-redox', 'aarch64-wrs-vxworks']
# [[traversal-excludes.ids]]
# name = 'fixtures'
Expand Down
2 changes: 1 addition & 1 deletion fixtures/guppy/hakari/metadata_guppy_869476c-0.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# resolver = 'install'
# unify-target-host = 'none'
# output-single-feature = false
# dep-format-version = '3'
# dep-format-version = '4'
# platforms = ['x86_64-wrs-vxworks', 'aarch64_be-unknown-linux-gnu']
# [[traversal-excludes.ids]]
# name = 'bit-set'
Expand Down
104 changes: 52 additions & 52 deletions fixtures/guppy/hakari/metadata_guppy_869476c-1.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# resolver = '1'
# unify-target-host = 'none'
# output-single-feature = true
# dep-format-version = '2'
# dep-format-version = '3'
# platforms = ['wasm32-wasi']
# [[traversal-excludes.ids]]
# name = 'byteorder'
Expand All @@ -27,51 +27,51 @@
# crates-io = true

[dependencies]
aho-corasick = { version = "0.7", features = ["std"] }
aho-corasick = { version = "0.7" }
ansi_term = { version = "0.11", default-features = false }
anyhow = { version = "1", features = ["std"] }
anyhow = { version = "1" }
ascii = { version = "0.9", default-features = false, features = ["std"] }
assert_matches = { version = "1", default-features = false }
atty = { version = "0.2", default-features = false }
bit-set = { version = "0.5", features = ["std"] }
bit-set = { version = "0.5" }
bit-vec = { version = "0.6", default-features = false, features = ["std"] }
bitflags = { version = "1" }
bitmaps = { version = "2", features = ["std"] }
bstr = { version = "0.2", features = ["lazy_static", "regex-automata", "serde", "serde1", "serde1-nostd", "std", "unicode"] }
bitmaps = { version = "2" }
bstr = { version = "0.2", features = ["serde1"] }
bytesize = { version = "1", default-features = false }
cargo = { git = "https://github.com/rust-lang/cargo.git", rev = "0227f048fcb7c798026ede6cc20c92befc84c3a4", default-features = false }
cargo-platform = { git = "https://github.com/rust-lang/cargo.git", rev = "0227f048fcb7c798026ede6cc20c92befc84c3a4", default-features = false }
cargo_metadata = { version = "0.11" }
cast = { version = "0.2", features = ["std"] }
cast = { version = "0.2" }
cfg-expr = { version = "0.4" }
cfg-if = { version = "0.1", default-features = false }
chrono = { version = "0.4", features = ["clock", "libc", "oldtime", "std", "time", "winapi"] }
clap = { version = "2", features = ["ansi_term", "atty", "color", "strsim", "suggestions", "vec_map"] }
combine = { version = "3", features = ["std"] }
console = { version = "0.11", features = ["ansi-parsing", "regex", "unicode-width", "winapi-util", "windows-console-colors"] }
chrono = { version = "0.4" }
clap = { version = "2" }
combine = { version = "3" }
console = { version = "0.11" }
crates-io = { git = "https://github.com/rust-lang/cargo.git", rev = "0227f048fcb7c798026ede6cc20c92befc84c3a4", default-features = false }
crc32fast = { version = "1", features = ["std"] }
crc32fast = { version = "1" }
criterion = { version = "0.3" }
criterion-plot = { version = "0.4", default-features = false }
crossbeam-channel = { version = "0.4", default-features = false }
crossbeam-deque = { version = "0.7", default-features = false }
crossbeam-epoch = { version = "0.8", features = ["lazy_static", "std"] }
crossbeam-utils = { version = "0.7", features = ["lazy_static", "std"] }
crossbeam-epoch = { version = "0.8" }
crossbeam-utils = { version = "0.7" }
crypto-hash = { version = "0.3", default-features = false }
csv-core = { version = "0.1" }
curl = { version = "0.4", features = ["http2", "openssl-probe", "openssl-sys", "ssl"] }
curl-sys = { version = "0.4", features = ["http2", "libnghttp2-sys", "openssl-sys", "ssl"] }
curl = { version = "0.4", features = ["http2"] }
curl-sys = { version = "0.4", features = ["http2"] }
dialoguer = { version = "0.6", default-features = false }
difference = { version = "2" }
diffus = { version = "0.9" }
either = { version = "1", features = ["use_std"] }
env_logger = { version = "0.7", features = ["atty", "humantime", "regex", "termcolor"] }
either = { version = "1" }
env_logger = { version = "0.7" }
filetime = { version = "0.2", default-features = false }
fixedbitset = { version = "0.2", default-features = false }
flate2 = { version = "1", default-features = false, features = ["any_zlib", "libz-sys", "zlib"] }
fnv = { version = "1", features = ["std"] }
flate2 = { version = "1", default-features = false, features = ["zlib"] }
fnv = { version = "1" }
getrandom = { version = "0.1", default-features = false, features = ["std"] }
git2 = { version = "0.13", features = ["https", "openssl-probe", "openssl-sys", "ssh", "ssh_key_from_memory"] }
git2 = { version = "0.13" }
git2-curl = { version = "0.14", default-features = false }
glob = { version = "0.3", default-features = false }
globset = { version = "0.4", default-features = false }
Expand All @@ -85,28 +85,28 @@ idna = { version = "0.2", default-features = false }
ignore = { version = "0.4", default-features = false }
im-rc = { version = "15", default-features = false }
indexmap = { version = "1", default-features = false }
itertools-c38e5c1d305a1b54 = { package = "itertools", version = "0.8", features = ["use_std"] }
itertools-274715c4dabd11b0 = { package = "itertools", version = "0.9", features = ["use_std"] }
itoa = { version = "0.4", features = ["std"] }
itertools-c38e5c1d305a1b54 = { package = "itertools", version = "0.8" }
itertools-274715c4dabd11b0 = { package = "itertools", version = "0.9" }
itoa = { version = "0.4" }
jobserver = { version = "0.1", default-features = false }
lazy_static = { version = "1", default-features = false }
lazycell = { version = "1", default-features = false }
libc = { version = "0.2", features = ["std"] }
libgit2-sys = { version = "0.12", default-features = false, features = ["https", "libssh2-sys", "openssl-sys", "ssh", "ssh_key_from_memory"] }
libc = { version = "0.2" }
libgit2-sys = { version = "0.12", default-features = false, features = ["https", "ssh", "ssh_key_from_memory"] }
libnghttp2-sys = { version = "0.1", default-features = false }
libssh2-sys = { version = "0.2", default-features = false }
libz-sys = { version = "1", default-features = false, features = ["libc"] }
linked-hash-map = { version = "0.5", default-features = false }
log = { version = "0.4", default-features = false, features = ["std"] }
matches = { version = "0.1", default-features = false }
maybe-uninit = { version = "2", default-features = false }
memchr = { version = "2", features = ["std", "use_std"] }
memchr = { version = "2", features = ["use_std"] }
memoffset = { version = "0.5" }
nested = { version = "0.1", default-features = false }
num-integer = { version = "0.1", default-features = false }
num-traits = { version = "0.2", features = ["std"] }
num-traits = { version = "0.2" }
num_cpus = { version = "1", default-features = false }
once_cell = { version = "1", features = ["std"] }
once_cell = { version = "1" }
oorandom = { version = "11", default-features = false }
opener = { version = "0.4", default-features = false }
pathdiff = { version = "0.2", default-features = false }
Expand All @@ -115,33 +115,33 @@ petgraph = { version = "0.5", default-features = false }
plotters = { version = "0.2", default-features = false, features = ["area_series", "line_series", "svg"] }
ppv-lite86 = { version = "0.2", default-features = false, features = ["simd", "std"] }
pretty_assertions = { version = "0.6", default-features = false }
proptest = { version = "0.10", features = ["bit-set", "break-dead-code", "fork", "lazy_static", "quick-error", "regex-syntax", "rusty-fork", "std", "tempfile", "timeout"] }
proptest = { version = "0.10" }
quick-error = { version = "1", default-features = false }
rand = { version = "0.7", features = ["alloc", "getrandom", "getrandom_package", "libc", "std"] }
rand = { version = "0.7" }
rand_chacha = { version = "0.2", default-features = false, features = ["std"] }
rand_core = { version = "0.5", default-features = false, features = ["alloc", "getrandom", "std"] }
rand_core = { version = "0.5", default-features = false, features = ["std"] }
rand_xorshift = { version = "0.2", default-features = false }
rand_xoshiro = { version = "0.4", default-features = false }
rayon = { version = "1", default-features = false }
rayon-core = { version = "1", default-features = false }
regex = { version = "1", features = ["aho-corasick", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "thread_local", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] }
regex = { version = "1" }
regex-automata = { version = "0.1", default-features = false }
regex-syntax = { version = "0.6", features = ["unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] }
regex-syntax = { version = "0.6" }
remove_dir_all = { version = "0.5", default-features = false }
rustc-workspace-hack = { version = "1", default-features = false }
rustfix = { version = "0.5", default-features = false }
rusty-fork = { version = "0.3", default-features = false, features = ["timeout", "wait-timeout"] }
rusty-fork = { version = "0.3", default-features = false, features = ["timeout"] }
ryu = { version = "1", default-features = false }
same-file = { version = "1", default-features = false }
scopeguard = { version = "1", default-features = false }
semver-93f6ce9d446188ac = { package = "semver", version = "0.10", features = ["serde"] }
semver-parser = { version = "0.7", default-features = false }
serde = { version = "1", features = ["derive", "serde_derive", "std"] }
serde_cbor = { version = "0.11", features = ["std"] }
serde = { version = "1", features = ["derive"] }
serde_cbor = { version = "0.11" }
serde_ignored = { version = "0.1", default-features = false }
serde_json = { version = "1", features = ["raw_value", "std"] }
serde_json = { version = "1", features = ["raw_value"] }
shell-escape = { version = "0.1", default-features = false }
sized-chunks = { version = "0.6", features = ["std"] }
sized-chunks = { version = "0.6" }
smallvec = { version = "1", default-features = false }
socket2 = { version = "0.3", default-features = false }
strip-ansi-escapes = { version = "0.1", default-features = false }
Expand All @@ -161,7 +161,7 @@ toml = { version = "0.5" }
toml_edit = { version = "0.2", default-features = false }
typenum = { version = "1", default-features = false }
unicode-bidi = { version = "0.3" }
unicode-normalization = { version = "0.1", features = ["std"] }
unicode-normalization = { version = "0.1" }
unicode-width = { version = "0.1" }
unicode-xid-6f8ce4dd05d13bba = { package = "unicode-xid", version = "0.2" }
unreachable = { version = "1", default-features = false }
Expand All @@ -174,24 +174,24 @@ wait-timeout = { version = "0.2", default-features = false }

[build-dependencies]
autocfg = { version = "1", default-features = false }
cc = { version = "1", default-features = false, features = ["jobserver", "parallel"] }
cc = { version = "1", default-features = false, features = ["parallel"] }
heck = { version = "0.3", default-features = false }
jobserver = { version = "0.1", default-features = false }
pkg-config = { version = "0.3", default-features = false }
proc-macro-error = { version = "1", features = ["syn", "syn-error"] }
proc-macro-error = { version = "1" }
proc-macro-error-attr = { version = "1", default-features = false }
proc-macro2-9fbad63c4bcf4a8f = { package = "proc-macro2", version = "0.4", features = ["proc-macro"] }
proc-macro2-dff4ba8e3ae991db = { package = "proc-macro2", version = "1", features = ["proc-macro"] }
proc-macro2-9fbad63c4bcf4a8f = { package = "proc-macro2", version = "0.4" }
proc-macro2-dff4ba8e3ae991db = { package = "proc-macro2", version = "1" }
proptest-derive = { version = "0.2", default-features = false }
quote-3b31131e45eafb45 = { package = "quote", version = "0.6", features = ["proc-macro"] }
quote-dff4ba8e3ae991db = { package = "quote", version = "1", features = ["proc-macro"] }
quote-3b31131e45eafb45 = { package = "quote", version = "0.6" }
quote-dff4ba8e3ae991db = { package = "quote", version = "1" }
rustc_version = { version = "0.2", default-features = false }
semver-274715c4dabd11b0 = { package = "semver", version = "0.9" }
semver-parser = { version = "0.7", default-features = false }
serde_derive = { version = "1" }
structopt-derive = { version = "0.4", default-features = false }
syn-3575ec1268b04181 = { package = "syn", version = "0.15", features = ["clone-impls", "derive", "extra-traits", "full", "parsing", "printing", "proc-macro", "quote", "visit"] }
syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["clone-impls", "derive", "full", "parsing", "printing", "proc-macro", "quote", "visit"] }
syn-3575ec1268b04181 = { package = "syn", version = "0.15", features = ["extra-traits", "full", "visit"] }
syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["full", "visit"] }
unicode-segmentation = { version = "1", default-features = false }
unicode-xid-c65f7effa3be6d31 = { package = "unicode-xid", version = "0.1" }
unicode-xid-6f8ce4dd05d13bba = { package = "unicode-xid", version = "0.2" }
Expand All @@ -205,10 +205,10 @@ js-sys = { version = "0.3", default-features = false }
miniz_oxide = { version = "0.4", default-features = false }
openssl = { version = "0.10", default-features = false }
openssl-sys = { version = "0.9", default-features = false }
wasi-93f6ce9d446188ac = { package = "wasi", version = "0.10", features = ["std"] }
wasi-274715c4dabd11b0 = { package = "wasi", version = "0.9", features = ["std"] }
wasm-bindgen = { version = "0.2", features = ["spans", "std"] }
web-sys = { version = "0.3", default-features = false, features = ["CanvasRenderingContext2d", "Document", "DomRect", "DomRectReadOnly", "Element", "EventTarget", "HtmlCanvasElement", "HtmlElement", "Node", "Window"] }
wasi-93f6ce9d446188ac = { package = "wasi", version = "0.10" }
wasi-274715c4dabd11b0 = { package = "wasi", version = "0.9" }
wasm-bindgen = { version = "0.2" }
web-sys = { version = "0.3", default-features = false, features = ["CanvasRenderingContext2d", "Document", "DomRect", "HtmlCanvasElement", "Window"] }

[target.wasm32-wasi.build-dependencies]
bumpalo = { version = "3" }
Expand Down

0 comments on commit 6de7f75

Please sign in to comment.