Skip to content

Update Rust to 1.45.2 #522

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
merged 2 commits into from
Sep 8, 2020
Merged

Update Rust to 1.45.2 #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
570084b
Update Rust version to 1.45.2
webmaster128 Sep 8, 2020
71257dd
Update NIGHTLY_TOOLCHAIN for clippy
webmaster128 Sep 8, 2020
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
70 changes: 35 additions & 35 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ workflows:
jobs:
package_schema:
docker:
- image: rust:1.44.1
- image: rust:1.45.2
steps:
- checkout
- run:
name: Version information
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
- restore_cache:
keys:
- cargocache-v2-package_schema-rust:1.44.1-{{ checksum "Cargo.lock" }}
- cargocache-v2-package_schema-rust:1.45.2-{{ checksum "Cargo.lock" }}
- run:
name: Build
working_directory: ~/project/packages/schema
Expand All @@ -52,19 +52,19 @@ jobs:
- target/debug/.fingerprint
- target/debug/build
- target/debug/deps
key: cargocache-v2-package_schema-rust:1.44.1-{{ checksum "Cargo.lock" }}
key: cargocache-v2-package_schema-rust:1.45.2-{{ checksum "Cargo.lock" }}

package_std:
docker:
- image: rust:1.44.1
- image: rust:1.45.2
steps:
- checkout
- run:
name: Version information
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
- restore_cache:
keys:
- cargocache-v2-package_std-rust:1.44.1-{{ checksum "Cargo.lock" }}
- cargocache-v2-package_std-rust:1.45.2-{{ checksum "Cargo.lock" }}
- run:
name: Add wasm32 target
command: rustup target add wasm32-unknown-unknown && rustup target list --installed
Expand Down Expand Up @@ -111,19 +111,19 @@ jobs:
- target/debug/.fingerprint
- target/debug/build
- target/debug/deps
key: cargocache-v2-package_std-rust:1.44.1-{{ checksum "Cargo.lock" }}
key: cargocache-v2-package_std-rust:1.45.2-{{ checksum "Cargo.lock" }}

package_storage:
docker:
- image: rust:1.44.1
- image: rust:1.45.2
steps:
- checkout
- run:
name: Version information
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
- restore_cache:
keys:
- cargocache-v2-package_storage-rust:1.44.1-{{ checksum "Cargo.lock" }}
- cargocache-v2-package_storage-rust:1.45.2-{{ checksum "Cargo.lock" }}
- run:
name: Build library for native target
working_directory: ~/project/packages/storage
Expand All @@ -142,11 +142,11 @@ jobs:
- target/debug/.fingerprint
- target/debug/build
- target/debug/deps
key: cargocache-v2-package_storage-rust:1.44.1-{{ checksum "Cargo.lock" }}
key: cargocache-v2-package_storage-rust:1.45.2-{{ checksum "Cargo.lock" }}

package_vm_cranelift:
docker:
- image: rust:1.44.1
- image: rust:1.45.2
steps:
- checkout
- run:
Expand All @@ -157,7 +157,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
- restore_cache:
keys:
- cargocache-v2-package_vm_cranelift-rust:1.44.1-{{ checksum "Cargo.lock" }}
- cargocache-v2-package_vm_cranelift-rust:1.45.2-{{ checksum "Cargo.lock" }}
- run:
name: Build
working_directory: ~/project/packages/vm
Expand All @@ -172,7 +172,7 @@ jobs:
- target/debug/.fingerprint
- target/debug/build
- target/debug/deps
key: cargocache-v2-package_vm_cranelift-rust:1.44.1-{{ checksum "Cargo.lock" }}
key: cargocache-v2-package_vm_cranelift-rust:1.45.2-{{ checksum "Cargo.lock" }}

package_vm_singlepass:
docker:
Expand Down Expand Up @@ -214,7 +214,7 @@ jobs:

contract_burner:
docker:
- image: rust:1.44.1
- image: rust:1.45.2
working_directory: ~/cosmwasm/contracts/burner
steps:
- checkout:
Expand All @@ -224,7 +224,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-v2-contract_burner-rust:1.44.1-{{ checksum "Cargo.lock" }}
- cargocache-v2-contract_burner-rust:1.45.2-{{ checksum "Cargo.lock" }}
- run:
name: Add wasm32 target
command: rustup target add wasm32-unknown-unknown && rustup target list --installed
Expand Down Expand Up @@ -259,11 +259,11 @@ jobs:
- target/wasm32-unknown-unknown/release/.fingerprint
- target/wasm32-unknown-unknown/release/build
- target/wasm32-unknown-unknown/release/deps
key: cargocache-v2-contract_burner-rust:1.44.1-{{ checksum "Cargo.lock" }}
key: cargocache-v2-contract_burner-rust:1.45.2-{{ checksum "Cargo.lock" }}

contract_hackatom:
docker:
- image: rust:1.44.1
- image: rust:1.45.2
working_directory: ~/cosmwasm/contracts/hackatom
steps:
- checkout:
Expand All @@ -273,7 +273,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-v2-contract_hackatom-rust:1.44.1-{{ checksum "Cargo.lock" }}
- cargocache-v2-contract_hackatom-rust:1.45.2-{{ checksum "Cargo.lock" }}
- run:
name: Add wasm32 target
command: rustup target add wasm32-unknown-unknown && rustup target list --installed
Expand Down Expand Up @@ -308,7 +308,7 @@ jobs:
- target/wasm32-unknown-unknown/release/.fingerprint
- target/wasm32-unknown-unknown/release/build
- target/wasm32-unknown-unknown/release/deps
key: cargocache-v2-contract_hackatom-rust:1.44.1-{{ checksum "Cargo.lock" }}
key: cargocache-v2-contract_hackatom-rust:1.45.2-{{ checksum "Cargo.lock" }}

# In this job we use singlepass as the VM to execute integration tests. This requires Rust nightly.
# Avoid duplicating generic checks like unit tests or schema generation – they belong in the generic hackatom job.
Expand Down Expand Up @@ -347,7 +347,7 @@ jobs:

contract_queue:
docker:
- image: rust:1.44.1
- image: rust:1.45.2
working_directory: ~/cosmwasm/contracts/queue
steps:
- checkout:
Expand All @@ -357,7 +357,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-v2-contract_queue-rust:1.44.1-{{ checksum "Cargo.lock" }}
- cargocache-v2-contract_queue-rust:1.45.2-{{ checksum "Cargo.lock" }}
- run:
name: Add wasm32 target
command: rustup target add wasm32-unknown-unknown && rustup target list --installed
Expand Down Expand Up @@ -392,11 +392,11 @@ jobs:
- target/wasm32-unknown-unknown/release/.fingerprint
- target/wasm32-unknown-unknown/release/build
- target/wasm32-unknown-unknown/release/deps
key: cargocache-v2-contract_queue-rust:1.44.1-{{ checksum "Cargo.lock" }}
key: cargocache-v2-contract_queue-rust:1.45.2-{{ checksum "Cargo.lock" }}

contract_reflect:
docker:
- image: rust:1.44.1
- image: rust:1.45.2
working_directory: ~/cosmwasm/contracts/reflect
steps:
- checkout:
Expand All @@ -406,7 +406,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-v2-contract_reflect-rust:1.44.1-{{ checksum "Cargo.lock" }}
- cargocache-v2-contract_reflect-rust:1.45.2-{{ checksum "Cargo.lock" }}
- run:
name: Add wasm32 target
command: rustup target add wasm32-unknown-unknown && rustup target list --installed
Expand Down Expand Up @@ -441,11 +441,11 @@ jobs:
- target/wasm32-unknown-unknown/release/.fingerprint
- target/wasm32-unknown-unknown/release/build
- target/wasm32-unknown-unknown/release/deps
key: cargocache-v2-contract_reflect-rust:1.44.1-{{ checksum "Cargo.lock" }}
key: cargocache-v2-contract_reflect-rust:1.45.2-{{ checksum "Cargo.lock" }}

contract_staking:
docker:
- image: rust:1.44.1
- image: rust:1.45.2
working_directory: ~/cosmwasm/contracts/staking
steps:
- checkout:
Expand All @@ -455,7 +455,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- cargocache-v2-contract_staking-rust:1.44.1-{{ checksum "Cargo.lock" }}
- cargocache-v2-contract_staking-rust:1.45.2-{{ checksum "Cargo.lock" }}
- run:
name: Add wasm32 target
command: rustup target add wasm32-unknown-unknown && rustup target list --installed
Expand Down Expand Up @@ -490,19 +490,19 @@ jobs:
- target/wasm32-unknown-unknown/release/.fingerprint
- target/wasm32-unknown-unknown/release/build
- target/wasm32-unknown-unknown/release/deps
key: cargocache-v2-contract_staking-rust:1.44.1-{{ checksum "Cargo.lock" }}
key: cargocache-v2-contract_staking-rust:1.45.2-{{ checksum "Cargo.lock" }}

fmt:
docker:
- image: rust:1.44.1
- image: rust:1.45.2
steps:
- checkout
- run:
name: Version information
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
- restore_cache:
keys:
- cargocache-v2-fmt-rust:1.44.1-{{ checksum "Cargo.lock" }}
- cargocache-v2-fmt-rust:1.45.2-{{ checksum "Cargo.lock" }}
- run:
name: Add rustfmt component
command: rustup component add rustfmt
Expand Down Expand Up @@ -535,14 +535,14 @@ jobs:
- target/debug/.fingerprint
- target/debug/build
- target/debug/deps
key: cargocache-v2-fmt-rust:1.44.1-{{ checksum "Cargo.lock" }}
key: cargocache-v2-fmt-rust:1.45.2-{{ checksum "Cargo.lock" }}

clippy:
docker:
- image: rust:1.44.1
- image: rust:1.45.2
environment:
# Make sure to choose version with clippy present: https://rust-lang.github.io/rustup-components-history/x86_64-unknown-linux-gnu.html
NIGHTLY_TOOLCHAIN: nightly-2020-05-26
NIGHTLY_TOOLCHAIN: nightly-2020-09-08
Copy link
Member

Choose a reason for hiding this comment

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

That's quite the jump

steps:
- checkout
- run:
Expand All @@ -559,7 +559,7 @@ jobs:
command: rustc +$NIGHTLY_TOOLCHAIN --version && cargo +$NIGHTLY_TOOLCHAIN --version
- restore_cache:
keys:
- cargocache-v2-clippy-rust:1.44.1-{{ checksum "Cargo.lock" }}-{{ checksum "contracts/burner/Cargo.lock" }}-{{ checksum "contracts/hackatom/Cargo.lock" }}-{{ checksum "contracts/queue/Cargo.lock" }}-{{ checksum "contracts/reflect/Cargo.lock" }}-{{ checksum "contracts/staking/Cargo.lock" }}
- cargocache-v2-clippy-rust:1.45.2-{{ checksum "Cargo.lock" }}-{{ checksum "contracts/burner/Cargo.lock" }}-{{ checksum "contracts/hackatom/Cargo.lock" }}-{{ checksum "contracts/queue/Cargo.lock" }}-{{ checksum "contracts/reflect/Cargo.lock" }}-{{ checksum "contracts/staking/Cargo.lock" }}
- run:
name: Add clippy component
command: rustup component add clippy
Expand Down Expand Up @@ -646,7 +646,7 @@ jobs:
- contracts/staking/target/debug/.fingerprint
- contracts/staking/target/debug/build
- contracts/staking/target/debug/deps
key: cargocache-v2-clippy-rust:1.44.1-{{ checksum "Cargo.lock" }}-{{ checksum "contracts/burner/Cargo.lock" }}-{{ checksum "contracts/hackatom/Cargo.lock" }}-{{ checksum "contracts/queue/Cargo.lock" }}-{{ checksum "contracts/reflect/Cargo.lock" }}-{{ checksum "contracts/staking/Cargo.lock" }}
key: cargocache-v2-clippy-rust:1.45.2-{{ checksum "Cargo.lock" }}-{{ checksum "contracts/burner/Cargo.lock" }}-{{ checksum "contracts/hackatom/Cargo.lock" }}-{{ checksum "contracts/queue/Cargo.lock" }}-{{ checksum "contracts/reflect/Cargo.lock" }}-{{ checksum "contracts/staking/Cargo.lock" }}

# This job roughly follows the instructions from https://circleci.com/blog/publishing-to-github-releases-via-circleci/
build_and_upload_devcontracts:
Expand Down Expand Up @@ -677,7 +677,7 @@ jobs:
for contract_dir in ./contracts/*/; do
name=$(basename $contract_dir)
echo "Building $name ..."
docker run --volumes-from with_code cosmwasm/rust-optimizer:0.9.0 ./contracts/$name
docker run --volumes-from with_code cosmwasm/rust-optimizer:0.9.1 ./contracts/$name
docker cp with_code:/code/contracts/$name/contract.wasm ./artifacts/$name.wasm
done
- run:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## 0.11.0 (unreleased)

**all**

- Drop support for Rust versions lower than 1.45.2.

**cosmwasm-std**

- Add `time_nanos` to `BlockInfo` allowing access to high precision block times.
Expand Down
10 changes: 5 additions & 5 deletions contracts/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,25 @@ To rebuild all contracts as part of a release use the following commands:
docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_burner",target=/code/contracts/burner/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.9.0 ./contracts/burner
cosmwasm/rust-optimizer:0.9.1 ./contracts/burner

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_hackatom",target=/code/contracts/hackatom/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.9.0 ./contracts/hackatom
cosmwasm/rust-optimizer:0.9.1 ./contracts/hackatom

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_queue",target=/code/contracts/queue/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.9.0 ./contracts/queue
cosmwasm/rust-optimizer:0.9.1 ./contracts/queue

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_reflect",target=/code/contracts/reflect/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.9.0 ./contracts/reflect
cosmwasm/rust-optimizer:0.9.1 ./contracts/reflect

docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_staking",target=/code/contracts/staking/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.9.0 ./contracts/staking
cosmwasm/rust-optimizer:0.9.1 ./contracts/staking
```
2 changes: 1 addition & 1 deletion packages/vm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ To rebuild the test contracts, go to the repo root and do
docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="devcontract_cache_hackatom",target=/code/contracts/hackatom/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/rust-optimizer:0.9.0 ./contracts/hackatom \
cosmwasm/rust-optimizer:0.9.1 ./contracts/hackatom \
&& cp contracts/hackatom/contract.wasm packages/vm/testdata/contract_0.11.wasm
```

Expand Down