X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmodules.rs;h=aa36f4103e4231268738213bb5020765b457556a;hb=6fb188bd43840f4a99c6a4b4cdbdb21ccf3304e7;hp=0f439910324e997429af6bb1a499b1426a7b8119;hpb=3320b400aec227d01c3c09f7ef1f6a24beb976fe;p=rust.git

diff --git a/src/modules.rs b/src/modules.rs
index 0f439910324..aa36f4103e4 100644
--- a/src/modules.rs
+++ b/src/modules.rs
@@ -13,52 +13,75 @@
 use std::path::{Path, PathBuf};
 
 use syntax::ast;
-use syntax::codemap::{self, FileName};
-use syntax::parse::parser;
+use syntax::parse::{parser, DirectoryOwnership};
+use syntax::source_map;
+use syntax_pos::symbol::Symbol;
 
+use config::FileName;
 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,
+    source_map: &source_map::SourceMap,
 ) -> Result<BTreeMap<FileName, &'a ast::Mod>, io::Error> {
     let mut result = BTreeMap::new(); // Enforce file order determinism
-    let root_filename = codemap.span_to_filename(krate.span);
+    let root_filename = source_map.span_to_filename(krate.span);
     {
         let parent = match root_filename {
-            FileName::Real(ref path) => path.parent().unwrap(),
+            source_map::FileName::Real(ref path) => path.parent().unwrap(),
             _ => Path::new(""),
         };
-        list_submodules(&krate.module, parent, codemap, &mut result)?;
+        list_submodules(&krate.module, parent, None, source_map, &mut result)?;
     }
-    result.insert(root_filename, &krate.module);
+    result.insert(root_filename.into(), &krate.module);
     Ok(result)
 }
 
+fn path_value(attr: &ast::Attribute) -> Option<Symbol> {
+    if attr.name() == "path" {
+        attr.value_str()
+    } else {
+        None
+    }
+}
+
+// N.B. Even when there are multiple `#[path = ...]` attributes, we just need to
+// examine the first one, since rustc ignores the second and the subsequent ones
+// as unused attributes.
+fn find_path_value(attrs: &[ast::Attribute]) -> Option<Symbol> {
+    attrs.iter().flat_map(path_value).next()
+}
+
 /// Recursively list all external modules included in a module.
 fn list_submodules<'a>(
     module: &'a ast::Mod,
     search_dir: &Path,
-    codemap: &codemap::CodeMap,
+    relative: Option<ast::Ident>,
+    source_map: &source_map::SourceMap,
     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 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())
+                let is_internal = source_map.span_to_filename(item.span)
+                    == source_map.span_to_filename(sub_mod.inner);
+                let (dir_path, relative) = if is_internal {
+                    if let Some(path) = find_path_value(&item.attrs) {
+                        (search_dir.join(&path.as_str()), None)
+                    } else {
+                        (search_dir.join(&item.ident.to_string()), None)
+                    }
                 } else {
-                    let mod_path = module_file(item.ident, &item.attrs, search_dir, codemap)?;
+                    let (mod_path, relative) =
+                        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
+                    (dir_path, relative)
                 };
-                list_submodules(sub_mod, &dir_path, codemap, result)?;
+                list_submodules(sub_mod, &dir_path, relative, source_map, result)?;
             }
         }
     }
@@ -70,14 +93,26 @@ fn module_file(
     id: ast::Ident,
     attrs: &[ast::Attribute],
     dir_path: &Path,
-    codemap: &codemap::CodeMap,
-) -> Result<PathBuf, io::Error> {
+    relative: Option<ast::Ident>,
+    source_map: &source_map::SourceMap,
+) -> Result<(PathBuf, Option<ast::Ident>), io::Error> {
     if let Some(path) = parser::Parser::submod_path_from_attr(attrs, dir_path) {
-        return Ok(path);
+        return Ok((path, None));
     }
 
-    match parser::Parser::default_submod_path(id, None, dir_path, codemap).result {
-        Ok(parser::ModulePathSuccess { path, .. }) => Ok(path),
+    match parser::Parser::default_submod_path(id, relative, dir_path, source_map).result {
+        Ok(parser::ModulePathSuccess {
+            path,
+            directory_ownership,
+            ..
+        }) => {
+            let relative = if let DirectoryOwnership::Owned { relative } = directory_ownership {
+                relative
+            } else {
+                None
+            };
+            Ok((path, relative))
+        }
         Err(_) => Err(io::Error::new(
             io::ErrorKind::Other,
             format!("Couldn't find module {}", id),