Skip to content

Commit

Permalink
Auto merge of #25935 - wesleywiser:fix_libcollection_build_warnings, …
Browse files Browse the repository at this point in the history
…r=alexcrichton

Fixes a bunch of warnings that are generated during the stage0 build of libcollections.
  • Loading branch information
bors committed Jun 3, 2015
2 parents e8af475 + 99df383 commit 2c8d75d
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
5 changes: 2 additions & 3 deletions src/libcollections/lib.rs
Expand Up @@ -37,12 +37,11 @@
#![feature(unsafe_no_drop_flag, filling_drop)]
#![feature(step_by)]
#![feature(str_char)]
#![feature(str_words)]
#![feature(slice_patterns)]
#![feature(utf8_error)]
#![cfg_attr(test, feature(rand, rustc_private, test, hash, collections,
collections_drain, collections_range))]
#![cfg_attr(test, feature(rand, test))]
#![cfg_attr(test, allow(deprecated))] // rand
#![cfg_attr(not(test), feature(str_words))]

#![feature(no_std)]
#![no_std]
Expand Down
4 changes: 4 additions & 0 deletions src/libcollections/slice.rs
Expand Up @@ -79,6 +79,10 @@
#![doc(primitive = "slice")]
#![stable(feature = "rust1", since = "1.0.0")]

// Many of the usings in this module are only used in the test configuration.
// It's cleaner to just turn off the unused_imports warning than to fix them.
#![allow(unused_imports)]

use alloc::boxed::Box;
use core::clone::Clone;
use core::cmp::Ordering::{self, Greater, Less};
Expand Down
4 changes: 4 additions & 0 deletions src/libcollections/str.rs
Expand Up @@ -47,6 +47,10 @@
#![doc(primitive = "str")]
#![stable(feature = "rust1", since = "1.0.0")]

// Many of the usings in this module are only used in the test configuration.
// It's cleaner to just turn off the unused_imports warning than to fix them.
#![allow(unused_imports)]

use self::RecompositionState::*;
use self::DecompositionType::*;

Expand Down
2 changes: 1 addition & 1 deletion src/libcollections/vec_deque.rs
Expand Up @@ -1801,7 +1801,7 @@ impl<T: fmt::Debug> fmt::Debug for VecDeque<T> {

#[cfg(test)]
mod tests {
use core::iter::{Iterator, self};
use core::iter::Iterator;
use core::option::Option::Some;

use test;
Expand Down

0 comments on commit 2c8d75d

Please sign in to comment.