[guppy] add support for resolver v3

Resolver version 3 works the same as version 2. A lot of our fixes need to be updated as a result of v3 now being probabilistically generated.
guppy-rs · Dec 22, 2024 · c1bf2b1 · c1bf2b1
1 parent 36aaf04
commit c1bf2b1
Show file tree

Hide file tree

Showing 138 changed files with 14,358 additions and 14,109 deletions.
diff --git a/fixtures/guppy/hakari/metadata_guppy_44b62fa-0.toml b/fixtures/guppy/hakari/metadata_guppy_44b62fa-0.toml
@@ -2,8 +2,8 @@
 #    cargo run -p fixture-manager -- generate-hakari --fixture metadata_guppy_44b62fa
 
 ### BEGIN HAKARI SECTION
-# resolver = '1'
-# unify-target-host = 'unify-if-both'
+# resolver = 'install'
+# unify-target-host = 'auto'
 # output-single-feature = false
 # dep-format-version = '3'
 # workspace-hack-line-style = 'full'
@@ -19,24 +19,14 @@
 # workspace-path = 'cargo-guppy'
 #
 # [[traversal-excludes.ids]]
-# name = 'cargo-hakari'
-# version = '0.9.11'
-# workspace-path = 'tools/cargo-hakari'
-#
-# [[traversal-excludes.ids]]
-# name = 'fixtures'
+# name = 'fixture-manager'
 # version = '0.1.0'
-# workspace-path = 'fixtures'
+# workspace-path = 'internal-tools/fixture-manager'
 #
 # [[traversal-excludes.ids]]
 # name = 'proptest-ext'
 # version = '0.1.0'
 # workspace-path = 'internal-tools/proptest-ext'
-#
-# [[traversal-excludes.ids]]
-# name = 'target-spec'
-# version = '0.9.0'
-# workspace-path = 'target-spec'
 # [[final-excludes.ids]]
 # name = 'cargo-compare'
 # version = '0.1.0'
@@ -46,6 +36,21 @@
 # name = 'cargo-hakari'
 # version = '0.9.11'
 # workspace-path = 'tools/cargo-hakari'
+#
+# [[final-excludes.ids]]
+# name = 'fixture-manager'
+# version = '0.1.0'
+# workspace-path = 'internal-tools/fixture-manager'
+#
+# [[final-excludes.ids]]
+# name = 'guppy-cmdlib'
+# version = '0.1.0'
+# workspace-path = 'guppy-cmdlib'
+#
+# [[final-excludes.ids]]
+# name = 'hakari'
+# version = '0.8.1'
+# workspace-path = 'tools/hakari'
 
 ### END HAKARI SECTION
 

diff --git a/fixtures/guppy/hakari/metadata_guppy_44b62fa-1.toml b/fixtures/guppy/hakari/metadata_guppy_44b62fa-1.toml
@@ -2,50 +2,40 @@
 #    cargo run -p fixture-manager -- generate-hakari --fixture metadata_guppy_44b62fa
 
 ### BEGIN HAKARI SECTION
-# resolver = 'install'
-# unify-target-host = 'unify-if-both'
+# resolver = '2'
+# unify-target-host = 'none'
 # output-single-feature = false
-# dep-format-version = '1'
+# dep-format-version = '2'
 # workspace-hack-line-style = 'full'
 # platforms = []
 # [[traversal-excludes.ids]]
-# name = 'cargo-hakari'
-# version = '0.9.11'
-# workspace-path = 'tools/cargo-hakari'
-#
-# [[traversal-excludes.ids]]
-# name = 'fixtures'
-# version = '0.1.0'
-# workspace-path = 'fixtures'
+# name = 'determinator'
+# version = '0.7.0'
+# workspace-path = 'tools/determinator'
 #
 # [[traversal-excludes.ids]]
-# name = 'guppy-benchmarks'
+# name = 'guppy-cmdlib'
 # version = '0.1.0'
-# workspace-path = 'internal-tools/benchmarks'
+# workspace-path = 'guppy-cmdlib'
 #
 # [[traversal-excludes.ids]]
-# name = 'hakari'
-# version = '0.8.1'
-# workspace-path = 'tools/hakari'
+# name = 'target-spec'
+# version = '0.9.0'
+# workspace-path = 'target-spec'
 # [[final-excludes.ids]]
 # name = 'cargo-compare'
 # version = '0.1.0'
 # workspace-path = 'internal-tools/cargo-compare'
 #
 # [[final-excludes.ids]]
-# name = 'cargo-guppy'
-# version = '0.1.0'
-# workspace-path = 'cargo-guppy'
-#
-# [[final-excludes.ids]]
 # name = 'cargo-hakari'
 # version = '0.9.11'
 # workspace-path = 'tools/cargo-hakari'
 #
 # [[final-excludes.ids]]
-# name = 'determinator'
-# version = '0.7.0'
-# workspace-path = 'tools/determinator'
+# name = 'guppy-summaries'
+# version = '0.6.1'
+# workspace-path = 'guppy-summaries'
 #
 # [[final-excludes.ids]]
 # name = 'guppy-workspace-hack'
@@ -56,11 +46,6 @@
 # name = 'hakari'
 # version = '0.8.1'
 # workspace-path = 'tools/hakari'
-#
-# [[final-excludes.ids]]
-# name = 'proptest-ext'
-# version = '0.1.0'
-# workspace-path = 'internal-tools/proptest-ext'
 
 ### END HAKARI SECTION
 

diff --git a/fixtures/guppy/hakari/metadata_guppy_44b62fa-2.toml b/fixtures/guppy/hakari/metadata_guppy_44b62fa-2.toml
@@ -2,18 +2,60 @@
 #    cargo run -p fixture-manager -- generate-hakari --fixture metadata_guppy_44b62fa
 
 ### BEGIN HAKARI SECTION
-# resolver = '2'
+# resolver = '3'
 # unify-target-host = 'replicate-target-on-host'
 # output-single-feature = true
-# dep-format-version = '2'
+# dep-format-version = '1'
 # workspace-hack-line-style = 'full'
 # platforms = ['aarch64-unknown-illumos', 'armv7-unknown-freebsd']
+# [[traversal-excludes.ids]]
+# name = 'cargo-compare'
+# version = '0.1.0'
+# workspace-path = 'internal-tools/cargo-compare'
+#
+# [[traversal-excludes.ids]]
+# name = 'determinator'
+# version = '0.7.0'
+# workspace-path = 'tools/determinator'
+#
+# [[traversal-excludes.ids]]
+# name = 'guppy-summaries'
+# version = '0.6.1'
+# workspace-path = 'guppy-summaries'
+#
+# [[traversal-excludes.ids]]
+# name = 'hakari'
+# version = '0.8.1'
+# workspace-path = 'tools/hakari'
+#
+# [[traversal-excludes.ids]]
+# name = 'proptest-ext'
+# version = '0.1.0'
+# workspace-path = 'internal-tools/proptest-ext'
+# [[final-excludes.ids]]
+# name = 'cargo-guppy'
+# version = '0.1.0'
+# workspace-path = 'cargo-guppy'
+#
+# [[final-excludes.ids]]
+# name = 'determinator'
+# version = '0.7.0'
+# workspace-path = 'tools/determinator'
 #
-# [traversal-excludes]
 # [[final-excludes.ids]]
-# name = 'guppy-cmdlib'
+# name = 'guppy-summaries'
+# version = '0.6.1'
+# workspace-path = 'guppy-summaries'
+#
+# [[final-excludes.ids]]
+# name = 'proptest-ext'
 # version = '0.1.0'
-# workspace-path = 'guppy-cmdlib'
+# workspace-path = 'internal-tools/proptest-ext'
+#
+# [[final-excludes.ids]]
+# name = 'target-spec'
+# version = '0.9.0'
+# workspace-path = 'target-spec'
 
 ### END HAKARI SECTION
 

diff --git a/fixtures/guppy/hakari/metadata_guppy_78cb7e8-0.toml b/fixtures/guppy/hakari/metadata_guppy_78cb7e8-0.toml
@@ -2,54 +2,34 @@
 #    cargo run -p fixture-manager -- generate-hakari --fixture metadata_guppy_78cb7e8
 
 ### BEGIN HAKARI SECTION
-# resolver = '2'
-# unify-target-host = 'unify-if-both'
+# resolver = '3'
+# unify-target-host = 'none'
 # output-single-feature = true
-# dep-format-version = '2'
-# workspace-hack-line-style = 'full'
+# dep-format-version = '1'
+# workspace-hack-line-style = 'version-only'
 # platforms = []
 # [[traversal-excludes.ids]]
-# name = 'csv-core'
-# version = '0.1.10'
+# name = 'rand_hc'
+# version = '0.2.0'
 # crates-io = true
-#
-# [[traversal-excludes.ids]]
-# name = 'git2-curl'
-# version = '0.14.1'
-# crates-io = true
-#
-# [[traversal-excludes.ids]]
-# name = 'opener'
-# version = '0.4.1'
-# crates-io = true
-# [[final-excludes.ids]]
-# name = 'bstr'
-# version = '0.2.13'
-# crates-io = true
-#
-# [[final-excludes.ids]]
-# name = 'criterion-plot'
-# version = '0.4.3'
-# crates-io = true
-#
 # [[final-excludes.ids]]
-# name = 'libssh2-sys'
-# version = '0.2.19'
+# name = 'regex'
+# version = '1.3.9'
 # crates-io = true
 #
 # [[final-excludes.ids]]
-# name = 'pkg-config'
-# version = '0.3.18'
+# name = 'regex-syntax'
+# version = '0.6.18'
 # crates-io = true
 #
 # [[final-excludes.ids]]
-# name = 'sized-chunks'
-# version = '0.6.2'
+# name = 'ryu'
+# version = '1.0.5'
 # crates-io = true
 #
 # [[final-excludes.ids]]
-# name = 'tar'
-# version = '0.4.30'
+# name = 'tinyvec'
+# version = '0.3.4'
 # crates-io = true
 
 [dependencies]
@@ -63,6 +43,7 @@ bit-set = { version = "0.5", features = ["std"] }
 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"] }
 byteorder = { version = "1", default-features = false, features = ["std"] }
 bytesize = { version = "1", default-features = false }
 cargo = { git = "https://github.com/rust-lang/cargo.git", rev = "0227f048fcb7c798026ede6cc20c92befc84c3a4", default-features = false }
@@ -78,12 +59,14 @@ console = { version = "0.11", features = ["ansi-parsing", "regex", "unicode-widt
 crates-io = { git = "https://github.com/rust-lang/cargo.git", rev = "0227f048fcb7c798026ede6cc20c92befc84c3a4", default-features = false }
 crc32fast = { version = "1", features = ["std"] }
 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"] }
 crypto-hash = { version = "0.3", default-features = false }
 csv = { version = "1", 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"] }
 dialoguer = { version = "0.6", default-features = false }
@@ -97,6 +80,7 @@ flate2 = { version = "1", default-features = false, features = ["any_zlib", "lib
 fnv = { version = "1", features = ["std"] }
 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-curl = { version = "0.14", default-features = false }
 glob = { version = "0.3", default-features = false }
 globset = { version = "0.4", default-features = false }
 half = { version = "1", default-features = false }
@@ -119,6 +103,7 @@ 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"] }
 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"] }
@@ -132,6 +117,7 @@ num-traits = { version = "0.2", features = ["std"] }
 num_cpus = { version = "1", default-features = false }
 once_cell = { version = "1", features = ["std"] }
 oorandom = { version = "11", default-features = false }
+opener = { version = "0.4", default-features = false }
 pathdiff = { version = "0.2", default-features = false }
 percent-encoding = { version = "2", default-features = false }
 petgraph = { version = "0.5", default-features = false }
@@ -147,14 +133,11 @@ 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-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"] }
 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"] }
-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"] }
@@ -164,20 +147,21 @@ serde_cbor = { version = "0.11", features = ["std"] }
 serde_ignored = { version = "0.1", default-features = false }
 serde_json = { version = "1", features = ["raw_value", "std"] }
 shell-escape = { version = "0.1", default-features = false }
+sized-chunks = { version = "0.6", features = ["std"] }
 smallvec = { version = "1", default-features = false }
 socket2 = { version = "0.3", default-features = false }
 strip-ansi-escapes = { version = "0.1", default-features = false }
 strsim = { version = "0.8", default-features = false }
 structopt = { version = "0.3" }
 supercow = { version = "0.1", default-features = false }
+tar = { version = "0.4", default-features = false }
 tempfile = { version = "3", default-features = false }
 termcolor = { version = "1", default-features = false }
 terminal_size = { version = "0.1", default-features = false }
 textwrap = { version = "0.11", default-features = false }
 thread_local = { version = "1", default-features = false }
 time = { version = "0.1", default-features = false }
 tinytemplate = { version = "1", default-features = false }
-tinyvec = { version = "0.3", features = ["alloc"] }
 toml = { version = "0.5" }
 toml_edit = { version = "0.2", default-features = false }
 typenum = { version = "1", default-features = false }
@@ -199,6 +183,7 @@ autocfg = { version = "1", default-features = false }
 cc = { version = "1", default-features = false, features = ["jobserver", "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-attr = { version = "1", default-features = false }
 proc-macro2-9fbad63c4bcf4a8f = { package = "proc-macro2", version = "0.4", features = ["proc-macro"] }