nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-29 18:23:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #82706 - klensy:expn-data, r=petrochenkov

Browse Source 
use outer_expn_data() instead of outer_expn().expn_data()

From the comment in hygiene.rs, so use it:
https://github.com/rust-lang/rust/blob/master/compiler/rustc_span/src/hygiene.rs#L627-L632
This commit is contained in:
Yuki Okushi 2021-03-03 16:27:45 +09:00 committed by GitHub
commit 651f53e517
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_resolve/src/lib.rs
View File

@ -1422,7 +1422,7 @@ impl<'a> Resolver<'a> {
fn macro_def(&self, mut ctxt: SyntaxContext) -> DefId { fn macro_def(&self, mut ctxt: SyntaxContext) -> DefId {
loop { loop {
match ctxt.outer_expn().expn_data().macro_def_id { match ctxt.outer_expn_data().macro_def_id {
Some(def_id) => return def_id, Some(def_id) => return def_id,
None => ctxt.remove_mark(), None => ctxt.remove_mark(),
}; };