From d5a79c1d994f2c3ad316ea290bbb37926ae46d20 Mon Sep 17 00:00:00 2001
From: Quentin Monnet <qmo@qmon.net>
Date: Mon, 16 Sep 2024 15:02:38 +0100
Subject: [PATCH] Cargo.toml: Set Rust edition for the project

Use a Rust edition for the project: 2021, and fix imports to ensure the
crates builds correctly.

Signed-off-by: Quentin Monnet <qmo@qmon.net>
---
 Cargo.toml          | 1 +
 src/assembler.rs    | 8 ++++----
 src/disassembler.rs | 2 +-
 src/insn_builder.rs | 2 +-
 src/interpreter.rs  | 2 +-
 src/jit.rs          | 2 +-
 src/verifier.rs     | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 787343ea..f8985646 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,6 +11,7 @@ repository = "https://github.com/qmonnet/rbpf"
 readme = "README.md"
 keywords = ["BPF", "eBPF", "interpreter", "JIT", "filtering"]
 license = "Apache-2.0/MIT"
+edition = "2021"
 
 # Packaging directives
 include = [
diff --git a/src/assembler.rs b/src/assembler.rs
index a6a4a6fa..3d70602d 100644
--- a/src/assembler.rs
+++ b/src/assembler.rs
@@ -3,12 +3,12 @@
 
 //! This module translates eBPF assembly language to binary.
 
-use asm_parser::{Instruction, Operand, parse};
-use ebpf;
-use ebpf::Insn;
+use crate::asm_parser::{Instruction, Operand, parse};
+use crate::asm_parser::Operand::{Integer, Memory, Register, Nil};
+use crate::ebpf;
+use crate::ebpf::Insn;
 use self::InstructionType::{AluBinary, AluUnary, LoadAbs, LoadInd, LoadImm, LoadReg, StoreImm,
                             StoreReg, JumpUnconditional, JumpConditional, Call, Endian, NoOperand};
-use asm_parser::Operand::{Integer, Memory, Register, Nil};
 use crate::lib::*;
 
 #[derive(Clone, Copy, Debug, PartialEq)]
diff --git a/src/disassembler.rs b/src/disassembler.rs
index c2d72f19..1b8be313 100644
--- a/src/disassembler.rs
+++ b/src/disassembler.rs
@@ -8,7 +8,7 @@ use log::warn;
 #[cfg(not(feature = "std"))]
 use log::info;
 
-use ebpf;
+use crate::ebpf;
 use crate::lib::*;
 
 #[inline]
diff --git a/src/insn_builder.rs b/src/insn_builder.rs
index 4d5b284f..e0fa1f92 100644
--- a/src/insn_builder.rs
+++ b/src/insn_builder.rs
@@ -3,7 +3,7 @@
 
 //! Module provides API to create eBPF programs by Rust programming language
 
-use ebpf::*;
+use crate::ebpf::*;
 use crate::lib::*;
 
 /// Represents single eBPF instruction
diff --git a/src/interpreter.rs b/src/interpreter.rs
index 5a6a3dab..1c79bf6a 100644
--- a/src/interpreter.rs
+++ b/src/interpreter.rs
@@ -5,7 +5,7 @@
 // Copyright 2016 6WIND S.A. <quentin.monnet@6wind.com>
 //      (Translation to Rust, MetaBuff/multiple classes addition, hashmaps for helpers)
 
-use ebpf;
+use crate::ebpf;
 use crate::lib::*;
 
 #[allow(clippy::too_many_arguments)]
diff --git a/src/jit.rs b/src/jit.rs
index 39d5d837..6f487b4d 100644
--- a/src/jit.rs
+++ b/src/jit.rs
@@ -16,7 +16,7 @@ use std::io::{Error, ErrorKind};
 use std::ops::{Index, IndexMut};
 use std::ptr;
 
-use ebpf;
+use crate::ebpf;
 
 extern crate libc;
 
diff --git a/src/verifier.rs b/src/verifier.rs
index 7a67f4c9..9b197e4e 100644
--- a/src/verifier.rs
+++ b/src/verifier.rs
@@ -19,7 +19,7 @@
 // Contrary to the verifier of the Linux kernel, this one does not modify the bytecode at all.
 
 
-use ebpf;
+use crate::ebpf;
 use crate::lib::*;
 
 fn reject<S: AsRef<str>>(msg: S) -> Result<(), Error> {