bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Do not rely on newtype enum dereference

Browse source
This commit is contained in:
Seo Sanghyeon 2013-07-02 18:31:00 +09:00
parent c9b9462e8f
commit 2e65782c17
5 changed files with 29 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libsyntax/ext/source_util.rs
View file

@ -10,8 +10,8 @@
use ast;
use codemap;
use codemap::{Pos, ExpandedFrom, span};
use codemap::{CallInfo, NameAndSpan};
use codemap::{Pos, span};
use codemap::{ExpnInfo, NameAndSpan};
use ext::base::*;
use ext::base;
use ext::build::AstBuilder;
@ -117,14 +117,14 @@ pub fn expand_include_bin(cx: @ExtCtxt, sp: span, tts: &[ast::token_tree])
// recur along an ExpnInfo chain to find the original expression
fn topmost_expn_info(expn_info: @codemap::ExpnInfo) -> @codemap::ExpnInfo {
match *expn_info {
ExpandedFrom(CallInfo { call_site: ref call_site, _ }) => {
ExpnInfo { call_site: ref call_site, _ } => {
match call_site.expn_info {
Some(next_expn_info) => {
match *next_expn_info {
ExpandedFrom(CallInfo {
ExpnInfo {
callee: NameAndSpan { name: ref name, _ },
_
}) => {
} => {
// Don't recurse into file using "include!"
if "include" == *name {
expn_info