Bug 1773733 - Rename L10nRegistry methods to be consistent and idiomatic; r=nordzilla

Differential Revision: https://phabricator.services.mozilla.com/D159444

intl/l10n/rust/l10nregistry-rs/src/registry/asynchronous.rs

@@ -138,7 +138,7 @@ impl<'l, P, B> AsyncTester for GenerateBundles<P, B> {
             .iter()
             .map(|(res_idx, source_idx)| {
                 let resource_id = &self.resource_ids[*res_idx];
-                lock.source_idx(self.current_metasource, *source_idx)
+                lock.filesource(self.current_metasource, *source_idx)
                     .fetch_file(locale, resource_id)
             })
             .collect::<FuturesOrdered<_>>();

intl/l10n/rust/l10nregistry-rs/src/registry/mod.rs

@@ -29,9 +29,9 @@ pub struct L10nRegistryLocked<'a> {
 }
 
 impl<'a> L10nRegistryLocked<'a> {
-    pub fn iter(&self, metasource: usize) -> impl Iterator<Item = &FileSource> {
+    pub fn iter(&self, metasource_idx: usize) -> impl Iterator<Item = &FileSource> {
         self.lock
-            .get(metasource)
+            .get(metasource_idx)
             .expect("Index out-of-range")
             .iter()
     }
@@ -40,22 +40,25 @@ impl<'a> L10nRegistryLocked<'a> {
         self.lock.len()
     }
 
-    pub fn metasource_len(&self, metasource: usize) -> usize {
-        self.lock.get(metasource).expect("Index out-of-range").len()
+    pub fn metasource_len(&self, metasource_idx: usize) -> usize {
+        self.lock
+            .get(metasource_idx)
+            .expect("Index out-of-range")
+            .len()
     }
 
-    pub fn source_idx(&self, metasource: usize, index: usize) -> &FileSource {
-        let source_idx = self.metasource_len(metasource) - 1 - index;
-        self.lock[metasource]
+    pub fn filesource(&self, metasource_idx: usize, filesource_idx: usize) -> &FileSource {
+        let source_idx = self.metasource_len(metasource_idx) - 1 - filesource_idx;
+        self.lock[metasource_idx]
             .get(source_idx)
             .expect("Index out-of-range")
     }
 
     /// Get a [FileSource] by name from a metasource. This is useful for testing.
     #[cfg(feature = "test-fluent")]
-    pub fn file_source_by_name(&self, metasource: usize, name: &str) -> Option<&FileSource> {
+    pub fn file_source_by_name(&self, metasource_idx: usize, name: &str) -> Option<&FileSource> {
         self.lock
-            .get(metasource)
+            .get(metasource_idx)
             .expect("Index out-of-range")
             .iter()
             .find(|&source| source.name == name)
@@ -66,11 +69,11 @@ impl<'a> L10nRegistryLocked<'a> {
     #[cfg(feature = "test-fluent")]
     pub fn get_sources_for_resource<'l>(
         &'l self,
-        metasource: usize,
+        metasource_idx: usize,
         langid: &'l LanguageIdentifier,
         resource_id: &'l ResourceId,
     ) -> impl Iterator<Item = &FileSource> {
-        self.iter(metasource)
+        self.iter(metasource_idx)
             .filter(move |source| source.has_file(langid, resource_id) != Some(false))
     }
 }

intl/l10n/rust/l10nregistry-rs/src/registry/synchronous.rs

@@ -30,7 +30,7 @@ impl<'a> L10nRegistryLocked<'a> {
         let mut errors = vec![];
 
         for (&source_idx, resource_id) in source_order.iter().zip(resource_ids.iter()) {
-            let source = self.source_idx(metasource, source_idx);
+            let source = self.filesource(metasource, source_idx);
             if let ResourceOption::Some(res) =
                 source.fetch_file_sync(&locale, resource_id, /* overload */ true)
             {
@@ -153,7 +153,7 @@ impl<P, B> SyncTester for GenerateBundlesSync<P, B> {
         !self
             .reg
             .lock()
-            .source_idx(self.current_metasource, source_idx)
+            .filesource(self.current_metasource, source_idx)
             .fetch_file_sync(locale, resource_id, /* overload */ true)
             .is_required_and_missing()
     }