Skip to content

Small fixes #12109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 8, 2014
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
1 change: 0 additions & 1 deletion src/doc/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ li {list-style-type: none; }
# Tooling

* [The `rustdoc` manual](rustdoc.html)
* [The `rustpkg` manual](rustpkg.html)

# FAQs

Expand Down
1 change: 0 additions & 1 deletion src/librustc/driver/driver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1181,7 +1181,6 @@ mod test {
use getopts::getopts;
use syntax::attr;
use syntax::attr::AttrMetaMethods;
use syntax::diagnostic;

// When the user supplies --test we should implicitly supply --cfg test
#[test]
Expand Down
13 changes: 0 additions & 13 deletions src/libsemver/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -151,19 +151,6 @@ impl cmp::Ord for Version {
(_, _) => self.pre < other.pre
}))
}

#[inline]
fn le(&self, other: &Version) -> bool {
! (other < self)
}
#[inline]
fn gt(&self, other: &Version) -> bool {
other < self
}
#[inline]
fn ge(&self, other: &Version) -> bool {
! (self < other)
}
}

fn take_nonempty_prefix<T:Iterator<char>>(rdr: &mut T, pred: |char| -> bool)
Expand Down
1 change: 0 additions & 1 deletion src/libstd/c_str.rs
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,6 @@ mod tests {
#[test]
fn test_to_c_str_fail() {
use task;
let mut error_happened = false;
assert!(task::try(proc() { "he\x00llo".to_c_str() }).is_err());
}

Expand Down
1 change: 1 addition & 0 deletions src/libstd/unit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

#[cfg(not(test))]
use default::Default;
#[cfg(not(test))]
use cmp::{Eq, Equal, Ord, Ordering, TotalEq, TotalOrd};

#[cfg(not(test))]
Expand Down
10 changes: 4 additions & 6 deletions src/libsyntax/ext/expand.rs
Original file line number Diff line number Diff line change
Expand Up @@ -890,17 +890,15 @@ fn original_span(cx: &ExtCtxt) -> @codemap::ExpnInfo {
mod test {
use super::*;
use ast;
use ast::{Attribute_, AttrOuter, MetaWord, EMPTY_CTXT};
use ast_util::{get_sctable, mtwt_marksof, mtwt_resolve, new_rename};
use ast::{Attribute_, AttrOuter, MetaWord};
use ast_util::{get_sctable, mtwt_marksof, mtwt_resolve};
use ast_util;
use codemap;
use codemap::Spanned;
use fold::*;
use ext::base::{CrateLoader, MacroCrate};
use parse;
use parse::token::{fresh_mark, gensym, intern};
use parse::token;
use util::parser_testing::{string_to_crate, string_to_crate_and_sess};
use util::parser_testing::{string_to_crate_and_sess};
use util::parser_testing::{string_to_pat, strs_to_idents};
use visit;
use visit::Visitor;
Expand Down Expand Up @@ -1227,7 +1225,7 @@ foo_module!()
"xx" == string.get()
}
}).enumerate() {
if (mtwt_resolve(v.segments[0].identifier) != resolved_binding) {
if mtwt_resolve(v.segments[0].identifier) != resolved_binding {
println!("uh oh, xx binding didn't match xx varref:");
println!("this is xx varref \\# {:?}",idx);
println!("binding: {:?}",cxbind);
Expand Down