Unverified Commit e53ee6ea by Enkelmann Committed by GitHub

switch to Rust 2021 edition (#264)

parent dca99770
FROM rust:1.54 AS builder FROM rust:1.57 AS builder
WORKDIR /cwe_checker WORKDIR /cwe_checker
......
...@@ -44,7 +44,7 @@ If you want to build the docker image yourself, just run `docker build -t cwe_ch ...@@ -44,7 +44,7 @@ If you want to build the docker image yourself, just run `docker build -t cwe_ch
### Local installation ### ### Local installation ###
The following dependencies must be installed in order to build and install the *cwe_checker* locally: The following dependencies must be installed in order to build and install the *cwe_checker* locally:
- [Rust](https://www.rust-lang.org) >= 1.54 - [Rust](https://www.rust-lang.org) >= 1.57
- [Ghidra](https://ghidra-sre.org/) >= 9.2 - [Ghidra](https://ghidra-sre.org/) >= 9.2
Run `make all GHIDRA_PATH=/path/to/ghidra_folder` (with the correct path to the local Ghidra installation inserted) to compile and install the cwe_checker. Run `make all GHIDRA_PATH=/path/to/ghidra_folder` (with the correct path to the local Ghidra installation inserted) to compile and install the cwe_checker.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
name = "cwe_checker" name = "cwe_checker"
version = "0.6.0-dev" version = "0.6.0-dev"
authors = ["Enkelmann <nils-edvin.enkelmann@fkie.fraunhofer.de>"] authors = ["Enkelmann <nils-edvin.enkelmann@fkie.fraunhofer.de>"]
edition = "2018" edition = "2021"
[dependencies] [dependencies]
structopt = "0.3" structopt = "0.3"
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
name = "cwe_checker_lib" name = "cwe_checker_lib"
version = "0.6.0-dev" version = "0.6.0-dev"
authors = ["Nils-Edvin Enkelmann <nils-edvin.enkelmann@fkie.fraunhofer.de>"] authors = ["Nils-Edvin Enkelmann <nils-edvin.enkelmann@fkie.fraunhofer.de>"]
edition = "2018" edition = "2021"
[dependencies] [dependencies]
apint = "0.2" apint = "0.2"
......
...@@ -346,7 +346,6 @@ impl State { ...@@ -346,7 +346,6 @@ impl State {
#[allow(dead_code)] #[allow(dead_code)]
pub fn to_json_compact(&self) -> serde_json::Value { pub fn to_json_compact(&self) -> serde_json::Value {
use serde_json::*; use serde_json::*;
use std::iter::FromIterator;
let register: Vec<(String, Value)> = self let register: Vec<(String, Value)> = self
.register_taint .register_taint
.iter() .iter()
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
name = "acceptance_tests_ghidra" name = "acceptance_tests_ghidra"
version = "0.1.0" version = "0.1.0"
authors = ["Enkelmann <nils-edvin.enkelmann@fkie.fraunhofer.de>"] authors = ["Enkelmann <nils-edvin.enkelmann@fkie.fraunhofer.de>"]
edition = "2018" edition = "2021"
[dependencies] [dependencies]
colored = "2.0" colored = "2.0"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment