HaeckseAlex/cpu
2
0
Fork 0
forked from libre-chip/cpu
Code Pull requests Activity

update to latest fayalite and match rust version

Browse source
This commit is contained in:
Jacob Lifshay 2024-12-15 20:32:27 -08:00
parent b51109f4f6
commit 1761d7094e
Signed by: programmerjake
SSH key fingerprint: SHA256:HnFTLGpSm4Q4Fj502oCFisjZSoakwEuTsJJMSke63RQ
3 changed files with 38 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.forgejo/workflows/test.yml
View file

@ -38,7 +38,7 @@ jobs:
z3 \
zlib1g-dev
- run: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.80.1
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.82.0
source "$HOME/.cargo/env"
echo "$PATH" >> "$GITHUB_PATH"
- uses: https://code.forgejo.org/actions/cache/restore@v3

53
Cargo.lock generated
View file

@ -299,8 +299,8 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
[[package]]
name = "fayalite"
version = "0.2.1"
source = "git+https://git.libre-chip.org/libre-chip/fayalite.git?branch=master#3d5d8c54b6f2b7bbb0a31458c00139359ca3006e"
version = "0.3.0"
source = "git+https://git.libre-chip.org/libre-chip/fayalite.git?branch=master#304d8da0e8fee407b269a3a3d7e5e93077b76955"
dependencies = [
"bitvec",
"blake3",
@ -309,29 +309,31 @@ dependencies = [
"eyre",
"fayalite-proc-macros",
"fayalite-visit-gen",
"hashbrown 0.14.5",
"hashbrown",
"jobslot",
"num-bigint",
"num-traits",
"os_pipe",
"petgraph",
"serde",
"serde_json",
"tempfile",
"vec_map",
"which",
]
[[package]]
name = "fayalite-proc-macros"
version = "0.2.1"
source = "git+https://git.libre-chip.org/libre-chip/fayalite.git?branch=master#3d5d8c54b6f2b7bbb0a31458c00139359ca3006e"
version = "0.3.0"
source = "git+https://git.libre-chip.org/libre-chip/fayalite.git?branch=master#304d8da0e8fee407b269a3a3d7e5e93077b76955"
dependencies = [
"fayalite-proc-macros-impl",
]
[[package]]
name = "fayalite-proc-macros-impl"
version = "0.2.1"
source = "git+https://git.libre-chip.org/libre-chip/fayalite.git?branch=master#3d5d8c54b6f2b7bbb0a31458c00139359ca3006e"
version = "0.3.0"
source = "git+https://git.libre-chip.org/libre-chip/fayalite.git?branch=master#304d8da0e8fee407b269a3a3d7e5e93077b76955"
dependencies = [
"base16ct",
"num-bigint",
@ -345,8 +347,8 @@ dependencies = [
[[package]]
name = "fayalite-visit-gen"
version = "0.2.1"
source = "git+https://git.libre-chip.org/libre-chip/fayalite.git?branch=master#3d5d8c54b6f2b7bbb0a31458c00139359ca3006e"
version = "0.3.0"
source = "git+https://git.libre-chip.org/libre-chip/fayalite.git?branch=master#304d8da0e8fee407b269a3a3d7e5e93077b76955"
dependencies = [
"indexmap",
"prettyplease",
@ -358,6 +360,12 @@ dependencies = [
"thiserror",
]
[[package]]
name = "fixedbitset"
version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
[[package]]
name = "funty"
version = "2.0.0"
@ -395,12 +403,6 @@ dependencies = [
"allocator-api2",
]
[[package]]
name = "hashbrown"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
[[package]]
name = "heck"
version = "0.5.0"
@ -424,12 +426,12 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
[[package]]
name = "indexmap"
version = "2.6.0"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
dependencies = [
"equivalent",
"hashbrown 0.15.0",
"hashbrown",
"serde",
]
@ -521,6 +523,15 @@ dependencies = [
"windows-sys 0.59.0",
]
[[package]]
name = "petgraph"
version = "0.6.5"
source = "git+https://github.com/programmerjake/petgraph.git?rev=258ea8071209a924b73fe96f9f87a3b7b45cbc9f#258ea8071209a924b73fe96f9f87a3b7b45cbc9f"
dependencies = [
"fixedbitset",
"indexmap",
]
[[package]]
name = "prettyplease"
version = "0.2.22"
@ -704,6 +715,12 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "vec_map"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]]
name = "version_check"
version = "0.9.5"

4
Cargo.toml
View file

@ -11,7 +11,7 @@ edition = "2021"
repository = ""
keywords = []
categories = []
rust-version = "1.79"
rust-version = "1.82.0"
[workspace.dependencies]
fayalite = { git = "https://git.libre-chip.org/libre-chip/fayalite.git", version = "0.2.1", branch = "master" }
fayalite = { git = "https://git.libre-chip.org/libre-chip/fayalite.git", version = "0.3.0", branch = "master" }