Skip to content
This repository has been archived by the owner on May 6, 2020. It is now read-only.

Get 0.29.x to compile on latest nightly #113

Merged
merged 1 commit into from
Jan 25, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion syntex_syntax/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "syntex_syntax"
version = "0.29.1"
version = "0.29.3"
authors = [ "erick.tryzelaar@gmail.com" ]
license = "MIT/Apache-2.0"
description = "Export of libsyntax for code generation"
Expand Down
4 changes: 2 additions & 2 deletions syntex_syntax/src/attr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -818,8 +818,8 @@ pub type ThinAttributes = Option<Box<Vec<Attribute>>>;
pub trait ThinAttributesExt {
fn map_thin_attrs<F>(self, f: F) -> Self
where F: FnOnce(Vec<Attribute>) -> Vec<Attribute>;
fn prepend(mut self, attrs: Self) -> Self;
fn append(mut self, attrs: Self) -> Self;
fn prepend(self, attrs: Self) -> Self;
fn append(self, attrs: Self) -> Self;
fn update<F>(&mut self, f: F)
where Self: Sized,
F: FnOnce(Self) -> Self;
Expand Down
3 changes: 0 additions & 3 deletions syntex_syntax/src/errors/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ use errors::emitter::{Emitter, EmitterWriter};

use std::cell::{RefCell, Cell};
use std::{error, fmt};
use std::io::prelude::*;
use std::rc::Rc;
use term;

Expand Down Expand Up @@ -644,8 +643,6 @@ pub enum Level {

impl fmt::Display for Level {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
use std::fmt::Display;

self.to_str().fmt(f)
}
}
Expand Down
2 changes: 1 addition & 1 deletion syntex_syntax/src/ext/quote.rs
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ pub fn expand_quote_expr<'cx>(cx: &'cx mut ExtCtxt,
base::MacEager::expr(expanded)
}

pub fn expand_quote_item<'cx>(cx: &mut ExtCtxt,
pub fn expand_quote_item<'cx>(cx: &'cx mut ExtCtxt,
sp: Span,
tts: &[TokenTree])
-> Box<base::MacResult+'cx> {
Expand Down
1 change: 0 additions & 1 deletion syntex_syntax/src/parse/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ use ptr::P;
use str::char_at;

use std::cell::RefCell;
use std::io::Read;
use std::iter;
use std::path::{Path, PathBuf};
use std::rc::Rc;
Expand Down
1 change: 0 additions & 1 deletion syntex_syntax/src/parse/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ use ptr::P;
use parse::PResult;

use std::collections::HashSet;
use std::io::prelude::*;
use std::mem;
use std::path::{Path, PathBuf};
use std::rc::Rc;
Expand Down
2 changes: 0 additions & 2 deletions syntex_syntax/src/util/interner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,12 @@ impl Ord for RcStr {

impl fmt::Debug for RcStr {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
use std::fmt::Debug;
self[..].fmt(f)
}
}

impl fmt::Display for RcStr {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
use std::fmt::Display;
self[..].fmt(f)
}
}
Expand Down