Skip to content

Commit 1ba0ddc

Browse files
committed
bump edition in jni-gen
1 parent 5ea40f7 commit 1ba0ddc

File tree

10 files changed

+33
-32
lines changed

10 files changed

+33
-32
lines changed

jni-gen/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ description = "Generator of Rust bindings to Java classes"
55
authors = ["Federico Poli <[email protected]>"]
66
license = "MPL-2.0"
77
readme = "README.md"
8+
edition = "2018"
89

910
[dependencies]
1011
log = { version = "0.4", features = ["release_max_level_info"] }

jni-gen/src/generators/class.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
// License, v. 2.0. If a copy of the MPL was not distributed with this
55
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
66

7-
use class_name::*;
8-
use errors::*;
9-
use generators::constructor::*;
10-
use generators::method::*;
11-
use generators::scala_object_getter::*;
7+
use crate::class_name::*;
8+
use crate::errors::*;
9+
use crate::generators::constructor::*;
10+
use crate::generators::method::*;
11+
use crate::generators::scala_object_getter::*;
1212
use jni::JNIEnv;
13-
use wrapper_spec::*;
13+
use crate::wrapper_spec::*;
1414

1515
pub struct ClassGenerator<'a> {
1616
env: &'a JNIEnv<'a>,

jni-gen/src/generators/constructor.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
// License, v. 2.0. If a copy of the MPL was not distributed with this
55
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
66

7-
use class_name::*;
8-
use errors::*;
9-
use jni::objects::JValue;
10-
use jni::JNIEnv;
7+
use crate::class_name::*;
8+
use crate::errors::*;
9+
use crate::jni::objects::JValue;
10+
use crate::jni::JNIEnv;
1111
use std::collections::HashMap;
12-
use utils::*;
12+
use crate::utils::*;
1313

1414
pub fn generate_constructor(
1515
env: &JNIEnv,

jni-gen/src/generators/method.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
// License, v. 2.0. If a copy of the MPL was not distributed with this
55
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
66

7-
use class_name::*;
8-
use errors::*;
9-
use jni::objects::JObject;
10-
use jni::objects::JValue;
11-
use jni::JNIEnv;
7+
use crate::class_name::*;
8+
use crate::errors::*;
9+
use crate::jni::objects::JObject;
10+
use crate::jni::objects::JValue;
11+
use crate::jni::JNIEnv;
1212
use std::collections::HashMap;
13-
use utils::*;
13+
use crate::utils::*;
1414

1515
pub fn generate_method(
1616
env: &JNIEnv,

jni-gen/src/generators/module.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
// License, v. 2.0. If a copy of the MPL was not distributed with this
55
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
66

7-
use class_name::*;
8-
use module_tree::*;
7+
use crate::class_name::*;
8+
use crate::module_tree::*;
99
use std::collections::HashMap;
1010

1111
pub fn generate_module(class_names: Vec<&ClassName>) -> String {

jni-gen/src/generators/scala_object_getter.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
// License, v. 2.0. If a copy of the MPL was not distributed with this
55
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
66

7-
use class_name::*;
8-
use errors::Result;
7+
use crate::class_name::*;
8+
use crate::errors::Result;
99
use jni::JNIEnv;
1010

1111
pub fn generate_scala_object_getter(env: &JNIEnv, class_name: &ClassName) -> Result<String> {

jni-gen/src/module_tree.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ impl ModuleTree {
109109
#[cfg(test)]
110110
mod tests {
111111
use super::*;
112-
use unordered_set_eq::*;
112+
use crate::unordered_set_eq::*;
113113

114114
macro_rules! string_vec {
115115
($($x:expr),*) => (vec![$($x.to_string()),*]);

jni-gen/src/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// License, v. 2.0. If a copy of the MPL was not distributed with this
55
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
66

7-
use errors::*;
7+
use crate::errors::*;
88
use jni::strings::JavaStr;
99
use std::ffi::CStr;
1010

jni-gen/src/wrapper_generator.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
// License, v. 2.0. If a copy of the MPL was not distributed with this
55
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
66

7-
use class_name::*;
8-
use errors::Result as LocalResult;
9-
use generators::class::ClassGenerator;
10-
use generators::module::*;
11-
use jni::InitArgsBuilder;
12-
use jni::JNIVersion;
13-
use jni::JavaVM;
7+
use crate::class_name::*;
8+
use crate::errors::Result as LocalResult;
9+
use crate::generators::class::ClassGenerator;
10+
use crate::generators::module::*;
11+
use crate::jni::InitArgsBuilder;
12+
use crate::jni::JNIVersion;
13+
use crate::jni::JavaVM;
1414
use std::fs::create_dir_all;
1515
use std::fs::OpenOptions;
1616
use std::io::prelude::*;
1717
use std::path::Path;
18-
use wrapper_spec::*;
18+
use crate::wrapper_spec::*;
1919

2020
pub struct WrapperGenerator {
2121
jars: Vec<String>,

jni-gen/src/wrapper_spec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// License, v. 2.0. If a copy of the MPL was not distributed with this
55
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
66

7-
use class_name::*;
7+
use crate::class_name::*;
88

99
#[derive(Debug, Clone)]
1010
pub struct ClassWrapperSpec {

0 commit comments

Comments
 (0)