---

yaml
---
r: 12552
b: refs/heads/master
c: 7fa7e56
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: bcbcbad7746cdab8465d2df1d9296cd74e30082f
+refs/heads/master: 7fa7e56341a222fd0984e8be7569915a8a90ae33
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/librustsyntax/ast_util.rs

@@ -1,6 +1,10 @@
 import codemap::span;
 import ast::*;
 
+fn spanned<T: copy>(lo: uint, hi: uint, t: T) -> spanned<T> {
+    ret respan(mk_sp(lo, hi), t);
+}
+
 fn respan<T: copy>(sp: span, t: T) -> spanned<T> {
     ret {node: t, span: sp};
 }

trunk/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};
 

trunk/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); }

trunk/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,