Use modern associated const Lazy initializer

protobuf-codegen/src/code_writer.rs

@@ -103,29 +103,14 @@ impl<'a> CodeWriter<'a> {
     }
 
     pub fn lazy_static(&mut self, name: &str, ty: &str) {
-        self.stmt_block(
-            &format!(
-                "static mut {}: ::protobuf::lazy::Lazy<{}> = ::protobuf::lazy::Lazy",
-                name, ty
-            ),
-            |w| {
-                w.field_entry("lock", "::protobuf::lazy::ONCE_INIT");
-                w.field_entry("ptr", &format!("0 as *const {}", ty));
-            },
-        );
+        self.lazy_static_protobuf_path(name, ty, "::protobuf")
     }
 
     pub fn lazy_static_protobuf_path(&mut self, name: &str, ty: &str, protobuf_crate_path: &str) {
-        self.stmt_block(
-            &format!(
-                "static mut {}: {}::lazy::Lazy<{}> = ::protobuf::lazy::Lazy",
-                name, protobuf_crate_path, ty
-            ),
-            |w| {
-                w.field_entry("lock", &format!("{}::lazy::ONCE_INIT", protobuf_crate_path));
-                w.field_entry("ptr", &format!("0 as *const {}", ty));
-            },
-        );
+        self.write_line(&format!(
+            "static mut {}: {}::lazy::Lazy<{}> = {}::lazy::Lazy::INIT;",
+            name, protobuf_crate_path, ty, protobuf_crate_path,
+        ));
     }
 
     pub fn lazy_static_decl_get<F>(&mut self, name: &str, ty: &str, init: F)

protobuf/src/lazy.rs

@@ -13,6 +13,15 @@ pub struct Lazy<T> {
 }
 
 impl<T> Lazy<T> {
+    /// Uninitialized `Lazy` object.
+    ///
+    /// The initializer is added in rust-protobuf 2.11, for compatibility with
+    /// previously generated code, existing fields are kept public.
+    pub const INIT: Lazy<T> = Lazy {
+        lock: sync::Once::new(),
+        ptr: 0 as *const T,
+    };
+
     /// Get lazy field value, initialize it with given function if not yet.
     pub fn get<F>(&'static mut self, init: F) -> &'static T
     where