support non-mut statics with Option<&T>

JohnTitor · Oct 30, 2018 · 31cae7d · 31cae7d
1 parent e17d4ae
commit 31cae7d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -1427,7 +1427,11 @@ impl<'a> Generator<'a> {
                 return &{c_name};
             }}
         "#,
-                mutbl = if mutbl { "" } else { "const " },
+                mutbl = if mutbl || c_ty.contains("const") {
+                    ""
+                } else {
+                    "const "
+                },
                 ty = c_ty,
                 name = name,
                 c_name = c_name

diff --git a/testcrate/src/t1.c b/testcrate/src/t1.c
@@ -49,5 +49,8 @@ int32_t T1_arr4[2][3] = {{0, 0, 0}, {0, 0, 0}};
 int32_t T1_arr5[1][2][3] = {{{0, 0, 0}, {0, 0, 0}}};
 
 int32_t T1_arr42[1][2][3] = {{{0, 0, 0}, {0, 0, 0}}};
-const int32_t* T1_opt_ref = NULL;
 const int16_t* T1_sref = (void*)(1337);
+
+const int32_t* T1_mut_opt_ref = NULL;
+int32_t* T1_mut_opt_mut_ref = NULL;
+const int32_t* T1_const_opt_const_ref = NULL;
diff --git a/testcrate/src/t1.h b/testcrate/src/t1.h
@@ -81,9 +81,12 @@ extern int32_t T1_arr5[1][2][3];
 
 extern int32_t T1_arr42[1][2][3];
 
-extern const int32_t* T1_opt_ref;
 extern const int16_t* T1_sref;
 
+extern const int32_t* T1_mut_opt_ref;
+extern int32_t* T1_mut_opt_mut_ref;
+extern const int32_t* T1_const_opt_const_ref;
+
 struct Q {
   uint8_t* q0;
   uint8_t** q1;

diff --git a/testcrate/src/t1.rs b/testcrate/src/t1.rs
@@ -107,8 +107,11 @@ extern "C" {
     #[link_name = "T1_arr42"]
     pub static mut T1_arr6: [[[i32; 3]; 2]; 1];
 
-    pub static mut T1_opt_ref: Option<&'static i32>;
     pub static mut T1_sref: &'static i16;
+
+    pub static mut T1_mut_opt_ref: Option<&'static i32>;
+    pub static mut T1_mut_opt_mut_ref: Option<&'static mut i32>;
+    pub static T1_const_opt_const_ref: Option<&'static i32>;
 }
 
 #[repr(C)]