Skip to content

Commit 7fa7e56

Browse files
committed
syntax: Move fn spanned into ast_util
1 parent bcbcbad commit 7fa7e56

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

src/librustsyntax/ast_util.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import codemap::span;
22
import ast::*;
33

4+
fn spanned<T: copy>(lo: uint, hi: uint, t: T) -> spanned<T> {
5+
ret respan(mk_sp(lo, hi), t);
6+
}
7+
48
fn respan<T: copy>(sp: span, t: T) -> spanned<T> {
59
ret {node: t, span: sp};
610
}

src/librustsyntax/parse/attr.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import either::{either, left, right};
2+
import ast_util::spanned;
23
import common::{parse_seq,
34
seq_sep,
45
expect,
5-
parse_ident,
6-
spanned};
6+
parse_ident};
77
import parser::{parse_lit,
88
parse_syntax_ext_naked};
99

src/librustsyntax/parse/common.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import std::map::{hashmap};
2-
import ast::spanned;
2+
import ast_util::spanned;
33
import parser::parser;
44

55
fn token_to_str(reader: reader, token: token::token) -> str {
@@ -27,10 +27,6 @@ fn expect(p: parser, t: token::token) {
2727
}
2828
}
2929

30-
fn spanned<T: copy>(lo: uint, hi: uint, node: T) -> spanned<T> {
31-
ret {node: node, span: ast_util::mk_sp(lo, hi)};
32-
}
33-
3430
fn parse_ident(p: parser) -> ast::ident {
3531
alt p.token {
3632
token::IDENT(i, _) { p.bump(); ret p.get_str(i); }

src/librustsyntax/parse/parser.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import std::map::{hashmap, str_hash};
44
import token::{can_begin_expr, is_ident, is_plain_ident};
55
import codemap::{span,fss_none};
66
import util::interner;
7-
import ast::spanned;
8-
import ast_util::{mk_sp, ident_to_path};
7+
import ast_util::{spanned, mk_sp, ident_to_path};
98
import lexer::reader;
109
import prec::{op_spec, as_prec};
1110
import attr::{parse_outer_attrs_or_ext,

0 commit comments

Comments
 (0)