-
Notifications
You must be signed in to change notification settings - Fork 631
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.
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
Copy-paste things needed for nearcore#8323 #8792
Conversation
@@ -0,0 +1,43 @@ | |||
targets = [] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Integrate with the top-level deny.toml
I’ve dropped these files as part of #8796, so that this PR remains a simple copy-paste even when it’ll have been squashed by near-buildozer :) |
Promised follow-up of #8792. I migrated one crate per commit at the beginning, and when most crates did not lead to changes in the root-level Cargo.toml started migrating a few at once. Would recommend commit-by-commit review as I checked that cargo resolution didn’t change after each commit. Given the bitrot potential I’m marking as automerge right now.
Hey @Ekleog-NEAR , for some reason this broke my local test build with the following error message: akashin@hal ~/r/nearcore (compute_costs_feature)> cargo test
Compiling near-o11y v0.0.0 (/Users/akashin/repos/nearcore/core/o11y)
Compiling awc v3.0.0
Compiling near-vm-vm v0.0.0 (/Users/akashin/repos/nearcore/runtime/near-vm/lib/vm)
Compiling neard v0.0.0 (/Users/akashin/repos/nearcore/neard)
Compiling near-vm-compiler-test-derive v0.0.0 (/Users/akashin/repos/nearcore/runtime/near-vm/tests/lib/compiler-test-derive)
Compiling near-vm-types v0.0.0 (/Users/akashin/repos/nearcore/runtime/near-vm/lib/types)
error: mismatched attribute proc macro signature
--> runtime/near-vm/tests/lib/compiler-test-derive/src/lib.rs:40:65
|
40 | pub fn compiler_test(attrs: TokenStream, input: TokenStream) -> TokenStream {
| ^^^^^^^^^^^ found TokenStream2, expected type `proc_macro::TokenStream`
|
= note: attribute proc macros must have a signature of `fn(TokenStream, TokenStream) -> TokenStream`
error: mismatched attribute proc macro signature
--> runtime/near-vm/tests/lib/compiler-test-derive/src/lib.rs:40:29
|
40 | pub fn compiler_test(attrs: TokenStream, input: TokenStream) -> TokenStream {
| ^^^^^^^^^^^ found TokenStream2, expected type `proc_macro::TokenStream`
|
= note: attribute proc macros must have a signature of `fn(TokenStream, TokenStream) -> TokenStream`
error: mismatched attribute proc macro signature
--> runtime/near-vm/tests/lib/compiler-test-derive/src/lib.rs:40:49
|
40 | pub fn compiler_test(attrs: TokenStream, input: TokenStream) -> TokenStream {
| ^^^^^^^^^^^ found TokenStream2, expected type `proc_macro::TokenStream`
|
= note: attribute proc macros must have a signature of `fn(TokenStream, TokenStream) -> TokenStream`
error: could not compile `near-vm-compiler-test-derive` due to 3 previous errors
warning: build failed, waiting for other jobs to finish... The rustc version: Do you have any suggestions on how to fix this? |
@Akashin try |
Github displays nearcore language as WebAssembly which is confusing: <img width="464" alt="Screenshot 2023-04-03 at 11 49 02" src="https://user-images.githubusercontent.com/3171838/229474854-3597d9ec-6f7c-4efe-815c-11a3e4bee23d.png"> This is caused by #8792. Fixed by ignoring test wast files.
Thanks for the suggestion, @nagisa. I ran Digging more into this and reading https://petanode.com/posts/rust-proc-macro/, is seems like the solution is to use
|
Probably not, this code is just quite old and IIRC wasn't part of CI for quite some time at this point, I believe. |
@Akashin Can you try with Anyway, if you have a fix to the issue you’re seeing feel free to fix it; as @nagisa said it’s literally just old code copy-pasted from the wasmer that I’m not at all sure whether/how it’s even used in practice :) |
@Ekleog-NEAR , ah, I didn't know about nextest, looks fancy! |
This is only copy-paste, and should be purely non-functional changes only. Some files were deleted from the 127ff1164ff commit of wasmer, in order to not use space in the git history forever. Further changes needed to actually implement the protocol update will be done in separate PRs, that will also be extracted from nearcore#8323.
Promised follow-up of near#8792. I migrated one crate per commit at the beginning, and when most crates did not lead to changes in the root-level Cargo.toml started migrating a few at once. Would recommend commit-by-commit review as I checked that cargo resolution didn’t change after each commit. Given the bitrot potential I’m marking as automerge right now.
Github displays nearcore language as WebAssembly which is confusing: <img width="464" alt="Screenshot 2023-04-03 at 11 49 02" src="https://user-images.githubusercontent.com/3171838/229474854-3597d9ec-6f7c-4efe-815c-11a3e4bee23d.png"> This is caused by near#8792. Fixed by ignoring test wast files.
Github displays nearcore language as WebAssembly which is confusing: <img width="464" alt="Screenshot 2023-04-03 at 11 49 02" src="https://user-images.githubusercontent.com/3171838/229474854-3597d9ec-6f7c-4efe-815c-11a3e4bee23d.png"> This is caused by #8792. Fixed by ignoring test wast files.
This is only copy-paste, and should be purely non-functional changes only.
Some files were deleted from the 127ff1164ff commit of wasmer, in order to not use space in the git history forever.
Further changes needed to actually implement the protocol update will be done in separate PRs, that will also be extracted from nearcore#8323.