Merge pull request #1327 from jf2048/gstring-deref

codegen: Use GString::as_str instead of Option<GString>::as_deref
gtk-rs · Mar 13, 2022 · bb52094 · bb52094
2 parents a4ffdd5 + 9515572
commit bb52094
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/codegen/function_body_chunk.rs b/src/codegen/function_body_chunk.rs
@@ -422,7 +422,10 @@ impl Builder {
                 add_chunk_for_type(env, par.typ, par, &mut body, &ty_name, nullable);
             if is_gstring(&ty_name) {
                 if *nullable {
-                    arguments.push(Chunk::Name(format!("{}.as_ref().as_deref()", par.name)));
+                    arguments.push(Chunk::Name(format!(
+                        "(*{}).as_ref().map(|s| s.as_str())",
+                        par.name
+                    )));
                 } else {
                     arguments.push(Chunk::Name(format!("{}.as_str()", par.name)));
                 }

diff --git a/src/codegen/trampoline_from_glib.rs b/src/codegen/trampoline_from_glib.rs
@@ -38,12 +38,12 @@ impl TrampolineFromGlib for Transformation {
                     );
                 } else if nullable && is_borrow {
                     if is_gstring(&type_name) {
-                        right = format!("{}.as_ref().as_deref()", right);
+                        right = format!("(*{}).as_ref().map(|s| s.as_str())", right);
                     } else {
                         right = format!("{}.as_ref().as_ref()", right);
                     }
                 } else if is_gstring(&type_name) {
-                    right = format!("{}.as_deref()", right);
+                    right = format!("{}.as_str()", right);
                 } else {
                     right = format!("{}.as_ref()", right);
                 }