Merge pull request aya-rs#22 from dmitris/rustfmt

Rust Edition 2021 + 'cargo fmt'

Author: vadorovsky

Cargo.toml

@@ -8,7 +8,7 @@ keywords = ["BPF", "eBPF", "linker", "llvm"]
 categories = ["development-tools", "command-line-utilities", "no-std", "os::linux-apis"]
 repository = "https://github.com/aya-rs/bpf-linker"
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 # cli deps

src/lib.rs

@@ -1,6 +1,6 @@
 #![deny(clippy::all)]
 
-mod llvm;
 mod linker;
+mod llvm;
 
 pub use linker::*;

src/llvm/iter.rs

@@ -67,4 +67,4 @@ llvm_iterator!(
     LLVMValueRef,
     LLVMGetFirstGlobalAlias,
     LLVMGetNextGlobalAlias
-);
+);

src/llvm/mod.rs

@@ -305,18 +305,16 @@ pub unsafe fn internalize(value: LLVMValueRef, name: &str, export_symbols: &Hash
 }
 
 pub extern "C" fn diagnostic_handler(info: LLVMDiagnosticInfoRef, _data: *mut c_void) {
-    
-        let message = unsafe { CStr::from_ptr(LLVMGetDiagInfoDescription(info)) };
-        let message_s = message.to_str().unwrap();
-
-        use llvm_sys::LLVMDiagnosticSeverity::*;
-        match unsafe { LLVMGetDiagInfoSeverity(info) }{
-            LLVMDSError => error!("llvm: {}", message_s),
-            LLVMDSWarning => warn!("llvm: {}", message_s),
-            LLVMDSRemark => debug!("remark: {}", message_s),
-            LLVMDSNote => debug!("note: {}", message_s),
-        };
-    
+    let message = unsafe { CStr::from_ptr(LLVMGetDiagInfoDescription(info)) };
+    let message_s = message.to_str().unwrap();
+
+    use llvm_sys::LLVMDiagnosticSeverity::*;
+    match unsafe { LLVMGetDiagInfoSeverity(info) } {
+        LLVMDSError => error!("llvm: {}", message_s),
+        LLVMDSWarning => warn!("llvm: {}", message_s),
+        LLVMDSRemark => debug!("remark: {}", message_s),
+        LLVMDSNote => debug!("note: {}", message_s),
+    };
 }
 
 pub extern "C" fn fatal_error(reason: *const c_char) {

tests/tests.rs

@@ -1,7 +1,7 @@
 extern crate compiletest_rs as compiletest;
 
-use which::which;
 use std::{env, path::PathBuf};
+use which::which;
 
 fn run_mode(mode: &'static str) {
     let mut config = compiletest::Config::default();
@@ -27,7 +27,7 @@ fn run_mode(mode: &'static str) {
     config.mode = mode.parse().expect("Invalid mode");
     config.src_base = PathBuf::from(format!("tests/{}", mode));
     config.link_deps(); // Populate config.target_rustcflags with dependencies on the path
-    //config.clean_rmeta(); // If your tests import the parent crate, this helps with E0464
+                        //config.clean_rmeta(); // If your tests import the parent crate, this helps with E0464
 
     compiletest::run_tests(&config);
 }