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.

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

Handle case of Rust 1.79 behavior of stringify! on crate path #1821

Merged
merged 5 commits into from
Nov 19, 2024

Conversation

cmichi
Copy link
Collaborator

@cmichi cmichi commented Nov 15, 2024

Fixes the "chain configuration not found" issue on Rust 1.79, as reported by @Lohann in #1743.

I'll backport to a 4.1.2 release.

@cmichi cmichi requested a review from ascjones as a code owner November 15, 2024 17:41
Copy link
Collaborator

@ascjones ascjones left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, small typo

crates/cargo-contract/src/cmd/config.rs Outdated Show resolved Hide resolved
@cmichi cmichi merged commit 1e0b4ea into master Nov 19, 2024
9 checks passed
@cmichi cmichi deleted the cmichi-account-for-missing-dollar-in-stringify branch November 19, 2024 15:26
cmichi added a commit that referenced this pull request Nov 20, 2024
* Handle case of Rust 1.79 behavior of `stringify!` on crate path

* Update changelog

* Simplify code following Andrew's suggestion

* Update crates/cargo-contract/src/cmd/config.rs

Co-authored-by: Andrew Jones <[email protected]>

---------

Co-authored-by: Andrew Jones <[email protected]>
@cmichi cmichi mentioned this pull request Nov 20, 2024
cmichi added a commit that referenced this pull request Nov 20, 2024
* Handle case of Rust 1.79 behavior of stringify! on crate path (#1821)

* Handle case of Rust 1.79 behavior of `stringify!` on crate path

* Update changelog

* Simplify code following Andrew's suggestion

* Update crates/cargo-contract/src/cmd/config.rs

Co-authored-by: Andrew Jones <[email protected]>

---------

Co-authored-by: Andrew Jones <[email protected]>

* Validate externally passed Rust toolchain identifiers (#1817)

* Validate toolchains passed from external are valid

* Improve user output formatting

* Update changelog

* For contract verification: don't rely on Wasm hash in metadata (#1820)

* For contract verification: don't rely on Wasm hash in metadata

* Improve user output

* Check if reference contract `source.hash` matches `hash(source.wasm)`

* Adapt existing test to new user output format

* Update changelog

* Apply `cargo fmt`

* Update changelog

* Bump versions

* Execute `cargo update`

* Update codeowners (#1787)

* Make `clippy` happy

* Apply `cargo fmt`

---------

Co-authored-by: Andrew Jones <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants