Skip to content

Commit

Permalink
Fix deprecated try! warnings
Browse files Browse the repository at this point in the history 
Converts the try! macro to the ? operator.
  • Loading branch information
@Bzomak
Bzomak committed Oct 13, 2019
1 parent f54736b commit dbc850d
Show file tree
Hide file tree
Showing 6 changed files with 117 additions and 111 deletions.
50 changes: 25 additions & 25 deletions gl_generator/generators/debug_struct_gen.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ impl super::Generator for DebugStructGenerator {
where
W: io::Write,
{
try!(write_header(dest));
try!(write_type_aliases(registry, dest));
try!(write_enums(registry, dest));
try!(write_fnptr_struct_def(dest));
try!(write_panicking_fns(registry, dest));
try!(write_struct(registry, dest));
try!(write_impl(registry, dest));
write_header(dest)?;
write_type_aliases(registry, dest)?;
write_enums(registry, dest)?;
write_fnptr_struct_def(dest)?;
write_panicking_fns(registry, dest)?;
write_struct(registry, dest)?;
write_impl(registry, dest)?;
Ok(())
}
}
Expand Down Expand Up @@ -59,15 +59,15 @@ fn write_type_aliases<W>(registry: &Registry, dest: &mut W) -> io::Result<()>
where
W: io::Write,
{
try!(writeln!(
writeln!(
dest,
r#"
pub mod types {{
#![allow(non_camel_case_types, non_snake_case, dead_code, missing_copy_implementations)]
"#
));
)?;

try!(super::gen_types(registry.api, dest));
super::gen_types(registry.api, dest)?;

writeln!(dest, "}}")
}
Expand All @@ -78,7 +78,7 @@ where
W: io::Write,
{
for enm in &registry.enums {
try!(super::gen_enum_item(enm, "types::", dest));
super::gen_enum_item(enm, "types::", dest)?;
}

Ok(())
Expand Down Expand Up @@ -151,22 +151,22 @@ fn write_struct<W>(registry: &Registry, dest: &mut W) -> io::Result<()>
where
W: io::Write,
{
try!(writeln!(
writeln!(
dest,
"
#[allow(non_camel_case_types, non_snake_case, dead_code)]
#[derive(Clone)]
pub struct {api} {{",
api = super::gen_struct_name(registry.api)
));
)?;

for cmd in &registry.cmds {
if let Some(v) = registry.aliases.get(&cmd.proto.ident) {
try!(writeln!(dest, "/// Fallbacks: {}", v.join(", ")));
writeln!(dest, "/// Fallbacks: {}", v.join(", "))?;
}
try!(writeln!(dest, "pub {name}: FnPtr,", name = cmd.proto.ident));
writeln!(dest, "pub {name}: FnPtr,", name = cmd.proto.ident)?;
}
try!(writeln!(dest, "_priv: ()"));
writeln!(dest, "_priv: ()")?;

writeln!(dest, "}}")
}
Expand All @@ -176,7 +176,7 @@ fn write_impl<W>(registry: &Registry, dest: &mut W) -> io::Result<()>
where
W: io::Write,
{
try!(writeln!(dest,
writeln!(dest,
"impl {api} {{
/// Load each OpenGL symbol using a custom load function. This allows for the
/// use of functions like `glfwGetProcAddress` or `SDL_GL_GetProcAddress`.
Expand Down Expand Up @@ -204,10 +204,10 @@ where
do_metaloadfn(&mut loadfn, symbol, symbols)
}};
{api} {{",
api = super::gen_struct_name(registry.api)));
api = super::gen_struct_name(registry.api))?;

for cmd in &registry.cmds {
try!(writeln!(
writeln!(
dest,
"{name}: FnPtr::new(metaloadfn(\"{symbol}\", &[{fallbacks}])),",
name = cmd.proto.ident,
Expand All @@ -220,15 +220,15 @@ where
.join(", "),
None => format!(""),
},
))
)?
}
try!(writeln!(dest, "_priv: ()"));
writeln!(dest, "_priv: ()")?;

try!(writeln!(
writeln!(
dest,
"}}
}}"
));
)?;

for cmd in &registry.cmds {
let idents = super::gen_parameters(cmd, true, false);
Expand All @@ -252,7 +252,7 @@ where
.concat()
);

try!(writeln!(dest,
writeln!(dest,
"#[allow(non_snake_case, unused_variables, dead_code)]
#[inline] pub unsafe fn {name}(&self, {params}) -> {return_suffix} {{ \
{println}
Expand All @@ -277,7 +277,7 @@ where
(self.GetError.f)() {{ 0 => (), r => println!("[OpenGL] ^ GL error triggered: {{}}", r) }}"#)
} else {
format!("")
}))
})?
}

writeln!(
Expand Down
60 changes: 33 additions & 27 deletions gl_generator/generators/global_gen.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ impl super::Generator for GlobalGenerator {
where
W: io::Write,
{
try!(write_header(dest));
try!(write_metaloadfn(dest));
try!(write_type_aliases(registry, dest));
try!(write_enums(registry, dest));
try!(write_fns(registry, dest));
try!(write_fnptr_struct_def(dest));
try!(write_ptrs(registry, dest));
try!(write_fn_mods(registry, dest));
try!(write_panicking_fns(registry, dest));
try!(write_load_fn(registry, dest));
write_header(dest)?;
write_metaloadfn(dest)?;
write_type_aliases(registry, dest)?;
write_enums(registry, dest)?;
write_fns(registry, dest)?;
write_fnptr_struct_def(dest)?;
write_ptrs(registry, dest)?;
write_fn_mods(registry, dest)?;
write_panicking_fns(registry, dest)?;
write_load_fn(registry, dest)?;
Ok(())
}
}
Expand Down Expand Up @@ -86,15 +86,15 @@ fn write_type_aliases<W>(registry: &Registry, dest: &mut W) -> io::Result<()>
where
W: io::Write,
{
try!(writeln!(
writeln!(
dest,
r#"
pub mod types {{
#![allow(non_camel_case_types, non_snake_case, dead_code, missing_copy_implementations)]
"#
));
)?;

try!(super::gen_types(registry.api, dest));
super::gen_types(registry.api, dest)?;

writeln!(
dest,
Expand All @@ -110,7 +110,7 @@ where
W: io::Write,
{
for enm in &registry.enums {
try!(super::gen_enum_item(enm, "types::", dest));
super::gen_enum_item(enm, "types::", dest)?;
}

Ok(())
Expand All @@ -126,10 +126,10 @@ where
{
for cmd in &registry.cmds {
if let Some(v) = registry.aliases.get(&cmd.proto.ident) {
try!(writeln!(dest, "/// Fallbacks: {}", v.join(", ")));
writeln!(dest, "/// Fallbacks: {}", v.join(", "))?;
}

try!(writeln!(dest,
writeln!(dest,
"#[allow(non_snake_case, unused_variables, dead_code)] #[inline]
pub unsafe fn {name}({params}) -> {return_suffix} {{ \
__gl_imports::mem::transmute::<_, extern \"system\" fn({typed_params}) -> {return_suffix}>\
Expand All @@ -140,7 +140,7 @@ where
typed_params = super::gen_parameters(cmd, false, true).join(", "),
return_suffix = cmd.proto.ty,
idents = super::gen_parameters(cmd, true, false).join(", "),
));
)?;
}

Ok(())
Expand Down Expand Up @@ -179,24 +179,24 @@ fn write_ptrs<W>(registry: &Registry, dest: &mut W) -> io::Result<()>
where
W: io::Write,
{
try!(writeln!(
writeln!(
dest,
"mod storage {{
#![allow(non_snake_case)]
#![allow(non_upper_case_globals)]
use super::__gl_imports::raw;
use super::FnPtr;"
));
)?;

for c in &registry.cmds {
try!(writeln!(
writeln!(
dest,
"pub static mut {name}: FnPtr = FnPtr {{
f: super::missing_fn_panic as *const raw::c_void,
is_loaded: false
}};",
name = c.proto.ident
));
)?;
}

writeln!(dest, "}}")
Expand Down Expand Up @@ -225,7 +225,9 @@ where
let symbol = super::gen_symbol_name(registry.api, &c.proto.ident[..]);
let symbol = &symbol[..];

try!(writeln!(dest, r##"
writeln!(
dest,
r##"
#[allow(non_snake_case)]
pub mod {fnname} {{
use super::{{storage, metaloadfn}};
Expand All @@ -245,7 +247,11 @@ where
}}
}}
}}
"##, fnname = fnname, fallbacks = fallbacks, symbol = symbol));
"##,
fnname = fnname,
fallbacks = fallbacks,
symbol = symbol
)?;
}

Ok(())
Expand Down Expand Up @@ -276,7 +282,7 @@ fn write_load_fn<W>(registry: &Registry, dest: &mut W) -> io::Result<()>
where
W: io::Write,
{
try!(writeln!(dest,
writeln!(dest,
"
/// Load each OpenGL symbol using a custom load function. This allows for the
/// use of functions like `glfwGetProcAddress` or `SDL_GL_GetProcAddress`.
Expand All @@ -287,14 +293,14 @@ where
pub fn load_with<F>(mut loadfn: F) where F: FnMut(&'static str) -> *const __gl_imports::raw::c_void {{
#[inline(never)]
fn inner(loadfn: &mut dyn FnMut(&'static str) -> *const __gl_imports::raw::c_void) {{
"));
")?;

for c in &registry.cmds {
try!(writeln!(
writeln!(
dest,
"{cmd_name}::load_with(&mut *loadfn);",
cmd_name = &c.proto.ident[..]
));
)?;
}

writeln!(
Expand Down
8 changes: 4 additions & 4 deletions gl_generator/generators/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,15 @@ where
W: io::Write,
{
if let Api::Egl = api {
try!(writeln!(dest, "{}", include_str!("templates/types/egl.rs")));
writeln!(dest, "{}", include_str!("templates/types/egl.rs"))?;
return Ok(());
}

try!(writeln!(dest, "{}", include_str!("templates/types/gl.rs")));
writeln!(dest, "{}", include_str!("templates/types/gl.rs"))?;

match api {
Api::Glx => try!(writeln!(dest, "{}", include_str!("templates/types/glx.rs"))),
Api::Wgl => try!(writeln!(dest, "{}", include_str!("templates/types/wgl.rs"))),
Api::Glx => writeln!(dest, "{}", include_str!("templates/types/glx.rs"))?,
Api::Wgl => writeln!(dest, "{}", include_str!("templates/types/wgl.rs"))?,
_ => {},
}

Expand Down
24 changes: 12 additions & 12 deletions gl_generator/generators/static_gen.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ impl super::Generator for StaticGenerator {
where
W: io::Write,
{
try!(write_header(dest));
try!(write_type_aliases(registry, dest));
try!(write_enums(registry, dest));
try!(write_fns(registry, dest));
write_header(dest)?;
write_type_aliases(registry, dest)?;
write_enums(registry, dest)?;
write_fns(registry, dest)?;
Ok(())
}
}
Expand Down Expand Up @@ -55,15 +55,15 @@ fn write_type_aliases<W>(registry: &Registry, dest: &mut W) -> io::Result<()>
where
W: io::Write,
{
try!(writeln!(
writeln!(
dest,
r#"
pub mod types {{
#![allow(non_camel_case_types, non_snake_case, dead_code, missing_copy_implementations)]
"#
));
)?;

try!(super::gen_types(registry.api, dest));
super::gen_types(registry.api, dest)?;

writeln!(
dest,
Expand All @@ -79,7 +79,7 @@ where
W: io::Write,
{
for enm in &registry.enums {
try!(super::gen_enum_item(enm, "types::", dest));
super::gen_enum_item(enm, "types::", dest)?;
}

Ok(())
Expand All @@ -92,23 +92,23 @@ fn write_fns<W>(registry: &Registry, dest: &mut W) -> io::Result<()>
where
W: io::Write,
{
try!(writeln!(
writeln!(
dest,
"
#[allow(non_snake_case, unused_variables, dead_code)]
extern \"system\" {{"
));
)?;

for cmd in &registry.cmds {
try!(writeln!(
writeln!(
dest,
"#[link_name=\"{symbol}\"]
pub fn {name}({params}) -> {return_suffix};",
symbol = super::gen_symbol_name(registry.api, &cmd.proto.ident),
name = cmd.proto.ident,
params = super::gen_parameters(cmd, true, true).join(", "),
return_suffix = cmd.proto.ty,
));
)?;
}

writeln!(dest, "}}")
Expand Down
Loading

0 comments on commit dbc850d

Please sign in to comment.