Bump edition to 2024

Author: tamird

Cargo.toml

@@ -13,7 +13,7 @@ categories = [
 ]
 repository = "https://github.com/aya-rs/bpf-linker"
 readme = "README.md"
-edition = "2021"
+edition.workspace = true
 
 [dependencies]
 # cli deps
@@ -76,6 +76,9 @@ rustc-build-sysroot = []
 [workspace]
 members = ["xtask"]
 
+[workspace.package]
+edition = "2024"
+
 [workspace.dependencies]
 # cli deps
 anyhow = { version = "1.0.100", default-features = false }

src/bin/bpf-linker.rs

@@ -16,13 +16,13 @@ use std::{
 use aya_rustc_llvm_proxy as _;
 use bpf_linker::{Cpu, Linker, LinkerInput, LinkerOptions, OptLevel, OutputType};
 use clap::{
+    Parser,
     builder::{PathBufValueParser, TypedValueParser as _},
     error::ErrorKind,
-    Parser,
 };
 use thiserror::Error;
-use tracing::{info, Level};
-use tracing_subscriber::{fmt::MakeWriter, prelude::*, EnvFilter};
+use tracing::{Level, info};
+use tracing_subscriber::{EnvFilter, fmt::MakeWriter, prelude::*};
 use tracing_tree::HierarchicalLayer;
 
 #[derive(Debug, Error)]

src/linker.rs

@@ -643,7 +643,10 @@ fn create_target_machine(
                 (c_triple, llvm::target_from_module(module))
             } else {
                 // case 3.
-                info!("detected non-bpf input target {:?} and no explicit output --target specified, selecting `bpf'", c_triple);
+                info!(
+                    "detected non-bpf input target {:?} and no explicit output --target specified, selecting `bpf'",
+                    c_triple
+                );
                 let c_triple = c"bpf";
                 (c_triple, llvm::target_from_triple(c_triple))
             }

src/llvm/di.rs

@@ -1,6 +1,6 @@
 use std::{
     borrow::Cow,
-    collections::{hash_map::DefaultHasher, HashMap, HashSet},
+    collections::{HashMap, HashSet, hash_map::DefaultHasher},
     hash::Hasher as _,
     io::Write as _,
     marker::PhantomData,
@@ -9,13 +9,13 @@ use std::{
 
 use gimli::{DW_TAG_pointer_type, DW_TAG_structure_type, DW_TAG_variant_part};
 use llvm_sys::{core::*, debuginfo::*, prelude::*};
-use tracing::{span, trace, warn, Level};
+use tracing::{Level, span, trace, warn};
 
 use super::types::{
     di::DIType,
     ir::{Function, MDNode, Metadata, Value},
 };
-use crate::llvm::{iter::*, types::di::DISubprogram, LLVMContext, LLVMModule};
+use crate::llvm::{LLVMContext, LLVMModule, iter::*, types::di::DISubprogram};
 
 // KSYM_NAME_LEN from linux kernel intentionally set
 // to lower value found across kernel versions to ensure
@@ -108,7 +108,10 @@ impl<'ctx> DISanitizer<'ctx> {
                                                     .to_string();
                                                 trace!(
                                                     "found data carrying enum {name} ({filename}:{line}), not emitting the debug info for it",
-                                                    filename = file.filename().map_or( "<unknown>".into(), String::from_utf8_lossy),
+                                                    filename = file.filename().map_or(
+                                                        "<unknown>".into(),
+                                                        String::from_utf8_lossy
+                                                    ),
                                                     line = di_composite_type.line(),
                                                 );
                                                 self.skipped_types_lossy.push(name);

src/llvm/mod.rs

@@ -13,6 +13,7 @@ use std::{
 pub(crate) use di::DISanitizer;
 use iter::{IterModuleFunctions as _, IterModuleGlobalAliases as _, IterModuleGlobals as _};
 use llvm_sys::{
+    LLVMAttributeFunctionIndex, LLVMLinkage, LLVMVisibility,
     bit_reader::LLVMParseBitcodeInContext2,
     core::{
         LLVMCreateMemoryBufferWithMemoryRange, LLVMDisposeMemoryBuffer, LLVMDisposeMessage,
@@ -39,7 +40,6 @@ use llvm_sys::{
     transforms::pass_builder::{
         LLVMCreatePassBuilderOptions, LLVMDisposePassBuilderOptions, LLVMRunPasses,
     },
-    LLVMAttributeFunctionIndex, LLVMLinkage, LLVMVisibility,
 };
 use tracing::{debug, error};
 pub(crate) use types::{

src/llvm/types/context.rs

@@ -1,6 +1,6 @@
 use std::{
     any::Any,
-    ffi::{c_void, CStr},
+    ffi::{CStr, c_void},
     marker::PhantomData,
     pin::Pin,
     ptr,
@@ -15,7 +15,7 @@ use llvm_sys::{
     prelude::{LLVMContextRef, LLVMDiagnosticInfoRef},
 };
 
-use crate::llvm::{types::module::LLVMModule, LLVMDiagnosticHandler, Message};
+use crate::llvm::{LLVMDiagnosticHandler, Message, types::module::LLVMModule};
 
 pub(crate) struct LLVMContext {
     context: LLVMContextRef,

src/llvm/types/di.rs

@@ -12,8 +12,8 @@ use llvm_sys::{
 };
 
 use crate::llvm::{
-    types::ir::{MDNode, Metadata},
     LLVMGetMDString,
+    types::ir::{MDNode, Metadata},
 };
 
 fn mdstring<'a>(mdstring: LLVMValueRef) -> &'a [u8] {

src/llvm/types/ir.rs

@@ -16,10 +16,10 @@ use llvm_sys::{
 };
 
 use crate::llvm::{
+    Message,
     iter::IterBasicBlocks as _,
     symbol_name,
     types::di::{DICompositeType, DIDerivedType, DISubprogram, DIType},
-    Message,
 };
 
 pub(crate) fn replace_name(

src/llvm/types/module.rs

@@ -11,7 +11,7 @@ use llvm_sys::{
     prelude::LLVMModuleRef,
 };
 
-use crate::llvm::{types::context::LLVMContext, MemoryBuffer, Message};
+use crate::llvm::{MemoryBuffer, Message, types::context::LLVMContext};
 
 pub(crate) struct LLVMModule<'ctx> {
     pub(super) module: LLVMModuleRef,

src/llvm/types/target_machine.rs

@@ -6,7 +6,7 @@ use llvm_sys::target_machine::{
     LLVMTargetMachineEmitToMemoryBuffer, LLVMTargetMachineRef, LLVMTargetRef,
 };
 
-use crate::llvm::{types::module::LLVMModule, MemoryBuffer, Message};
+use crate::llvm::{MemoryBuffer, Message, types::module::LLVMModule};
 
 pub(crate) struct LLVMTargetMachine {
     target_machine: LLVMTargetMachineRef,