diff options
| author | bors <bors@rust-lang.org> | 2016-09-15 06:14:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-15 06:14:26 -0700 |
| commit | dc75933abaf3f6d619ada2bbc12b01bc85ddb4ae (patch) | |
| tree | 034d03910e6757b5455e0792aacf4ed021c72383 /src/libsyntax/ext/source_util.rs | |
| parent | e2c64d16906dbb29763d6cbf022164a09247ef9f (diff) | |
| parent | ec08128882b165a93b3fd1f99c9606ad5e09b3dc (diff) | |
| download | rust-dc75933abaf3f6d619ada2bbc12b01bc85ddb4ae.tar.gz rust-dc75933abaf3f6d619ada2bbc12b01bc85ddb4ae.zip | |
Auto merge of #36491 - Manishearth:rollup, r=Manishearth
Rollup of 9 pull requests - Successful merges: #36384, #36405, #36425, #36429, #36438, #36454, #36459, #36461, #36463 - Failed merges: #36444
Diffstat (limited to 'src/libsyntax/ext/source_util.rs')
| -rw-r--r-- | src/libsyntax/ext/source_util.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs index 105b2261117..e75e41d0c2d 100644 --- a/src/libsyntax/ext/source_util.rs +++ b/src/libsyntax/ext/source_util.rs @@ -74,8 +74,8 @@ pub fn expand_stringify(cx: &mut ExtCtxt, sp: Span, tts: &[tokenstream::TokenTre pub fn expand_mod(cx: &mut ExtCtxt, sp: Span, tts: &[tokenstream::TokenTree]) -> Box<base::MacResult+'static> { base::check_zero_tts(cx, sp, tts, "module_path!"); - let paths = cx.syntax_env.paths(); - let string = paths.mod_path.iter().map(|x| x.to_string()).collect::<Vec<String>>().join("::"); + let mod_path = &cx.current_expansion.module.mod_path; + let string = mod_path.iter().map(|x| x.to_string()).collect::<Vec<String>>().join("::"); base::MacEager::expr(cx.expr_str( sp, |