Cargo fmt and update tests

[rust.git] / src / modules.rs

diff --git a/src/modules.rs b/src/modules.rs
index 2f40fd33a55821314039e3dc398782ef6f03506a..30deafd3f9e99d584ac987f0c22136a5c15546ad 100644 (file)
--- a/src/modules.rs
+++ b/src/modules.rs
@@ -8,65 +8,78 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use utils;
-
+use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
-use std::collections::HashMap;
+use std::io;
 
 use syntax::ast;
 use syntax::codemap;
 use syntax::parse::parser;
 
+use utils::contains_skip;
 
 /// List all the files containing modules of a crate.
 /// If a file is used twice in a crate, it appears only once.
-pub fn list_files<'a>(krate: &'a ast::Crate,
-                      codemap: &codemap::CodeMap)
-                      -> HashMap<PathBuf, &'a ast::Mod> {
-    let mut result = HashMap::new();
+pub fn list_files<'a>(
+    krate: &'a ast::Crate,
+    codemap: &codemap::CodeMap,
+) -> Result<BTreeMap<PathBuf, &'a ast::Mod>, io::Error> {
+    let mut result = BTreeMap::new(); // Enforce file order determinism
     let root_filename: PathBuf = codemap.span_to_filename(krate.span).into();
-    list_submodules(&krate.module, root_filename.parent().unwrap(), codemap, &mut result);
+    list_submodules(
+        &krate.module,
+        root_filename.parent().unwrap(),
+        codemap,
+        &mut result,
+    )?;
     result.insert(root_filename, &krate.module);
-    result
+    Ok(result)
 }
 
 /// Recursively list all external modules included in a module.
-fn list_submodules<'a>(module: &'a ast::Mod,
-                       search_dir: &Path,
-                       codemap: &codemap::CodeMap,
-                       result: &mut HashMap<PathBuf, &'a ast::Mod>) {
+fn list_submodules<'a>(
+    module: &'a ast::Mod,
+    search_dir: &Path,
+    codemap: &codemap::CodeMap,
+    result: &mut BTreeMap<PathBuf, &'a ast::Mod>,
+) -> Result<(), io::Error> {
     debug!("list_submodules: search_dir: {:?}", search_dir);
-    for item in module.items.iter() {
-        if let ast::ItemMod(ref sub_mod) = item.node {
-            if !utils::contains_skip(&item.attrs) {
-                let is_internal = codemap.span_to_filename(item.span) ==
-                                  codemap.span_to_filename(sub_mod.inner);
+    for item in &module.items {
+        if let ast::ItemKind::Mod(ref sub_mod) = item.node {
+            if !contains_skip(&item.attrs) {
+                let is_internal =
+                    codemap.span_to_filename(item.span) == codemap.span_to_filename(sub_mod.inner);
                 let dir_path = if is_internal {
                     search_dir.join(&item.ident.to_string())
                 } else {
-                    let mod_path = module_file(item.ident, &item.attrs, search_dir, codemap);
+                    let mod_path = module_file(item.ident, &item.attrs, search_dir, codemap)?;
                     let dir_path = mod_path.parent().unwrap().to_owned();
                     result.insert(mod_path, sub_mod);
                     dir_path
                 };
-                list_submodules(sub_mod, &dir_path, codemap, result);
+                list_submodules(sub_mod, &dir_path, codemap, result)?;
             }
         }
     }
+    Ok(())
 }
 
 /// Find the file corresponding to an external mod
-fn module_file(id: ast::Ident,
-               attrs: &[ast::Attribute],
-               dir_path: &Path,
-               codemap: &codemap::CodeMap)
-               -> PathBuf {
-    if let Some(path) = parser::Parser::submod_path_from_attr(attrs, &dir_path) {
-        return path;
+fn module_file(
+    id: ast::Ident,
+    attrs: &[ast::Attribute],
+    dir_path: &Path,
+    codemap: &codemap::CodeMap,
+) -> Result<PathBuf, io::Error> {
+    if let Some(path) = parser::Parser::submod_path_from_attr(attrs, dir_path) {
+        return Ok(path);
     }
 
-    match parser::Parser::default_submod_path(id, &dir_path, codemap).result {
-        Ok(parser::ModulePathSuccess { path, .. }) => path,
-        Err(_) => panic!("Couldn't find module {}", id)
+    match parser::Parser::default_submod_path(id, dir_path, codemap).result {
+        Ok(parser::ModulePathSuccess { path, .. }) => Ok(path),
+        Err(_) => Err(io::Error::new(
+            io::ErrorKind::Other,
+            format!("Couldn't find module {}", id),
+        )),
     }
 }