Release 0.19.0

.gitignore

@@ -50,3 +50,4 @@ marks.*.json
 inspect/
 *.analysis.txt
 analysis.txt
+polonius_cache/

Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
     "analysis/runtime",
     "c2rust",
@@ -23,9 +24,10 @@ exclude = [
 ]
 
 [workspace.package]
-version = "0.18.0"
+version = "0.19.0"
 authors = ["The C2Rust Project Developers <[email protected]>"]
 edition = "2021"
+rust-version = "1.65"
 readme = "README.md"
 homepage = "https://c2rust.com/"
 repository = "https://github.com/immunant/c2rust/"

analysis/tests/lighttpd-minimal/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 libc = "0.2"
-c2rust-analysis-rt = { path = "../../runtime", optional = true, version = "0.18.0" }
+c2rust-analysis-rt = { path = "../../runtime", optional = true, version = "0.19.0" }
 
 [features]
 miri = []

analysis/tests/lighttpd/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 libc = "0.2"
-c2rust-analysis-rt = { path = "../../runtime", optional = true, version = "0.18.0" }
+c2rust-analysis-rt = { path = "../../runtime", optional = true, version = "0.19.0" }
 
 [features]
 miri = []

analysis/tests/minimal/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 
 [dependencies]
 libc = "0.2"
-c2rust-analysis-rt = { path = "../../runtime", optional = true, version = "0.18.0" }
+c2rust-analysis-rt = { path = "../../runtime", optional = true, version = "0.19.0" }
 
 [features]
 miri = []

analysis/tests/misc/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 libc = "0.2"
-c2rust-analysis-rt = { path = "../../runtime", optional = true, version = "0.18.0" }
+c2rust-analysis-rt = { path = "../../runtime", optional = true, version = "0.19.0" }
 
 [features]
 miri = []

c2rust-analyze/Cargo.toml

@@ -32,11 +32,11 @@ toml_edit = "0.19.8"
 sha2 = "0.10.8"
 
 [build-dependencies]
-c2rust-build-paths = { path = "../c2rust-build-paths", version = "0.18.0" }
+c2rust-build-paths = { path = "../c2rust-build-paths", version = "0.19.0" }
 print_bytes = "1.1"
 
 [dev-dependencies]
-c2rust-build-paths = { path = "../c2rust-build-paths", version = "0.18.0" }
+c2rust-build-paths = { path = "../c2rust-build-paths", version = "0.19.0" }
 clap = { version = "4.1.9", features = ["derive"] }
 shlex = "1.3.0"
 

c2rust-analyze/src/analyze.rs

@@ -370,7 +370,7 @@ fn mark_foreign_fixed<'tcx>(
             make_ty_fixed(gasn, lty);
 
             // Also fix the `addr_of_static` permissions.
-            let ptr = gacx.addr_of_static[&did];
+            let ptr = gacx.addr_of_static[did];
             gasn.flags[ptr].insert(FlagSet::FIXED);
         }
     }
@@ -397,7 +397,7 @@ fn mark_all_statics_fixed<'tcx>(gacx: &mut GlobalAnalysisCtxt<'tcx>, gasn: &mut
         make_ty_fixed(gasn, lty);
 
         // Also fix the `addr_of_static` permissions.
-        let ptr = gacx.addr_of_static[&did];
+        let ptr = gacx.addr_of_static[did];
         gasn.flags[ptr].insert(FlagSet::FIXED);
     }
 }
@@ -425,7 +425,7 @@ fn parse_def_id(s: &str) -> Result<DefId, String> {
     let s = s
         .strip_prefix("DefId(")
         .ok_or("does not start with `DefId(`")?;
-    let s = s.strip_suffix(")").ok_or("does not end with `)`")?;
+    let s = s.strip_suffix(')').ok_or("does not end with `)`")?;
     let s = match s.find(" ~ ") {
         Some(i) => &s[..i],
         None => s,
@@ -459,11 +459,11 @@ fn read_fixed_defs_list(fixed_defs: &mut HashSet<DefId>, path: &str) -> io::Resu
     for (i, line) in f.lines().enumerate() {
         let line = line?;
         let line = line.trim();
-        if line.len() == 0 || line.starts_with('#') {
+        if line.is_empty() || line.starts_with('#') {
             continue;
         }
 
-        let def_id = parse_def_id(&line).unwrap_or_else(|e| {
+        let def_id = parse_def_id(line).unwrap_or_else(|e| {
             panic!("failed to parse {} line {}: {}", path, i + 1, e);
         });
         fixed_defs.insert(def_id);
@@ -481,7 +481,7 @@ fn check_rewrite_path_prefixes(tcx: TyCtxt, fixed_defs: &mut HashSet<DefId>, pre
         .split(',')
         // Exclude empty paths.  This allows for leading/trailing commas or double commas within
         // the list, which may result when building the list programmatically.
-        .filter(|prefix| prefix.len() > 0)
+        .filter(|prefix| !prefix.is_empty())
         .map(|prefix| prefix.split("::").map(Symbol::intern).collect::<Vec<_>>())
         .collect();
     let sym_impl = Symbol::intern("{impl}");
@@ -1510,8 +1510,7 @@ fn run2<'tcx>(
             continue;
         }
 
-        let adt_rewrites =
-            rewrite::gen_adt_ty_rewrites(&gacx, &gasn, &global_pointee_types, def_id);
+        let adt_rewrites = rewrite::gen_adt_ty_rewrites(&gacx, &gasn, global_pointee_types, def_id);
         let report = adt_reports.entry(def_id).or_default();
         writeln!(
             report,
@@ -1691,7 +1690,7 @@ fn run2<'tcx>(
             ptrs.push(ptr);
             format!("{{{}}}", ptr)
         });
-        if ptrs.len() == 0 {
+        if ptrs.is_empty() {
             continue;
         }
         ann.emit(span, format_args!("typeof({}) = {}", name, ty_str));
@@ -1789,7 +1788,7 @@ fn run2<'tcx>(
         all_fn_ldids.len()
     );
 
-    if known_perm_error_fns.len() > 0 {
+    if !known_perm_error_fns.is_empty() {
         eprintln!(
             "saw permission errors in {} known fns",
             known_perm_error_fns.len()
@@ -1893,7 +1892,7 @@ fn apply_test_attr_force_non_null_args(
         let mut updates_forbidden = g_updates_forbidden.and_mut(&mut info.l_updates_forbidden);
 
         let lsig = &gacx.fn_sigs[&ldid.to_def_id()];
-        for arg_lty in lsig.inputs.iter().copied() {
+        for arg_lty in lsig.inputs {
             for lty in arg_lty.iter() {
                 let ptr = lty.label;
                 if !ptr.is_none() {
@@ -2014,7 +2013,7 @@ fn print_function_pointee_types<'tcx>(
 
         for ptr in all_pointer_ids {
             let tys = &pointee_types[ptr];
-            if tys.ltys.len() == 0 && !tys.incomplete {
+            if tys.ltys.is_empty() && !tys.incomplete {
                 continue;
             }
             eprintln!(

c2rust-analyze/src/borrowck/type_check.rs

@@ -177,7 +177,7 @@ impl<'tcx> TypeChecker<'tcx, '_> {
                                 self.facts,
                                 self.maps,
                                 &self.acx.gacx.adt_metadata,
-                                &self.acx.gacx.static_tys[&did],
+                                self.acx.gacx.static_tys[&did],
                             );
 
                             for l in lty.iter() {
@@ -585,7 +585,7 @@ impl<'tcx> TypeChecker<'tcx, '_> {
                     }
                     Callee::Memcpy => {
                         let _pl_lty = self.visit_place(destination);
-                        let _rv_lty = assert_matches!(&args[..], [dest, src, _] => {
+                        assert_matches!(&args[..], [dest, src, _] => {
                             self.visit_operand(dest);
                             self.visit_operand(src);
                         });

c2rust-analyze/src/context.rs

@@ -1503,7 +1503,7 @@ pub fn print_ty_with_pointer_labels_into<L: Copy>(
         // Types with arguments
         Adt(adt_def, _substs) => {
             write!(dest, "{:?}", adt_def.did()).unwrap();
-            if lty.args.len() != 0 {
+            if !lty.args.is_empty() {
                 dest.push('<');
                 // TODO: region args
                 for (i, &arg_lty) in lty.args.iter().enumerate() {
@@ -1532,31 +1532,31 @@ pub fn print_ty_with_pointer_labels_into<L: Copy>(
                 dest.push_str("*mut ");
             }
             let s = f(lty.label);
-            if s.len() > 0 {
+            if !s.is_empty() {
                 dest.push_str(&s);
-                dest.push_str(" ");
+                dest.push(' ');
             }
             print_ty_with_pointer_labels_into(dest, lty.args[0], f);
         }
         &Ref(_rg, _ty, mutbl) => {
             let s = f(lty.label);
             if mutbl == Mutability::Not {
-                dest.push_str("&");
-                if s.len() > 0 {
+                dest.push('&');
+                if !s.is_empty() {
                     dest.push(' ');
                 }
             } else {
                 dest.push_str("&mut ");
             }
-            if s.len() > 0 {
+            if !s.is_empty() {
                 dest.push_str(&s);
-                dest.push_str(" ");
+                dest.push(' ');
             }
             print_ty_with_pointer_labels_into(dest, lty.args[0], f);
         }
         FnDef(def_id, _substs) => {
             write!(dest, "{:?}", def_id).unwrap();
-            if lty.args.len() != 0 {
+            if !lty.args.is_empty() {
                 dest.push('<');
                 // TODO: region args
                 for (i, &arg_lty) in lty.args.iter().enumerate() {
@@ -1581,14 +1581,14 @@ pub fn print_ty_with_pointer_labels_into<L: Copy>(
             print_ty_with_pointer_labels_into(dest, ret_lty, f);
         }
         Tuple(_) => {
-            dest.push_str("(");
+            dest.push('(');
             for (i, &arg_lty) in lty.args.iter().enumerate() {
                 if i > 0 {
                     dest.push_str(", ");
                 }
                 print_ty_with_pointer_labels_into(dest, arg_lty, f);
             }
-            dest.push_str(")");
+            dest.push(')');
         }
 
         // Types that aren't actually supported by this code yet

c2rust-analyze/src/dataflow/type_check.rs

@@ -603,7 +603,7 @@ impl<'tcx> TypeChecker<'tcx, '_> {
                 self.visit_operand(&args[0]);
             }
             Callee::Null { .. } => {
-                assert!(args.len() == 0);
+                assert!(args.is_empty());
                 self.visit_place(destination, Mutability::Mut);
                 let pl_lty = self.acx.type_of(destination);
                 // We are assigning a null pointer to `destination`, so it must not have the

c2rust-analyze/src/main.rs

@@ -438,7 +438,7 @@ fn cargo_wrapper(rustc_wrapper: &Path) -> anyhow::Result<()> {
             cmd.env("C2RUST_ANALYZE_FIXED_DEFS_LIST", fixed_defs_list);
         }
 
-        if rewrite_paths.len() > 0 {
+        if !rewrite_paths.is_empty() {
             let rewrite_paths = rewrite_paths.join(OsStr::new(","));
             cmd.env("C2RUST_ANALYZE_REWRITE_PATHS", rewrite_paths);
         }

c2rust-analyze/src/pointee_type/solve.rs

@@ -56,7 +56,7 @@ pub fn propagate_types<'tcx>(
             if new && !ty_sets[ptr1].is_subset(&ty_sets[ptr2]) {
                 let (tys1, tys2) = index_both(&mut ty_sets, ptr1, ptr2);
                 for cty in tys1.iter() {
-                    tys2.insert(cty.clone());
+                    tys2.insert(*cty);
                 }
                 // Since `ty_sets[ptr2]` was not a subset of `ty_sets[ptr1]`, we must have added at
                 // least one element to `ty_sets[ptr2]`.
@@ -75,7 +75,7 @@ pub fn propagate_types<'tcx>(
             if !ty_sets[ptr1].is_subset(&ty_sets[ptr2]) {
                 let (tys1, tys2) = index_both(&mut ty_sets, ptr1, ptr2);
                 for cty in tys1.iter() {
-                    tys2.insert(cty.clone());
+                    tys2.insert(*cty);
                 }
                 // Since `ty_sets[ptr2]` was not a subset of `ty_sets[ptr1]`, we must have added at
                 // least one element to `ty_sets[ptr2]`.