diff --git a/capnpc/src/codegen.rs b/capnpc/src/codegen.rs index af6d818a4..579143278 100644 --- a/capnpc/src/codegen.rs +++ b/capnpc/src/codegen.rs @@ -1154,7 +1154,7 @@ fn generate_node(gen: &GeneratorContext, Indent(Box::new(Line("::capnp::traits::FromStructBuilder::new(builder.init_struct(_private::STRUCT_SIZE))".to_string()))), Line("}".to_string()), Line(format!("fn get_from_pointer(builder: ::capnp::private::layout::PointerBuilder<'a>) -> ::capnp::Result> {{", params.params)), - Indent(Box::new(Line("::std::result::Result::Ok(::capnp::traits::FromStructBuilder::new(try!(builder.get_struct(_private::STRUCT_SIZE, ::std::ptr::null()))))".to_string()))), + Indent(Box::new(Line("::std::result::Result::Ok(::capnp::traits::FromStructBuilder::new(builder.get_struct(_private::STRUCT_SIZE, ::std::ptr::null())?))".to_string()))), Line("}".to_string()))))), Line("}".to_string()), BlankLine]); @@ -1218,7 +1218,7 @@ fn generate_node(gen: &GeneratorContext, Indent( Box::new(Branch(vec!( Line(format!("fn get_from_pointer(reader: &::capnp::private::layout::PointerReader<'a>) -> ::capnp::Result> {{",params.params)), - Indent(Box::new(Line("::std::result::Result::Ok(::capnp::traits::FromStructReader::new(try!(reader.get_struct(::std::ptr::null()))))".to_string()))), + Indent(Box::new(Line("::std::result::Result::Ok(::capnp::traits::FromStructReader::new(reader.get_struct(::std::ptr::null())?))".to_string()))), Line("}".to_string()))))), Line("}".to_string()), BlankLine, @@ -1551,7 +1551,7 @@ fn generate_node(gen: &GeneratorContext, Indent( Box::new(Branch(vec![ Line(format!("fn get_from_pointer(reader: &::capnp::private::layout::PointerReader<'a>) -> ::capnp::Result> {{",params.params)), - Indent(Box::new(Line(format!("::std::result::Result::Ok(::capnp::capability::FromClientHook::new(try!(reader.get_capability())))")))), + Indent(Box::new(Line(format!("::std::result::Result::Ok(::capnp::capability::FromClientHook::new(reader.get_capability()?))")))), Line("}".to_string())]))), Line("}".to_string())))); @@ -1565,7 +1565,7 @@ fn generate_node(gen: &GeneratorContext, Indent(Box::new(Line("unimplemented!()".to_string()))), Line("}".to_string()), Line(format!("fn get_from_pointer(builder: ::capnp::private::layout::PointerBuilder<'a>) -> ::capnp::Result> {{", params.params)), - Indent(Box::new(Line("::std::result::Result::Ok(::capnp::capability::FromClientHook::new(try!(builder.get_capability())))".to_string()))), + Indent(Box::new(Line("::std::result::Result::Ok(::capnp::capability::FromClientHook::new(builder.get_capability()?))".to_string()))), Line("}".to_string())]))), Line("}".to_string()), BlankLine]));