Update rules

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -5307,15 +5307,15 @@ Converter::ConvertVariadicTail(clang::Expr *expr,
   unsigned fixed = tgt_ir ? tgt_ir->params.size() : 0;
 
   Buffer buf(*this);
-  StrCat("&[");
+  StrCat("Box::<[VaArg]>::from([");
   for (unsigned i = fixed; i < all_args.size(); ++i) {
     {
       PushParen p(*this);
       ConvertVariadicArg(all_args[i]);
     }
     StrCat(".into()", token::kComma);
   }
-  StrCat("]");
+  StrCat("])");
   return std::move(buf).str();
 }
 

docs/src/rules/conventions.md

@@ -11,7 +11,7 @@ fails the build; the notes below call out the ones that are not checked.
 | Type rule             | `t1`, `t2`, ... via `using`/`typedef`         | `fn tN() -> RustType` with no arguments             |
 | Parameters            | free-form (`o`, `it`, `key`, `dst`, `n`, ...) | must be `a0`, `a1`, ... consecutive from 0          |
 | Generics              | `T1`, `T2`, ... (type and non-type params)    | `T1`, `T2`, ... consecutive from 1                  |
-| Variadic pack         | `typename... Args`                            | trailing `va: &[VaArg]`                             |
+| Variadic pack         | `typename... Args`                            | trailing `va: Box<[VaArg]>`                         |
 | Constructing pack     | `Init<T, Args> &&...args`                     | trailing `init: RustType`                           |
 | Locals in Rust bodies |                                               | double-underscore prefix: `__v`, `__fd`, `__e`, ... |
 

docs/src/rules/writing-rules.md

@@ -267,7 +267,7 @@ int f1(int a0, int a1, ...) { return fcntl(a0, a1, ...); }
 
 is not expressible. A parameter pack can be forwarded (`args...`), which is
 exactly what the rule body needs to do. The Rust side takes a trailing parameter
-that must be typed `&[VaArg]` and named `va`:
+that must be typed `Box<[VaArg]>` and named `va`:
 
 ```cpp
 // rules/fcntl/src.cpp
@@ -279,7 +279,7 @@ int f1(int a0, int a1, Args... args) {
 
 ```rust
 // rules/fcntl/tgt_refcount.rs
-fn f1(a0: i32, a1: i32, va: &[VaArg]) -> i32 { ... }
+fn f1(a0: i32, a1: i32, va: Box<[VaArg]>) -> i32 { ... }
 ```
 
 Bodies read the arguments through the va-args API in `libcc2rs` (`VaArg`,

docs/src/runtime/va-args.md

@@ -39,7 +39,7 @@ sum(3, 10, 20, 30);
 ```
 
 ```rust
-pub fn sum_0(count: i32, __args: &[VaArg]) -> i32 {
+pub fn sum_0(count: i32, __args: Box<[VaArg]>) -> i32 {
     let ap: Value<VaList> = Rc::new(RefCell::new(VaList::default()));
     (*ap.borrow_mut()) = VaList::new(__args);
     let total: Value<i32> = Rc::new(RefCell::new(0));
@@ -48,7 +48,7 @@ pub fn sum_0(count: i32, __args: &[VaArg]) -> i32 {
     // ...
 }
 
-sum_0(3, &[10.into(), 20.into(), 30.into()]);
+sum_0(3, Box::new([10.into(), 20.into(), 30.into()]));
 ```
 
 `arg::<T>()` goes through the `VaArgGet` trait, implemented for the integer and
@@ -59,5 +59,5 @@ panics, as does reading past the last argument.
 
 Variadic libc functions such as `printf` and `fcntl` are handled by
 [variadic rules](../rules/writing-rules.md#variadic-functions), whose bodies
-receive the same `&[VaArg]` slice; `format_c` in the
+receive the same `Box<[VaArg]>`; `format_c` in the
 [format module](./io.md#formatting) consumes one to evaluate a format string.

rule-preprocessor/src/syntactic.rs

@@ -3,7 +3,7 @@
 
 use cfg_expr::Expression;
 use cfg_expr::expr::{Predicate, TargetPredicate};
-use ra_ap_syntax::ast::{HasAttrs, HasGenericParams, HasName, HasTypeBounds};
+use ra_ap_syntax::ast::{HasAttrs, HasGenericArgs, HasGenericParams, HasName, HasTypeBounds};
 use ra_ap_syntax::{AstNode, SyntaxKind, ast, match_ast};
 use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
@@ -41,8 +41,13 @@ fn pointer_flags(ty: &ast::Type) -> (bool, bool) {
 }
 
 fn is_va_args_type(ty: &ast::Type) -> bool {
-    if let ast::Type::RefType(r) = ty
-        && let Some(ast::Type::SliceType(slice)) = r.ty()
+    if let ast::Type::PathType(boxed) = ty
+        && let Some(segment) = boxed.path().and_then(|p| p.segment())
+        && segment.name_ref().is_some_and(|name| name.text() == "Box")
+        && let Some(ast::GenericArg::TypeArg(arg)) = segment
+            .generic_arg_list()
+            .and_then(|args| args.generic_args().next())
+        && let Some(ast::Type::SliceType(slice)) = arg.ty()
     {
         return matches!(slice.ty(), Some(ast::Type::PathType(path))
                 if path

rules/fcntl/tgt_refcount.rs

@@ -3,7 +3,7 @@
 
 use libcc2rs::*;
 
-fn f1(a0: i32, a1: i32, va: &[VaArg]) -> i32 {
+fn f1(a0: i32, a1: i32, va: Box<[VaArg]>) -> i32 {
     let __res = match a1 {
         ::libc::F_GETFL => FdRegistry::with_fd(a0, |__fd| {
             nix::fcntl::fcntl(__fd, nix::fcntl::FcntlArg::F_GETFL)
@@ -34,7 +34,7 @@ fn f1(a0: i32, a1: i32, va: &[VaArg]) -> i32 {
     }
 }
 
-fn f2(a0: Ptr<i8>, a1: i32, va: &[VaArg]) -> i32 {
+fn f2(a0: Ptr<i8>, a1: i32, va: Box<[VaArg]>) -> i32 {
     let __mode = match va.first() {
         Some(__m) => nix::sys::stat::Mode::from_bits_truncate(i32::get(__m) as ::libc::mode_t),
         None => nix::sys::stat::Mode::empty(),

rules/ioctl/tgt_refcount.rs

@@ -3,7 +3,7 @@
 
 use libcc2rs::*;
 
-fn f1(a0: i32, a1: u64, va: &[VaArg]) -> i32 {
+fn f1(a0: i32, a1: u64, va: Box<[VaArg]>) -> i32 {
     panic!(
         "ioctl is not supported in the refcount model (fd={}, request={}, varargs={})",
         a0,

rules/stdio/tgt_refcount.rs

@@ -161,8 +161,8 @@ fn f20(a0: i32, a1: Ptr<i8>) -> Ptr<CFile> {
     Ptr::alloc(CFile::new(a0))
 }
 
-fn f21(a0: Ptr<i8>, a1: usize, a2: Ptr<i8>, va: &[VaArg]) -> i32 {
-    let __s = libcc2rs::format_c(&a2.to_rust_string(), va);
+fn f21(a0: Ptr<i8>, a1: usize, a2: Ptr<i8>, va: Box<[VaArg]>) -> i32 {
+    let __s = libcc2rs::format_c(&a2.to_rust_string(), &va);
     let __b = __s.as_bytes();
     if a1 > 0 {
         let __n = ::std::cmp::min(__b.len(), a1 - 1);
@@ -190,12 +190,12 @@ fn f24(a0: Ptr<CFile>, a1: Ptr<i8>, a2: i32, a3: usize) -> i32 {
     0
 }
 
-fn f28(a0: Ptr<CFile>, a1: Ptr<i8>, va: &[VaArg]) -> i32 {
-    let __s = libcc2rs::format_c(&a1.to_rust_string(), va);
+fn f28(a0: Ptr<CFile>, a1: Ptr<i8>, va: Box<[VaArg]>) -> i32 {
+    let __s = libcc2rs::format_c(&a1.to_rust_string(), &va);
     a0.with_mut(|__f| __f.write(__s.as_bytes())) as i32
 }
 
-fn f29(a0: Ptr<i8>, va: &[VaArg]) -> i32 {
-    let __s = libcc2rs::format_c(&a0.to_rust_string(), va);
+fn f29(a0: Ptr<i8>, va: Box<[VaArg]>) -> i32 {
+    let __s = libcc2rs::format_c(&a0.to_rust_string(), &va);
     libcc2rs::c_stdout().with_mut(|__f| __f.write(__s.as_bytes())) as i32
 }

tests/ub/out/refcount/fd_double_close.rs

@@ -12,7 +12,7 @@ pub fn main() {
 }
 fn main_0() -> i32 {
     let mut fd: i32 = {
-        let __mode = match &[].first() {
+        let __mode = match Box::<[VaArg]>::from([]).first() {
             Some(__m) => nix::sys::stat::Mode::from_bits_truncate(i32::get(__m) as ::libc::mode_t),
             None => nix::sys::stat::Mode::empty(),
         };

tests/ub/out/refcount/fd_use_after_close.rs

@@ -12,7 +12,7 @@ pub fn main() {
 }
 fn main_0() -> i32 {
     let mut fd: i32 = {
-        let __mode = match &[].first() {
+        let __mode = match Box::<[VaArg]>::from([]).first() {
             Some(__m) => nix::sys::stat::Mode::from_bits_truncate(i32::get(__m) as ::libc::mode_t),
             None => nix::sys::stat::Mode::empty(),
         };