Change to use std::iter for the previous patch

projectfluent · Apr 19, 2019 · 8a94187 · 8a94187
1 parent 934dd77
commit 8a94187
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/fluent-fallback/examples/simple.rs b/fluent-fallback/examples/simple.rs
@@ -27,7 +27,7 @@ use std::fs;
 use std::fs::File;
 use std::io;
 use std::io::prelude::*;
-use std::iter::from_fn;
+use std::iter;
 use std::str::FromStr;
 
 /// We need a generic file read helper function to
@@ -117,7 +117,7 @@ fn main() {
         let res_mgr = &resources;
         let res_ids = res_ids.to_vec();
 
-        from_fn(move || {
+        iter::from_fn(move || {
             locales.next().map(|locale| {
                 let mut bundle = FluentBundle::new(&[locale]);
                 let res_path = res_path_scheme.replace("{locale}", locale);

diff --git a/fluent-fallback/tests/localization_test.rs b/fluent-fallback/tests/localization_test.rs
@@ -6,7 +6,7 @@ use fluent_fallback::Localization;
 use std::cell::RefCell;
 use std::fs;
 use std::io;
-use std::iter::from_fn;
+use std::iter;
 
 fn read_file(path: &str) -> Result<String, io::Error> {
     fs::read_to_string(path)
@@ -25,7 +25,7 @@ fn localization_format() {
         let res_mgr = &resources;
         let res_ids = res_ids.to_vec();
 
-        from_fn(move || {
+        iter::from_fn(move || {
             locales.next().map(|locale| {
                 let mut bundle = FluentBundle::new(&[locale]);
                 let res_path = res_path_scheme.replace("{locale}", locale);

diff --git a/fluent-resmgr/src/resource_manager.rs b/fluent-resmgr/src/resource_manager.rs
@@ -2,7 +2,7 @@ use elsa::FrozenMap;
 use fluent::{FluentBundle, FluentResource};
 use std::fs;
 use std::io;
-use std::iter::from_fn;
+use std::iter;
 
 fn read_file(path: &str) -> Result<String, io::Error> {
     fs::read_to_string(path)
@@ -55,7 +55,7 @@ impl ResourceManager {
         let res_mgr = self;
         let mut ptr = 0;
 
-        from_fn(move || {
+        iter::from_fn(move || {
             locales.get(ptr).map(|locale| {
                 ptr += 1;
                 let mut bundle = FluentBundle::new(&[locale]);