From 90812bfe7357ea4c37d69e68600da033994c79b7 Mon Sep 17 00:00:00 2001
From: Lucas Silva Shepard <theshepard@google.com>
Date: Fri, 18 Aug 2023 17:24:54 -0700
Subject: [PATCH] [fp-rs] Making some values const rather than static or
 inlined.

---
 fastpair/rust/demo/rust/src/api.rs     | 4 +++-
 fastpair/rust/demo/rust/src/decoder.rs | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fastpair/rust/demo/rust/src/api.rs b/fastpair/rust/demo/rust/src/api.rs
index 5948bd57..09affea4 100644
--- a/fastpair/rust/demo/rust/src/api.rs
+++ b/fastpair/rust/demo/rust/src/api.rs
@@ -124,6 +124,8 @@ fn init_cache() {
 
 /// Sets up initial constructs and infinitely polls for advertisements.
 pub fn init() {
+    const JSON_PATH: &str = "./local";
+
     let run = async {
         info!("start making adapter");
 
@@ -134,7 +136,7 @@ pub fn init() {
 
         let mut latest_advertisement_map = HashMap::new();
         let datatype_selector = vec![BleDataTypeId::ServiceData16BitUuid];
-        let fetcher: Box<dyn FpFetcher> = Box::new(FpFetcherFs::new(String::from("./local")));
+        let fetcher: Box<dyn FpFetcher> = Box::new(FpFetcherFs::new(String::from(JSON_PATH)));
 
         loop {
             // Retrieve the next received advertisement.
diff --git a/fastpair/rust/demo/rust/src/decoder.rs b/fastpair/rust/demo/rust/src/decoder.rs
index 91902e20..2083f83a 100644
--- a/fastpair/rust/demo/rust/src/decoder.rs
+++ b/fastpair/rust/demo/rust/src/decoder.rs
@@ -28,7 +28,7 @@ impl FpDecoder {
     pub(crate) fn get_model_id_from_service_data<U: Copy>(
         service_data: &ServiceData<U>,
     ) -> Result<Vec<u8>, FpError> {
-        static MIN_MODEL_ID_LENGTH: usize = 3;
+        const MIN_MODEL_ID_LENGTH: usize = 3;
         let data = service_data.data();
 
         if data.len() < MIN_MODEL_ID_LENGTH {