Skip to content

Commit

Permalink
bump time crate ver, allow skipping new lints
Browse files Browse the repository at this point in the history
  • Loading branch information
igor-casper committed Sep 26, 2024
1 parent db82251 commit ac278c7
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 16 deletions.
34 changes: 26 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 1 addition & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,11 @@ RUSTUP = $(or $(shell which rustup), $(HOME)/.cargo/bin/rustup)
NPM = $(or $(shell which npm), /usr/bin/npm)

PINNED_NIGHTLY := $(shell cat smart_contracts/rust-toolchain)
# TODO: When `PINNED_NIGHTLY` is updated to something reletively new, we can get rid
# of this specific 'NIGHTLY_FOR_DOC' variable and use `PINNED_NIGHTLY` in `make doc` instead.
#
# At the moment, we can't use STABLE for doc, due to 'doc_auto_cfg' feature being unstable.
# We also can't use the nightly version that is pinned for the contracts, because it is too old.
NIGHTLY_FOR_DOC = nightly-2024-01-01
PINNED_STABLE := $(shell sed -nr 's/channel *= *\"(.*)\"/\1/p' rust-toolchain.toml)
WASM_STRIP_VERSION := $(shell wasm-strip --version)

CARGO_OPTS := --locked
CARGO_PINNED_NIGHTLY := $(CARGO) +$(PINNED_NIGHTLY) $(CARGO_OPTS)
CARGO_NIGHTLY_FOR_DOC := $(CARGO) +$(NIGHTLY_FOR_DOC) $(CARGO_OPTS)
CARGO := $(CARGO) $(CARGO_OPTS)

DISABLE_LOGGING = RUST_LOG=MatchesNothing
Expand Down Expand Up @@ -164,7 +157,7 @@ audit: audit-rs

.PHONY: doc
doc:
RUSTFLAGS="-D warnings" RUSTDOCFLAGS="--cfg docsrs" $(CARGO_NIGHTLY_FOR_DOC) doc --all-features $(CARGO_FLAGS) --no-deps
RUSTFLAGS="-D warnings" RUSTDOCFLAGS="--cfg docsrs" $(CARGO_PINNED_NIGHTLY) doc --all-features $(CARGO_FLAGS) --no-deps
cd smart_contracts/contract && RUSTFLAGS="-D warnings" RUSTDOCFLAGS="--cfg docsrs" $(CARGO_PINNED_NIGHTLY) doc --all-features $(CARGO_FLAGS) --no-deps

.PHONY: check-rs
Expand Down
2 changes: 2 additions & 0 deletions binary_port/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
//! A Rust library for types used by the binary port of a casper node.
#![allow(unexpected_cfgs)]

mod balance_response;
mod binary_message;
mod binary_request;
Expand Down
1 change: 1 addition & 0 deletions storage/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
html_logo_url = "https://raw.githubusercontent.com/CasperLabs/casper-node/master/images/CasperLabs_Logo_Symbol_RGB.png"
)]
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
#![allow(unexpected_cfgs)]

pub mod address_generator;
pub mod block_store;
Expand Down

0 comments on commit ac278c7

Please sign in to comment.