Skip to content

Upgrade cfg-expr to support parsing of target_abi cfg #34

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

Merged
sunshowers merged 3 commits into from
Nov 7, 2022
Merged

Upgrade cfg-expr to support parsing of target_abi cfg #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4555d3
Add a failing test for a target spec containing target_abi
carols10cents Nov 7, 2022
ea71b81
Upgrade cfg-expr to 0.12.0
carols10cents Nov 7, 2022
b7f298e
[fixtures] update for new cfg-expr
sunshowers Nov 7, 2022
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@ jobs:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
# 1.60 is the cfg-expr version
toolchain: 1.64.0
# 1.65 is the cfg-expr version
toolchain: 1.65.0
override: true
- uses: Swatinem/rust-cache@v2
- name: Build and test
Expand Down
8 changes: 4 additions & 4 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.

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 @@ -6,7 +6,7 @@
# unify-target-host = 'unify-if-both'
# output-single-feature = false
# dep-format-version = '2'
# platforms = ['powerpc-wrs-vxworks', 'thumbv7neon-linux-androideabi']
# platforms = ['powerpc-wrs-vxworks', 'thumbv7m-none-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 @@ -6,7 +6,7 @@
# unify-target-host = 'replicate-target-on-host'
# output-single-feature = true
# dep-format-version = '2'
# platforms = ['aarch64-unknown-freebsd', 'armv7-unknown-freebsd']
# platforms = ['aarch64-unknown-freebsd', 'armv7-linux-androideabi']
#
# [traversal-excludes]
# [[final-excludes.ids]]
Expand Down
10 changes: 5 additions & 5 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 @@ -6,7 +6,7 @@
# unify-target-host = 'none'
# output-single-feature = false
# dep-format-version = '2'
# platforms = ['powerpc-wrs-vxworks', 'riscv64gc-unknown-linux-gnu', 'mipsel-unknown-none']
# platforms = ['powerpc-wrs-vxworks-spe', 'riscv64gc-unknown-freebsd', 'mipsel-unknown-none']
# [[traversal-excludes.ids]]
# name = 'pathdiff'
# version = '0.2.0'
Expand Down Expand Up @@ -59,16 +59,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.powerpc-wrs-vxworks.dependencies]
[target.powerpc-wrs-vxworks-spe.dependencies]
libc = { version = "0.2", features = ["std"] }

[target.powerpc-wrs-vxworks.build-dependencies]
[target.powerpc-wrs-vxworks-spe.build-dependencies]
libc = { version = "0.2", features = ["std"] }

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

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

### END HAKARI SECTION
Expand Down
9 changes: 6 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 @@ -6,7 +6,7 @@
# unify-target-host = 'auto'
# output-single-feature = false
# dep-format-version = '2'
# platforms = ['powerpc-unknown-freebsd', 'x86_64-unknown-redox', 'aarch64-uwp-windows-msvc']
# platforms = ['powerpc-unknown-freebsd', 'x86_64-unknown-redox', 'aarch64-wrs-vxworks']
# [[traversal-excludes.ids]]
# name = 'fixtures'
# version = '0.1.0'
Expand Down Expand Up @@ -86,8 +86,11 @@ libc = { version = "0.2", features = ["std"] }
[target.x86_64-unknown-redox.build-dependencies]
libc = { version = "0.2", features = ["std"] }

[target.aarch64-uwp-windows-msvc.dependencies]
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"] }
[target.aarch64-wrs-vxworks.dependencies]
libc = { version = "0.2", features = ["std"] }

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

### 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 @@ -6,7 +6,7 @@
# unify-target-host = 'none'
# output-single-feature = true
# dep-format-version = '2'
# platforms = ['wasm64-unknown-unknown']
# platforms = ['wasm32-wasi']
# [[traversal-excludes.ids]]
# name = 'byteorder'
# version = '1.3.4'
Expand Down Expand Up @@ -197,11 +197,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-wasi.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", 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"] }

[target.wasm32-wasi.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
6 changes: 3 additions & 3 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 @@ -6,7 +6,7 @@
# unify-target-host = 'replicate-target-on-host'
# output-single-feature = true
# dep-format-version = '2'
# platforms = ['aarch64-wrs-vxworks']
# platforms = ['aarch64_be-unknown-linux-gnu']
# [[traversal-excludes.ids]]
# name = 'openssl'
# version = '0.10.30'
Expand Down Expand Up @@ -356,12 +356,12 @@ void = { version = "1", default-features = false }
wait-timeout = { version = "0.2", default-features = false }
walkdir = { version = "2", default-features = false }

[target.aarch64-wrs-vxworks.dependencies]
[target.aarch64_be-unknown-linux-gnu.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-wrs-vxworks.build-dependencies]
[target.aarch64_be-unknown-linux-gnu.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 }
Expand Down
6 changes: 3 additions & 3 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 @@ -6,7 +6,7 @@
# unify-target-host = 'auto'
# output-single-feature = true
# dep-format-version = '2'
# platforms = ['aarch64-nintendo-switch-freestanding', 'i686-unknown-linux-gnu', 'x86_64-unknown-l4re-uclibc']
# platforms = ['aarch64-nintendo-switch-freestanding', 'i686-unknown-haiku', 'x86_64-unknown-illumos']
# [[traversal-excludes.ids]]
# name = 'cargo-compare'
# version = '0.1.0'
Expand Down Expand Up @@ -145,12 +145,12 @@ version_check = { version = "0.9", default-features = false }
ppv-lite86 = { version = "0.2", default-features = false, features = ["simd", "std"] }
rand_chacha = { version = "0.2", default-features = false, features = ["std"] }

[target.i686-unknown-linux-gnu.dependencies]
[target.i686-unknown-haiku.dependencies]
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 }

[target.x86_64-unknown-l4re-uclibc.dependencies]
[target.x86_64-unknown-illumos.dependencies]
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 }
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-3.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ target-features = ['sse2', 'sse3']
flags = ['abc', 'cargo_web']

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

Expand Down
2 changes: 1 addition & 1 deletion 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,7 +7,7 @@ include-dev = false
initials-platform = 'host'

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

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 = 'asmjs-unknown-emscripten'
triple = 'armv7s-apple-ios'
target-features = ['bmi1', 'sse3', 'sse4.2']

[[host-package]]
Expand Down
2 changes: 1 addition & 1 deletion fixtures/guppy/summaries/metadata_guppy_78cb7e8-3.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ initials-platform = 'proc-macros-on-target'
spec = 'always'

[metadata.target-platform]
triple = 'armv7-unknown-linux-gnueabi'
triple = 'armv7-unknown-freebsd'
target-features = 'unknown'
flags = ['bar', 'foo']
[[metadata.omitted-packages.ids]]
Expand Down
2 changes: 1 addition & 1 deletion fixtures/guppy/summaries/metadata_guppy_78cb7e8-6.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 = 'thumbv6m-none-eabi'
triple = 'thumbv4t-none-eabi'
target-features = ['aes', 'bmi1', 'xsaves']
flags = ['foo']

Expand Down
9 changes: 8 additions & 1 deletion fixtures/guppy/summaries/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 @@ include-dev = false
initials-platform = 'proc-macros-on-target'

[metadata.host-platform]
triple = 'riscv64imac-unknown-none-elf'
triple = 'riscv64gc-unknown-openbsd'
target-features = ['avx', 'bmi2', 'rdrand', 'sse', 'sse2']
flags = ['abc', 'test-flag']

Expand Down Expand Up @@ -1115,6 +1115,13 @@ crates-io = true
status = 'transitive'
features = []

[[host-package]]
name = 'libc'
version = '0.2.79'
crates-io = true
status = 'transitive'
features = ['default', 'std']

[[host-package]]
name = 'pkg-config'
version = '0.3.18'
Expand Down
Loading