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

Bump rust version #362

Merged
merged 5 commits into from
Nov 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ name: Clippy & fmt
env:
RUST_FMT: nightly-2023-04-01
RUST_VERSION: "1.66"
RUST_VERSION_TESTING_LIBRARY: "1.67"
CARGO_CONCORDIUM_VERSION: "3.0.0"

jobs:
Expand Down Expand Up @@ -129,7 +130,7 @@ jobs:
- name: Install toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ env.RUST_VERSION }}
toolchain: ${{ env.RUST_VERSION_TESTING_LIBRARY }}

- name: Install Wasm target
run: rustup target install wasm32-unknown-unknown
Expand Down Expand Up @@ -179,7 +180,7 @@ jobs:
- name: Install toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ env.RUST_VERSION }}
toolchain: ${{ env.RUST_VERSION_TESTING_LIBRARY }}

- name: Install Wasm target
run: rustup target install wasm32-unknown-unknown
Expand Down Expand Up @@ -837,7 +838,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: ${{ env.RUST_VERSION }}
toolchain: ${{ env.RUST_VERSION_TESTING_LIBRARY }}
target: ${{ matrix.target }}
override: true

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Changes to any of the packages must be such that
- ```cargo clippy --all``` produces no warnings
- ```rustfmt``` makes no changes.

Everything in this repository should build with rust version 1.66 however the `fmt` tool must be from a nightly release since some of the configuration options are not stable. One way to run the `fmt` tool is
Everything in this repository should build with rust version 1.67 however the `fmt` tool must be from a nightly release since some of the configuration options are not stable. One way to run the `fmt` tool is
```
cargo +nightly-2023-04-01 fmt
```
Expand Down
2 changes: 1 addition & 1 deletion examples/auction/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ fn auction_bid(

/// View function that returns the content of the state
#[receive(contract = "auction", name = "view", return_value = "State")]
fn view<'a, 'b>(_ctx: &'a ReceiveContext, host: &'b Host<State>) -> ReceiveResult<&'b State> {
fn view<'b>(_ctx: &ReceiveContext, host: &'b Host<State>) -> ReceiveResult<&'b State> {
Ok(host.state())
}

Expand Down
2 changes: 1 addition & 1 deletion examples/cis3-nft-sponsored-txs/tests/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ fn initialize_contract_with_alice_tokens() -> (Chain, ContractAddress, ContractI

/// Setup chain and contract.
///
/// Also creates the two accounts, Alice and Bob.
/// Also creates the two accounts, Alice, and Bob.
///
/// Alice is the owner of the contract.
fn initialize_chain_and_contract() -> (Chain, ContractAddress) {
Expand Down
Loading