Skip to content

Commit

Permalink
Use the question mark operator
Browse files Browse the repository at this point in the history
  • Loading branch information
shreyasm-dev committed Jul 26, 2023
1 parent 37a98f9 commit 6faeefa
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 22 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "jnat"
version = "0.7.0"
version = "0.7.1"
edition = "2021"
license = "MIT"
description = "A wrapper around the jni crate"
Expand Down
25 changes: 4 additions & 21 deletions src/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ impl<'a> Env<'a> {
///
/// * `jni_env` - The JNI environment
pub fn new(jni_env: &'a JNIEnv<'a>) -> Env<'a> {
Env { jni_env: jni_env }
Env { jni_env }
}

/// Gets the native interface
Expand All @@ -34,13 +34,7 @@ impl<'a> Env<'a> {
/// * `name` - The qualified name of the class
pub fn class(&'a self, name: &str) -> Result<Class<'a>, Error> {
let mut jni_env = self.get_jni_env();

let class = jni_env.find_class(name);

match class {
Ok(class) => Ok(Class::new(self, class)),
Err(e) => Err(e),
}
Ok(Class::new(self, jni_env.find_class(name)?))
}

/// Converts a JObject into an Object
Expand All @@ -58,12 +52,7 @@ impl<'a> Env<'a> {
///
/// * `string` - The string to convert
pub fn string(&'a self, string: &'a str) -> Result<JObject<'a>, Error> {
let string = self.jni_env.new_string(string);

match string {
Ok(string) => Ok(string.into()),
Err(e) => Err(e),
}
Ok(JObject::from(self.jni_env.new_string(string)?))
}

/// Gets a string from the JVM, given a JString
Expand All @@ -73,13 +62,7 @@ impl<'a> Env<'a> {
/// * `string` - The JString to convert
pub fn get_string(&'a self, string: &'a JString<'a>) -> Result<String, Error> {
let mut jni_env = self.get_jni_env();

let string = jni_env.get_string(&string);

match string {
Ok(string) => Ok(string.into()),
Err(e) => Err(e),
}
Ok(jni_env.get_string(&string)?.into())
}

/// Gets a JValueGen<JObject>, given a Value
Expand Down

0 comments on commit 6faeefa

Please sign in to comment.