From 7d4ff20aa1c4d7e45faec5c3a17199219696b590 Mon Sep 17 00:00:00 2001 From: Jonathan Behrens Date: Thu, 24 Dec 2020 16:39:08 -0500 Subject: [PATCH 1/3] Fix unused mut warning --- rust/src/interface.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/src/interface.rs b/rust/src/interface.rs index e4e3a016..b538f67b 100644 --- a/rust/src/interface.rs +++ b/rust/src/interface.rs @@ -307,7 +307,7 @@ pub fn recover_nearest(code: &str, ref_pt: Point) -> Result } let prefix_len = SEPARATOR_POSITION - code.find(SEPARATOR).unwrap(); - let mut code = prefix_by_reference(ref_pt, prefix_len) + code; + let code = prefix_by_reference(ref_pt, prefix_len) + code; let code_area = decode(code.as_str()).unwrap(); From c00550318c33c8f40f6f0ca45547367be0185d7f Mon Sep 17 00:00:00 2001 From: Jonathan Behrens Date: Thu, 24 Dec 2020 16:35:46 -0500 Subject: [PATCH 2/3] Upgrade rust library dependencies --- rust/Cargo.toml | 4 ++-- rust/tests/all_test.rs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 633b5e07..b1290949 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["geography", "geospatial", "gis", "gps", "olc"] exclude = ["rust.iml"] [dependencies] -geo = "^0.4.3" +geo = "0.16.0" [dev-dependencies] -rand = "^0.6.5" +rand = "0.8.0" diff --git a/rust/tests/all_test.rs b/rust/tests/all_test.rs index e21a18a9..879e66d5 100644 --- a/rust/tests/all_test.rs +++ b/rust/tests/all_test.rs @@ -136,9 +136,9 @@ fn benchmark_test() { let loops = 100000; let mut bd: Vec = Vec::new(); for _i in 0..loops { - let lat = rng.gen_range(-90.0, 90.0); - let lng = rng.gen_range(-180.0, 180.0); - let mut len = rng.gen_range(2, 15); + let lat = rng.gen_range(-90.0..90.0); + let lng = rng.gen_range(-180.0..180.0); + let mut len = rng.gen_range(2..15); // Make sure the length is even if it's less than 10. if len < 10 && len % 2 == 1 { len += 1; From 9aff92d58359d1ca30ebc890b1bd758269a7a61e Mon Sep 17 00:00:00 2001 From: Jonathan Behrens Date: Thu, 24 Dec 2020 16:36:18 -0500 Subject: [PATCH 3/3] Bump Rust library version --- rust/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/Cargo.toml b/rust/Cargo.toml index b1290949..c5bd02cc 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "open-location-code" description = "Library for translating between GPS coordinates (WGS84) and Open Location Code" -version = "0.1.0" +version = "0.2.0" authors = ["James Fysh "] license = "Apache-2.0" repository = "https://github.com/google/open-location-code"