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.

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

Apply clippy suggestions #1552

Merged
merged 6 commits into from
Dec 16, 2022
Merged

Apply clippy suggestions #1552

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2a57adb
Apply clippy suggestions
Dec 16, 2022
23338ac
fmt
Dec 16, 2022
00fa8f8
apply clippy suggestions
Dec 16, 2022
3fa498c
Merge branch 'master' into gn/clippy-suggestions
Dec 16, 2022
f9b767b
Check build using `stating` image
HCastano Dec 16, 2022
44ea184
Revert "Check build using `stating` image"
HCastano Dec 16, 2022
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
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ variables:
CARGO_TARGET_DIR: "/ci-cache/${CI_PROJECT_NAME}/targets/${CI_COMMIT_REF_NAME}/${CI_JOB_NAME}"
# CI_IMAGE is changed to "-:staging" when the CI image gets rebuilt
# read more https://github.com/paritytech/scripts/pull/244
CI_IMAGE: "paritytech/ink-ci-linux:production"
CI_IMAGE: "paritytech/ink-ci-linux:staging"
Copy link
Contributor

Choose a reason for hiding this comment

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

If the CI passes with this we can revert it and merge

Copy link
Contributor

Choose a reason for hiding this comment

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

Okay so the CI didn't pass, and I suspect it has to do with #1547.

I'm gonna say we merge this anyways since we'll need this fix to build the production image

PURELY_STD_CRATES: "ink/codegen metadata engine"
ALSO_WASM_CRATES: "env storage storage/traits allocator prelude primitives ink ink/macro ink/ir"
ALL_CRATES: "${PURELY_STD_CRATES} ${ALSO_WASM_CRATES}"
Expand Down
2 changes: 1 addition & 1 deletion crates/metadata/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ fn spec_contract_json() {
let mut registry = Registry::new();

// when
let json = serde_json::to_value(&contract.into_portable(&mut registry)).unwrap();
let json = serde_json::to_value(contract.into_portable(&mut registry)).unwrap();

// then
assert_eq!(
Expand Down