rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

auto merge of #11817 : salemtalha/rust/master, r=brson

Browse Source 
Fixes Issue #11815
This commit is contained in:
bors
2014-01-26 15:26:30 -08:00
parent 6743c650c1 40df08a5c2
commit d3f70f5a7d
73 changed files with 121 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libsyntax/ast_map.rs
View File

@@ -86,7 +86,7 @@ pub fn path_elem_to_str(pe: PathElem, itr: @IdentInterner) -> ~str {
/// from, even if it's hard to read (previously they would all just be
/// listed as `__extensions__::method_name::hash`, with no indication
/// of the type).
// XXX: these dollar signs and the names in general are actually a
// FIXME: these dollar signs and the names in general are actually a
// relic of $ being one of the very few valid symbol names on
// unix. These kinds of details shouldn't be exposed way up here
// in the ast.

2
src/libsyntax/codemap.rs
View File

@@ -41,7 +41,7 @@ pub struct BytePos(u32);
#[deriving(Eq,IterBytes, Ord)]
pub struct CharPos(uint);
// XXX: Lots of boilerplate in these impls, but so far my attempts to fix
// FIXME: Lots of boilerplate in these impls, but so far my attempts to fix
// have been unsuccessful
impl Pos for BytePos {

6
src/libsyntax/ext/build.rs
View File

@@ -179,7 +179,7 @@ pub trait AstBuilder {
name: Ident, attrs: ~[ast::Attribute], node: ast::Item_) -> @ast::Item;
fn arg(&self, span: Span, name: Ident, ty: P<ast::Ty>) -> ast::Arg;
// XXX unused self
// FIXME unused self
fn fn_decl(&self, inputs: ~[ast::Arg], output: P<ast::Ty>) -> P<ast::FnDecl>;
fn item_fn_poly(&self,
@@ -724,7 +724,7 @@ impl<'a> AstBuilder for ExtCtxt<'a> {
}
}
// XXX unused self
// FIXME unused self
fn fn_decl(&self, inputs: ~[ast::Arg], output: P<ast::Ty>) -> P<ast::FnDecl> {
P(ast::FnDecl {
inputs: inputs,
@@ -736,7 +736,7 @@ impl<'a> AstBuilder for ExtCtxt<'a> {
fn item(&self, span: Span,
name: Ident, attrs: ~[ast::Attribute], node: ast::Item_) -> @ast::Item {
// XXX: Would be nice if our generated code didn't violate
// FIXME: Would be nice if our generated code didn't violate
// Rust coding conventions
@ast::Item { ident: name,
attrs: attrs,

2
src/libsyntax/ext/expand.rs
View File

@@ -115,7 +115,7 @@ pub fn expand_expr(e: @ast::Expr, fld: &mut MacroExpander) -> @ast::Expr {
// Keep going, outside-in.
//
// XXX(pcwalton): Is it necessary to clone the
// FIXME(pcwalton): Is it necessary to clone the
// node here?
let fully_expanded =
fld.fold_expr(marked_after).node.clone();

8
src/libsyntax/ext/tt/transcribe.rs
View File

@@ -173,7 +173,7 @@ fn lockstep_iter_size(t: &TokenTree, r: &TtReader) -> LockstepIterSize {
// return the next token from the TtReader.
// EFFECT: advances the reader's token field
pub fn tt_next_token(r: &TtReader) -> TokenAndSpan {
// XXX(pcwalton): Bad copy?
// FIXME(pcwalton): Bad copy?
let ret_val = TokenAndSpan {
tok: r.cur_tok.get(),
sp: r.cur_span.get(),
@@ -231,7 +231,7 @@ pub fn tt_next_token(r: &TtReader) -> TokenAndSpan {
}
loop { /* because it's easiest, this handles `TTDelim` not starting
with a `TTTok`, even though it won't happen */
// XXX(pcwalton): Bad copy.
// FIXME(pcwalton): Bad copy.
match r.stack.get().forest[r.stack.get().idx.get()].clone() {
TTDelim(tts) => {
r.stack.set(@TtFrame {
@@ -250,7 +250,7 @@ pub fn tt_next_token(r: &TtReader) -> TokenAndSpan {
return ret_val;
}
TTSeq(sp, tts, sep, zerok) => {
// XXX(pcwalton): Bad copy.
// FIXME(pcwalton): Bad copy.
let t = TTSeq(sp, tts, sep.clone(), zerok);
match lockstep_iter_size(&t, r) {
LisUnconstrained => {
@@ -306,7 +306,7 @@ pub fn tt_next_token(r: &TtReader) -> TokenAndSpan {
return ret_val;
}
MatchedNonterminal(ref other_whole_nt) => {
// XXX(pcwalton): Bad copy.
// FIXME(pcwalton): Bad copy.
r.cur_span.set(sp);
r.cur_tok.set(INTERPOLATED((*other_whole_nt).clone()));
r.stack.get().idx.set(r.stack.get().idx.get() + 1u);

2
src/libsyntax/parse/lexer.rs
View File

@@ -123,7 +123,7 @@ impl Reader for StringReader {
}
fn span_diag(@self) -> @SpanHandler { self.span_diagnostic }
fn peek(@self) -> TokenAndSpan {
// XXX(pcwalton): Bad copy!
// FIXME(pcwalton): Bad copy!
TokenAndSpan {
tok: self.peek_tok.get(),
sp: self.peek_span.get(),

6
src/libsyntax/parse/parser.rs
View File

@@ -1237,7 +1237,7 @@ impl Parser {
Parser::token_is_lifetime(&self.token) {
// CLOSURE
//
// XXX(pcwalton): Eventually `token::LT` will not unambiguously
// FIXME(pcwalton): Eventually `token::LT` will not unambiguously
// introduce a closure, once procs can have lifetime bounds. We
// will need to refactor the grammar a little bit at that point.
@@ -3949,7 +3949,7 @@ impl Parser {
let generics = self.parse_generics();
// This is a new-style impl declaration.
// XXX: clownshoes
// FIXME: clownshoes
let ident = special_idents::clownshoes_extensions;
// Special case: if the next identifier that follows is '(', don't
@@ -4071,7 +4071,7 @@ impl Parser {
token_str))
}
let _ = ast::DUMMY_NODE_ID; // XXX: Workaround for crazy bug.
let _ = ast::DUMMY_NODE_ID; // FIXME: Workaround for crazy bug.
let new_id = ast::DUMMY_NODE_ID;
(class_name,
ItemStruct(@ast::StructDef {

2
src/libsyntax/print/pprust.rs
View File

@@ -2311,7 +2311,7 @@ pub fn print_string(s: &mut State, st: &str, style: ast::StrStyle) {
word(&mut s.s, st);
}
// XXX(pcwalton): A nasty function to extract the string from an `io::Writer`
// FIXME(pcwalton): A nasty function to extract the string from an `io::Writer`
// that we "know" to be a `MemWriter` that works around the lack of checked
// downcasts.
unsafe fn get_mem_writer(writer: &mut ~io::Writer) -> ~str {