Skip to content

vector: Added upstream patch for Rust 1.73 fix #268682

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
happysalada merged 1 commit into from
Nov 20, 2023
Merged

vector: Added upstream patch for Rust 1.73 fix #268682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions pkgs/tools/misc/vector/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ rustPlatform.buildRustPackage {
hash = "sha256-vK+k+VbUVgJ8idlvuod5ExAkkeTYDk/135dyLRct0zs=";
};

patches = [ ./vector-pr19075.patch ];

cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
Expand Down
23 changes: 23 additions & 0 deletions pkgs/tools/misc/vector/vector-pr19075.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From 14cd9c12416b5c9ada55ced51e8f92fdce56a4b1 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Tue, 7 Nov 2023 09:05:26 -0500
Subject: [PATCH] fix(config): rustc warnings

---
src/convert_config.rs | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/convert_config.rs b/src/convert_config.rs
index f0a900cf421a0..d81b998c5ee1f 100644
--- a/src/convert_config.rs
+++ b/src/convert_config.rs
@@ -157,8 +157,7 @@ fn walk_dir_and_convert(
let new_output_dir = if entry_path.is_dir() {
let last_component = entry_path
.file_name()
- .unwrap_or_else(|| panic!("Failed to get file_name for {entry_path:?}"))
- .clone();
+ .unwrap_or_else(|| panic!("Failed to get file_name for {entry_path:?}"));
let new_dir = output_dir.join(last_component);

if !new_dir.exists() {