Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[guppy] update cfg-expr + fixtures #360

Merged
merged 1 commit into from
Dec 22, 2024
+636 −877
Merged

[guppy] update cfg-expr + fixtures #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
# This matches the cfg-expr version.
- uses: dtolnay/rust-toolchain@1.81.0
- uses: dtolnay/rust-toolchain@1.83.0
- uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2
- name: Build and test
run: cargo test --package cargo-compare --release
Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ members = [

[workspace.dependencies]
ahash = "0.8.11"
cfg-expr = "0.17.2"
datatest-stable = "0.2.10"
guppy-workspace-hack = "0.1.0"
insta = "1.41.1"
Expand Down
2 changes: 1 addition & 1 deletion fixtures/guppy/hakari/metadata_guppy_44b62fa-0.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# output-single-feature = false
# dep-format-version = '3'
# workspace-hack-line-style = 'full'
# platforms = ['powerpc64-unknown-freebsd', 'thumbv7neon-unknown-linux-gnueabihf']
# platforms = ['riscv32e-unknown-none-elf', 'thumbv7m-nuttx-eabi']
# [[traversal-excludes.ids]]
# name = 'cargo-compare'
# version = '0.1.0'
Expand Down
2 changes: 1 addition & 1 deletion fixtures/guppy/hakari/metadata_guppy_44b62fa-2.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# output-single-feature = true
# dep-format-version = '2'
# workspace-hack-line-style = 'full'
# platforms = ['aarch64-unknown-freebsd', 'armv7-linux-androideabi']
# platforms = ['aarch64-unknown-illumos', 'armv7-unknown-freebsd']
#
# [traversal-excludes]
# [[final-excludes.ids]]
Expand Down
11 changes: 7 additions & 4 deletions fixtures/guppy/hakari/metadata_guppy_78cb7e8-1.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# output-single-feature = false
# dep-format-version = '1'
# workspace-hack-line-style = 'full'
# platforms = ['powerpc64-unknown-linux-gnu', 'riscv64gc-unknown-hermit', 'mipsel-unknown-none']
# platforms = ['riscv32e-unknown-none-elf', 'riscv64gc-unknown-linux-musl', 'powerpc-unknown-freebsd']
# [[traversal-excludes.ids]]
# name = 'pathdiff'
# version = '0.2.0'
Expand Down Expand Up @@ -60,13 +60,16 @@ proc-macro2 = { version = "1", features = ["proc-macro"] }
quote = { version = "1", features = ["proc-macro"] }
syn = { version = "1", features = ["clone-impls", "derive", "full", "parsing", "printing", "proc-macro", "quote", "visit"] }

[target.powerpc64-unknown-linux-gnu.dependencies]
[target.riscv64gc-unknown-linux-musl.dependencies]
libc = { version = "0.2", features = ["std"] }

[target.powerpc64-unknown-linux-gnu.build-dependencies]
[target.riscv64gc-unknown-linux-musl.build-dependencies]
libc = { version = "0.2", features = ["std"] }

[target.riscv64gc-unknown-hermit.dependencies]
[target.powerpc-unknown-freebsd.dependencies]
libc = { version = "0.2", features = ["std"] }

[target.powerpc-unknown-freebsd.build-dependencies]
libc = { version = "0.2", features = ["std"] }

### END HAKARI SECTION
Expand Down
6 changes: 3 additions & 3 deletions fixtures/guppy/hakari/metadata_guppy_78cb7e8-2.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# output-single-feature = true
# dep-format-version = '4'
# workspace-hack-line-style = 'full'
# platforms = ['aarch64-apple-visionos-sim']
# platforms = ['aarch64-apple-watchos']
#
# [traversal-excludes]
# [[final-excludes.ids]]
Expand Down Expand Up @@ -333,7 +333,7 @@ void = { version = "1", default-features = false }
vte = { version = "0.3", default-features = false }
walkdir = { version = "2", default-features = false }

[target.aarch64-apple-visionos-sim.dependencies]
[target.aarch64-apple-watchos.dependencies]
foreign-types = { version = "0.3", default-features = false }
foreign-types-shared = { version = "0.1", default-features = false }
openssl = { version = "0.10", default-features = false }
Expand All @@ -343,7 +343,7 @@ ppv-lite86 = { version = "0.2", default-features = false, features = ["std"] }
rand_chacha = { version = "0.2", default-features = false, features = ["std"] }
termios = { version = "0.3", default-features = false }

[target.aarch64-apple-visionos-sim.build-dependencies]
[target.aarch64-apple-watchos.build-dependencies]
foreign-types = { version = "0.3", default-features = false }
foreign-types-shared = { version = "0.1", default-features = false }
openssl = { version = "0.10", default-features = false }
Expand Down
12 changes: 9 additions & 3 deletions fixtures/guppy/hakari/metadata_guppy_78cb7e8-3.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# output-single-feature = false
# dep-format-version = '4'
# workspace-hack-line-style = 'version-only'
# platforms = ['powerpc-unknown-linux-gnu', 'x86_64h-apple-darwin', 'aarch64-unknown-uefi']
# platforms = ['powerpc64-unknown-freebsd', 'x86_64h-apple-darwin', 'aarch64-wrs-vxworks']
# [[traversal-excludes.ids]]
# name = 'fixtures'
# version = '0.1.0'
Expand Down Expand Up @@ -75,10 +75,10 @@ proc-macro2 = { version = "1" }
quote = { version = "1" }
syn = { version = "1", features = ["full", "visit"] }

[target.powerpc-unknown-linux-gnu.dependencies]
[target.powerpc64-unknown-freebsd.dependencies]
libc = { version = "0.2" }

[target.powerpc-unknown-linux-gnu.build-dependencies]
[target.powerpc64-unknown-freebsd.build-dependencies]
libc = { version = "0.2" }

[target.x86_64h-apple-darwin.dependencies]
Expand All @@ -87,6 +87,12 @@ libc = { version = "0.2" }
[target.x86_64h-apple-darwin.build-dependencies]
libc = { version = "0.2" }

[target.aarch64-wrs-vxworks.dependencies]
libc = { version = "0.2" }

[target.aarch64-wrs-vxworks.build-dependencies]
libc = { version = "0.2" }

### END HAKARI SECTION

# This part of the file should be preserved at the end.
4 changes: 2 additions & 2 deletions fixtures/guppy/hakari/metadata_guppy_869476c-0.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# output-single-feature = false
# dep-format-version = '4'
# workspace-hack-line-style = 'workspace-dotted'
# platforms = ['xtensa-esp32s3-none-elf', 'aarch64-wrs-vxworks']
# platforms = ['xtensa-esp32s3-none-elf', 'aarch64_be-unknown-linux-gnu_ilp32']
# [[traversal-excludes.ids]]
# name = 'bit-set'
# version = '0.5.2'
Expand Down Expand Up @@ -63,7 +63,7 @@ serde_json = { version = "1", features = ["raw_value"] }
proc-macro2 = { version = "1" }
syn = { version = "1", features = ["full", "visit"] }

[target.aarch64-wrs-vxworks.dependencies]
[target.aarch64_be-unknown-linux-gnu_ilp32.dependencies]
libc = { version = "0.2" }

### END HAKARI SECTION
Expand Down
21 changes: 19 additions & 2 deletions fixtures/guppy/hakari/metadata_guppy_869476c-1.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# output-single-feature = true
# dep-format-version = '3'
# workspace-hack-line-style = 'full'
# platforms = ['wasm64-unknown-unknown']
# platforms = ['wasm32-wasip1']
# [[traversal-excludes.ids]]
# name = 'byteorder'
# version = '1.3.4'
Expand Down Expand Up @@ -198,11 +198,28 @@ unicode-xid-c65f7effa3be6d31 = { package = "unicode-xid", version = "0.1" }
unicode-xid-6f8ce4dd05d13bba = { package = "unicode-xid", version = "0.2" }
version_check = { version = "0.9", default-features = false }

[target.wasm64-unknown-unknown.dependencies]
[target.wasm32-wasip1.dependencies]
adler = { version = "0.2", default-features = false }
foreign-types = { version = "0.3", default-features = false }
foreign-types-shared = { version = "0.1", default-features = false }
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" }
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-wasip1.build-dependencies]
bumpalo = { version = "3" }
cfg-if = { version = "0.1", default-features = false }
lazy_static = { version = "1", default-features = false }
log = { version = "0.4", default-features = false }
wasm-bindgen-backend = { version = "0.2", default-features = false, features = ["spans"] }
wasm-bindgen-macro = { version = "0.2", default-features = false, features = ["spans"] }
wasm-bindgen-macro-support = { version = "0.2", default-features = false, features = ["spans"] }
wasm-bindgen-shared = { version = "0.2", default-features = false }

### END HAKARI SECTION

Expand Down
26 changes: 9 additions & 17 deletions fixtures/guppy/hakari/metadata_guppy_869476c-3.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# output-single-feature = true
# dep-format-version = '1'
# workspace-hack-line-style = 'version-only'
# platforms = ['aarch64-uwp-windows-msvc']
# platforms = ['aarch64_be-unknown-linux-gnu_ilp32']
# [[traversal-excludes.ids]]
# name = 'openssl'
# version = '0.10.30'
Expand Down Expand Up @@ -357,23 +357,15 @@ void = { version = "1", default-features = false }
wait-timeout = { version = "0.2", default-features = false }
walkdir = { version = "2", default-features = false }

[target.aarch64-uwp-windows-msvc.dependencies]
encode_unicode = { version = "0.3", features = ["std"] }
miow = { version = "0.3", default-features = false }
output_vt100 = { version = "0.1", default-features = false }
schannel = { version = "0.1", default-features = false }
winapi = { version = "0.3", default-features = false, features = ["basetsd", "consoleapi", "errhandlingapi", "fileapi", "handleapi", "ioapiset", "jobapi", "jobapi2", "libloaderapi", "lmcons", "memoryapi", "minschannel", "minwinbase", "minwindef", "namedpipeapi", "ntdef", "ntstatus", "processenv", "processthreadsapi", "profileapi", "psapi", "schannel", "securitybaseapi", "shellapi", "shlobj", "sspi", "std", "synchapi", "sysinfoapi", "timezoneapi", "winbase", "wincon", "wincrypt", "winerror", "winnt", "winsock2", "winuser", "ws2def", "ws2ipdef", "ws2tcpip"] }
winapi-util = { version = "0.1", default-features = false }
[target.aarch64_be-unknown-linux-gnu_ilp32.dependencies]
openssl-probe = { version = "0.1", default-features = false }
openssl-sys = { version = "0.9", default-features = false }
termios = { version = "0.3", default-features = false }

[target.aarch64-uwp-windows-msvc.build-dependencies]
ctor = { version = "0.1", default-features = false }
encode_unicode = { version = "0.3", features = ["std"] }
miow = { version = "0.3", default-features = false }
output_vt100 = { version = "0.1", default-features = false }
schannel = { version = "0.1", default-features = false }
vcpkg = { version = "0.2", default-features = false }
winapi = { version = "0.3", default-features = false, features = ["basetsd", "consoleapi", "errhandlingapi", "fileapi", "handleapi", "ioapiset", "jobapi", "jobapi2", "libloaderapi", "lmcons", "memoryapi", "minschannel", "minwinbase", "minwindef", "namedpipeapi", "ntdef", "ntstatus", "processenv", "processthreadsapi", "profileapi", "psapi", "schannel", "securitybaseapi", "shellapi", "shlobj", "sspi", "std", "synchapi", "sysinfoapi", "timezoneapi", "winbase", "wincon", "wincrypt", "winerror", "winnt", "winsock2", "winuser", "ws2def", "ws2ipdef", "ws2tcpip"] }
winapi-util = { version = "0.1", default-features = false }
[target.aarch64_be-unknown-linux-gnu_ilp32.build-dependencies]
openssl-probe = { version = "0.1", default-features = false }
openssl-sys = { version = "0.9", default-features = false }
termios = { version = "0.3", default-features = false }

### END HAKARI SECTION

Expand Down
9 changes: 7 additions & 2 deletions fixtures/guppy/hakari/metadata_guppy_c9b4f76-1.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# output-single-feature = true
# dep-format-version = '2'
# workspace-hack-line-style = 'full'
# platforms = ['xtensa-esp32-none-elf']
# platforms = ['xtensa-esp32-espidf']
# [[traversal-excludes.ids]]
# name = 'git2-curl'
# version = '0.14.1'
Expand Down Expand Up @@ -216,11 +216,16 @@ unicode-xid-c65f7effa3be6d31 = { package = "unicode-xid", version = "0.1" }
unicode-xid-6f8ce4dd05d13bba = { package = "unicode-xid", version = "0.2" }
version_check = { version = "0.9", default-features = false }

[target.xtensa-esp32-none-elf.dependencies]
[target.xtensa-esp32-espidf.dependencies]
foreign-types = { version = "0.3", default-features = false }
foreign-types-shared = { version = "0.1", default-features = false }
openssl = { version = "0.10", default-features = false }
openssl-probe = { version = "0.1", default-features = false }
openssl-sys = { version = "0.9", default-features = false }
termios = { version = "0.3", default-features = false }

[target.xtensa-esp32-espidf.build-dependencies]
libc = { version = "0.2", features = ["std"] }

### END HAKARI SECTION

Expand Down
22 changes: 17 additions & 5 deletions fixtures/guppy/hakari/metadata_guppy_c9b4f76-3.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# output-single-feature = true
# dep-format-version = '3'
# workspace-hack-line-style = 'full'
# platforms = ['aarch64-linux-android', 'i686-unknown-linux-gnu', 'x86_64-unknown-linux-none']
# platforms = ['aarch64-pc-windows-msvc', 'i686-uwp-windows-gnu', 'x86_64-unknown-linux-none']
# [[traversal-excludes.ids]]
# name = 'cargo-compare'
# version = '0.1.0'
Expand Down Expand Up @@ -142,15 +142,27 @@ unicode-xid-c65f7effa3be6d31 = { package = "unicode-xid", version = "0.1" }
unicode-xid-6f8ce4dd05d13bba = { package = "unicode-xid", version = "0.2" }
version_check = { version = "0.9", default-features = false }

[target.aarch64-linux-android.dependencies]
[target.aarch64-pc-windows-msvc.dependencies]
encode_unicode = { version = "0.3" }
output_vt100 = { version = "0.1", default-features = false }
ppv-lite86 = { version = "0.2", default-features = false, features = ["simd", "std"] }
rand_chacha = { version = "0.2", default-features = false, features = ["std"] }
termios = { version = "0.3", default-features = false }
winapi = { version = "0.3", default-features = false, features = ["consoleapi", "errhandlingapi", "fileapi", "handleapi", "minwinbase", "minwindef", "ntdef", "processenv", "profileapi", "std", "sysinfoapi", "timezoneapi", "winbase", "wincon", "winerror", "winnt", "winuser"] }
winapi-util = { version = "0.1", default-features = false }

[target.aarch64-pc-windows-msvc.build-dependencies]
ctor = { version = "0.1", default-features = false }

[target.i686-unknown-linux-gnu.dependencies]
[target.i686-uwp-windows-gnu.dependencies]
encode_unicode = { version = "0.3" }
output_vt100 = { version = "0.1", default-features = false }
ppv-lite86 = { version = "0.2", default-features = false, features = ["simd", "std"] }
rand_chacha = { version = "0.2", default-features = false, features = ["std"] }
termios = { version = "0.3", default-features = false }
winapi = { version = "0.3", default-features = false, features = ["consoleapi", "errhandlingapi", "fileapi", "handleapi", "minwinbase", "minwindef", "ntdef", "processenv", "profileapi", "std", "sysinfoapi", "timezoneapi", "winbase", "wincon", "winerror", "winnt", "winuser"] }
winapi-util = { version = "0.1", default-features = false }

[target.i686-uwp-windows-gnu.build-dependencies]
ctor = { version = "0.1", default-features = false }

[target.x86_64-unknown-linux-none.dependencies]
ppv-lite86 = { version = "0.2", default-features = false, features = ["simd", "std"] }
Expand Down
2 changes: 1 addition & 1 deletion fixtures/guppy/summaries/metadata_guppy_44b62fa-0.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ include-dev = true
initials-platform = 'standard'

[metadata.host-platform]
triple = 'aarch64_be-unknown-linux-gnu_ilp32'
triple = 'arm-linux-androideabi'
target-features = 'unknown'
flags = ['foo']

Expand Down
2 changes: 1 addition & 1 deletion fixtures/guppy/summaries/metadata_guppy_44b62fa-1.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ initials-platform = 'host'
spec = 'any'

[metadata.target-platform]
triple = 'm68k-unknown-linux-gnu'
triple = 'mips64-unknown-linux-muslabi64'
target-features = ['bmi1', 'xsaveopt']
[[metadata.omitted-packages.ids]]
name = 'guppy-summaries'
Expand Down
4 changes: 2 additions & 2 deletions fixtures/guppy/summaries/metadata_guppy_44b62fa-3.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ include-dev = true
initials-platform = 'proc-macros-on-target'

[metadata.host-platform]
triple = 'mipsel-unknown-none'
triple = 'powerpc-unknown-linux-gnu'
target-features = ['sse2', 'sse3']
flags = ['abc', 'cargo_web']

[metadata.target-platform]
triple = 'x86_64-fortanix-unknown-sgx'
triple = 'x86_64-apple-tvos'
target-features = 'unknown'
flags = ['foo']

Expand Down
4 changes: 2 additions & 2 deletions fixtures/guppy/summaries/metadata_guppy_44b62fa-4.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ include-dev = false
initials-platform = 'proc-macros-on-target'

[metadata.host-platform]
triple = 'powerpc64-ibm-aix'
triple = 'powerpc64le-unknown-linux-musl'
target-features = ['avx2', 'bmi2', 'fma', 'sse', 'sse3', 'xsaveopt']
flags = ['foo']

[metadata.target-platform]
triple = 'riscv32imc-esp-espidf'
triple = 'riscv64-wrs-vxworks'
target-features = 'unknown'
flags = ['abc', 'foo']

Expand Down
4 changes: 2 additions & 2 deletions fixtures/guppy/summaries/metadata_guppy_44b62fa-6.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ include-dev = false
initials-platform = 'host'

[metadata.host-platform]
triple = 'arm-unknown-linux-musleabihf'
triple = 'arm64e-apple-tvos'
target-features = 'unknown'
flags = ['bar', 'cargo_web']

[metadata.target-platform]
triple = 'nvptx64-nvidia-cuda'
triple = 'powerpc-wrs-vxworks'
target-features = []
flags = ['flag-test']

Expand Down
4 changes: 2 additions & 2 deletions fixtures/guppy/summaries/metadata_guppy_44b62fa-7.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ include-dev = false
initials-platform = 'proc-macros-on-target'

[metadata.host-platform]
triple = 'powerpc64-unknown-freebsd'
triple = 'riscv32-wrs-vxworks'
target-features = 'unknown'
flags = ['flag-test']

[metadata.target-platform]
triple = 'i686-unknown-uefi'
triple = 'loongarch64-unknown-linux-musl'
target-features = ['aes', 'sse3', 'ssse3', 'xsave']
flags = ['flag-test']
[[metadata.omitted-packages.ids]]
Expand Down
2 changes: 1 addition & 1 deletion fixtures/guppy/summaries/metadata_guppy_78cb7e8-0.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ initials-platform = 'host'
spec = 'always'

[metadata.target-platform]
triple = 'bpfeb-unknown-none'
triple = 'hexagon-unknown-linux-musl'
target-features = ['bmi1', 'sse3', 'sse4.2']

[[host-package]]
Expand Down
Loading
Loading