Upgrade Rust support to edition 2021

Fixes #783
smackers · Mar 8, 2022 · 791a492 · 791a492
1 parent 9f8c1a6
commit 791a492
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git a/examples/rust-cargo/Cargo.toml b/examples/rust-cargo/Cargo.toml
@@ -2,7 +2,7 @@
 name = "rust-cargo"
 version = "0.1.0"
 authors = ["Shaobo He <polarishehn@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/lib/smack/SmackInstGenerator.cpp b/lib/smack/SmackInstGenerator.cpp
@@ -1218,7 +1218,10 @@ void SmackInstGenerator::visitIntrinsicInst(llvm::IntrinsicInst &ii) {
   auto it = stmtMap.find(ii.getIntrinsicID());
   if (it != stmtMap.end())
     it->second(&ii);
-  else {
+  else if (ii.getIntrinsicID() ==
+           llvm::Intrinsic::experimental_noalias_scope_decl) {
+    // Ignore this function as we cannot handle arguments of metadata type.
+  } else {
     SmackWarnings::warnApproximate(ii.getCalledFunction()->getName().str(),
                                    currBlock, &ii);
     emit(rep->call(ii.getCalledFunction(), ii));

diff --git a/share/smack/lib/smack/Cargo.toml b/share/smack/lib/smack/Cargo.toml
@@ -2,7 +2,7 @@
 name = "smack"
 version = "0.1.0"
 authors = ["Shaobo He <polarishehn@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/test/rust/cargo/num-crate-test-fail/Cargo.toml b/test/rust/cargo/num-crate-test-fail/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cargo-test"
 version = "0.1.0"
 authors = ["smackers"]
-edition = "2018"
+edition = "2021"
 
 # @expect error
 

diff --git a/test/rust/cargo/num-crate-test/Cargo.toml b/test/rust/cargo/num-crate-test/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cargo-test"
 version = "0.1.0"
 authors = ["smackers"]
-edition = "2018"
+edition = "2021"
 
 # @expect verified
 

diff --git a/test/rust/cargo/simple-static-lib-fail/Cargo.toml b/test/rust/cargo/simple-static-lib-fail/Cargo.toml
@@ -2,7 +2,7 @@
 name = "simple-static-lib"
 version = "0.1.0"
 authors = ["Shaobo He <polarishehn@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 # @expect error
 # @flag --entry-point=helloworld

diff --git a/test/rust/cargo/simple-static-lib/Cargo.toml b/test/rust/cargo/simple-static-lib/Cargo.toml
@@ -2,7 +2,7 @@
 name = "simple-static-lib"
 version = "0.1.0"
 authors = ["Shaobo He <polarishehn@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 # @expect verified
 # @flag --entry-point=helloworld