diff --git a/src/agent/Makefile b/src/agent/Makefile index 07439b09b..a0f330ea1 100644 --- a/src/agent/Makefile +++ b/src/agent/Makefile @@ -98,6 +98,8 @@ define INSTALL_FILE install -D -m 644 $1 $(DESTDIR)$2/$1 || exit 1; endef +.DEFAULT_GOAL := default + ##TARGET default: build code default: $(TARGET) show-header @@ -116,17 +118,6 @@ $(GENERATED_FILES): %: %.in optimize: $(SOURCES) | show-summary show-header @RUSTFLAGS="-C link-arg=-s $(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) $(EXTRA_RUSTFEATURES) -##TARGET clippy: run clippy linter -clippy: $(GENERATED_CODE) - cargo clippy --all-targets --all-features --release \ - -- \ - -Aclippy::redundant_allocation \ - -D warnings - -format: - cargo fmt -- --check - - ##TARGET install: install agent install: install-services @install -D $(TARGET_PATH) $(DESTDIR)/$(BINDIR)/$(TARGET) @@ -146,7 +137,7 @@ test: @cargo test --all --target $(TRIPLE) $(EXTRA_RUSTFEATURES) -- --nocapture ##TARGET check: run test -check: clippy format +check: $(GENERATED_FILES) standard_rust_check ##TARGET run: build and run agent run: diff --git a/src/tools/agent-ctl/Makefile b/src/tools/agent-ctl/Makefile index 1cb20e1d7..ca25f954e 100644 --- a/src/tools/agent-ctl/Makefile +++ b/src/tools/agent-ctl/Makefile @@ -5,6 +5,7 @@ include ../../../utils.mk +.DEFAULT_GOAL := default default: build build: logging-crate-tests diff --git a/src/tools/trace-forwarder/Makefile b/src/tools/trace-forwarder/Makefile index 06530face..5b1c53849 100644 --- a/src/tools/trace-forwarder/Makefile +++ b/src/tools/trace-forwarder/Makefile @@ -5,6 +5,7 @@ include ../../../utils.mk +.DEFAULT_GOAL := default default: build build: logging-crate-tests @@ -24,7 +25,7 @@ test: install: -check: +check: standard_rust_check .PHONY: \ build \ diff --git a/src/tools/trace-forwarder/src/handler.rs b/src/tools/trace-forwarder/src/handler.rs index 1ac76ec2d..b669f0613 100644 --- a/src/tools/trace-forwarder/src/handler.rs +++ b/src/tools/trace-forwarder/src/handler.rs @@ -73,8 +73,7 @@ async fn handle_trace_data<'a>( let payload_len: u64 = NetworkEndian::read_u64(&header); - let mut encoded_payload = Vec::with_capacity(payload_len as usize); - encoded_payload.resize(payload_len as usize, 0); + let mut encoded_payload = vec![0; payload_len as usize]; reader .read_exact(&mut encoded_payload) diff --git a/utils.mk b/utils.mk index dbfefb5a2..e833b40d7 100644 --- a/utils.mk +++ b/utils.mk @@ -145,3 +145,9 @@ endif TRIPLE = $(ARCH)-unknown-linux-$(LIBC) CWD := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) + +standard_rust_check: + cargo fmt -- --check + cargo clippy --all-targets --all-features --release \ + -- \ + -D warnings