// option. This file may not be copied, modified, or distributed
// except according to those terms.
-use utils;
-
-use std::path::{Path, PathBuf};
use std::collections::BTreeMap;
+use std::path::{Path, PathBuf};
+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,
-) -> BTreeMap<PathBuf, &'a ast::Mod> {
+) -> 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(
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.
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 {
if let ast::ItemKind::Mod(ref sub_mod) = item.node {
- if !utils::contains_skip(&item.attrs) {
+ 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
attrs: &[ast::Attribute],
dir_path: &Path,
codemap: &codemap::CodeMap,
-) -> PathBuf {
+) -> Result<PathBuf, io::Error> {
if let Some(path) = parser::Parser::submod_path_from_attr(attrs, dir_path) {
- return 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),
+ Ok(parser::ModulePathSuccess { path, .. }) => Ok(path),
+ Err(_) => Err(io::Error::new(
+ io::ErrorKind::Other,
+ format!("Couldn't find module {}", id),
+ )),
}
}