about summary refs log tree commit diff
path: root/compiler/rustc_builtin_macros/src/source_util.rs
diff options
context:
space:
mode:
authorVadim Petrochenkov <vadim.petrochenkov@gmail.com>2021-02-22 19:06:36 +0300
committerVadim Petrochenkov <vadim.petrochenkov@gmail.com>2021-03-05 01:33:43 +0300
commit46b67aa74d8ee7d9c41983e15f8cd0f17ee27ae7 (patch)
treee7ed5a0129fb03a3f9c257d68d44a60b44ea444a /compiler/rustc_builtin_macros/src/source_util.rs
parent3d0b622ab7ae3f803d757f73f2a9a7c857d771bb (diff)
downloadrust-46b67aa74d8ee7d9c41983e15f8cd0f17ee27ae7.tar.gz
rust-46b67aa74d8ee7d9c41983e15f8cd0f17ee27ae7.zip
expand: Some more consistent naming in module loading
Diffstat (limited to 'compiler/rustc_builtin_macros/src/source_util.rs')
-rw-r--r--compiler/rustc_builtin_macros/src/source_util.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_builtin_macros/src/source_util.rs b/compiler/rustc_builtin_macros/src/source_util.rs
index 98659f15a7e..4aafcb2fb6d 100644
--- a/compiler/rustc_builtin_macros/src/source_util.rs
+++ b/compiler/rustc_builtin_macros/src/source_util.rs
@@ -4,7 +4,7 @@ use rustc_ast::token;
 use rustc_ast::tokenstream::TokenStream;
 use rustc_ast_pretty::pprust;
 use rustc_expand::base::{self, *};
-use rustc_expand::module::DirectoryOwnership;
+use rustc_expand::module::DirOwnership;
 use rustc_parse::parser::{ForceCollect, Parser};
 use rustc_parse::{self, new_parser_from_file};
 use rustc_session::lint::builtin::INCOMPLETE_INCLUDE;
@@ -116,7 +116,7 @@ pub fn expand_include<'cx>(
     // `MacroExpander::fully_expand_fragment` later restores, so "stack discipline" is maintained.
     let dir_path = file.parent().unwrap_or(&file).to_owned();
     cx.current_expansion.module = Rc::new(cx.current_expansion.module.with_dir_path(dir_path));
-    cx.current_expansion.directory_ownership = DirectoryOwnership::Owned { relative: None };
+    cx.current_expansion.dir_ownership = DirOwnership::Owned { relative: None };
 
     struct ExpandResult<'a> {
         p: Parser<'a>,