about summary refs log tree commit diff
path: root/src/librustsyntax/parse
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-04-19 21:24:42 -0700
committerBrian Anderson <banderson@mozilla.com>2012-04-19 21:58:45 -0700
commit7fa7e56341a222fd0984e8be7569915a8a90ae33 (patch)
tree8e23f7aca88d7785ffbda9572052f277d867e034 /src/librustsyntax/parse
parentbcbcbad7746cdab8465d2df1d9296cd74e30082f (diff)
downloadrust-7fa7e56341a222fd0984e8be7569915a8a90ae33.tar.gz
rust-7fa7e56341a222fd0984e8be7569915a8a90ae33.zip
syntax: Move fn spanned into ast_util
Diffstat (limited to 'src/librustsyntax/parse')
-rw-r--r--src/librustsyntax/parse/attr.rs4
-rw-r--r--src/librustsyntax/parse/common.rs6
-rw-r--r--src/librustsyntax/parse/parser.rs3
3 files changed, 4 insertions, 9 deletions
diff --git a/src/librustsyntax/parse/attr.rs b/src/librustsyntax/parse/attr.rs
index b7caa00a2af..969aa03d902 100644
--- a/src/librustsyntax/parse/attr.rs
+++ b/src/librustsyntax/parse/attr.rs
@@ -1,9 +1,9 @@
 import either::{either, left, right};
+import ast_util::spanned;
 import common::{parse_seq,
                 seq_sep,
                 expect,
-                parse_ident,
-                spanned};
+                parse_ident};
 import parser::{parse_lit,
                 parse_syntax_ext_naked};
 
diff --git a/src/librustsyntax/parse/common.rs b/src/librustsyntax/parse/common.rs
index ba0d4530cff..2f95a65dbd6 100644
--- a/src/librustsyntax/parse/common.rs
+++ b/src/librustsyntax/parse/common.rs
@@ -1,5 +1,5 @@
 import std::map::{hashmap};
-import ast::spanned;
+import ast_util::spanned;
 import parser::parser;
 
 fn token_to_str(reader: reader, token: token::token) -> str {
@@ -27,10 +27,6 @@ fn expect(p: parser, t: token::token) {
     }
 }
 
-fn spanned<T: copy>(lo: uint, hi: uint, node: T) -> spanned<T> {
-    ret {node: node, span: ast_util::mk_sp(lo, hi)};
-}
-
 fn parse_ident(p: parser) -> ast::ident {
     alt p.token {
       token::IDENT(i, _) { p.bump(); ret p.get_str(i); }
diff --git a/src/librustsyntax/parse/parser.rs b/src/librustsyntax/parse/parser.rs
index 2a8e683dee5..8340fa2f6e7 100644
--- a/src/librustsyntax/parse/parser.rs
+++ b/src/librustsyntax/parse/parser.rs
@@ -4,8 +4,7 @@ import std::map::{hashmap, str_hash};
 import token::{can_begin_expr, is_ident, is_plain_ident};
 import codemap::{span,fss_none};
 import util::interner;
-import ast::spanned;
-import ast_util::{mk_sp, ident_to_path};
+import ast_util::{spanned, mk_sp, ident_to_path};
 import lexer::reader;
 import prec::{op_spec, as_prec};
 import attr::{parse_outer_attrs_or_ext,