) -> Result<BTreeMap<FileName, &'a ast::Mod>, io::Error> {
let mut result = BTreeMap::new(); // Enforce file order determinism
) -> Result<BTreeMap<FileName, &'a ast::Mod>, io::Error> {
let mut result = BTreeMap::new(); // Enforce file order determinism
- list_submodules(&krate.module, parent, None, codemap, &mut result)?;
+ list_submodules(&krate.module, parent, None, source_map, &mut result)?;
result: &mut BTreeMap<FileName, &'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 !contains_skip(&item.attrs) {
result: &mut BTreeMap<FileName, &'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 !contains_skip(&item.attrs) {
let (dir_path, relative) = if is_internal {
if let Some(path) = find_path_value(&item.attrs) {
(search_dir.join(&path.as_str()), None)
let (dir_path, relative) = if is_internal {
if let Some(path) = find_path_value(&item.attrs) {
(search_dir.join(&path.as_str()), None)
- module_file(item.ident, &item.attrs, search_dir, relative, codemap)?;
+ module_file(item.ident, &item.attrs, search_dir, relative, source_map)?;
let dir_path = mod_path.parent().unwrap().to_owned();
result.insert(FileName::Real(mod_path), sub_mod);
(dir_path, relative)
};
let dir_path = mod_path.parent().unwrap().to_owned();
result.insert(FileName::Real(mod_path), sub_mod);
(dir_path, relative)
};
- list_submodules(sub_mod, &dir_path, relative, codemap, result)?;
+ list_submodules(sub_mod, &dir_path, relative, source_map, result)?;
attrs: &[ast::Attribute],
dir_path: &Path,
relative: Option<ast::Ident>,
attrs: &[ast::Attribute],
dir_path: &Path,
relative: Option<ast::Ident>,
) -> Result<(PathBuf, Option<ast::Ident>), io::Error> {
if let Some(path) = parser::Parser::submod_path_from_attr(attrs, dir_path) {
return Ok((path, None));
}
) -> Result<(PathBuf, Option<ast::Ident>), io::Error> {
if let Some(path) = parser::Parser::submod_path_from_attr(attrs, dir_path) {
return Ok((path, None));
}
- match parser::Parser::default_submod_path(id, relative, dir_path, codemap).result {
+ match parser::Parser::default_submod_path(id, relative, dir_path, source_map).result {