From b45d30da34142fc33dd41bbf67c7dfc1a69ddf01 Mon Sep 17 00:00:00 2001 From: Eduard Burtescu Date: Fri, 19 Dec 2014 14:02:22 +0200 Subject: [PATCH] Fix fallout of removing import_shadowing in tests. --- src/libcollections/bench.rs | 2 +- src/libcollections/binary_heap.rs | 3 +-- src/libcollections/bit.rs | 9 ++++--- src/libcollections/btree/map.rs | 4 ++-- src/libcollections/btree/set.rs | 2 +- src/libcollections/dlist.rs | 4 ++-- src/libcollections/enum_set.rs | 4 ++-- src/libcollections/lib.rs | 38 ++++++++++++++++++++++++++++++ src/libcollections/ring_buf.rs | 9 ++++--- src/libcollections/slice.rs | 21 +++++++---------- src/libcollections/str.rs | 35 ++++++++------------------- src/libcollections/string.rs | 7 ++---- src/libcollections/vec.rs | 8 +++---- src/libcollections/vec_map.rs | 6 ++--- src/libcore/hash/sip.rs | 7 +----- src/libstd/ascii.rs | 1 - src/libstd/bitflags.rs | 1 - src/libstd/collections/hash/map.rs | 3 +-- src/libstd/collections/hash/set.rs | 1 - src/libstd/io/buffered.rs | 1 - src/libstd/io/fs.rs | 4 ---- src/libstd/io/mem.rs | 5 ++-- src/libstd/io/timer.rs | 6 ++--- src/libstd/lib.rs | 2 +- src/libstd/num/f32.rs | 5 ++-- src/libstd/num/f64.rs | 5 ++-- src/libstd/os.rs | 1 - src/libstd/path/mod.rs | 2 -- src/libstd/path/posix.rs | 1 - src/libstd/sync/future.rs | 1 - src/libstd/sync/task_pool.rs | 4 +--- src/libstd/thread.rs | 4 +--- src/libsyntax/parse/mod.rs | 7 +++--- 33 files changed, 97 insertions(+), 116 deletions(-) diff --git a/src/libcollections/bench.rs b/src/libcollections/bench.rs index 3346e55158a2..fbaebd0125d0 100644 --- a/src/libcollections/bench.rs +++ b/src/libcollections/bench.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use std::prelude::*; +use prelude::*; use std::rand; use std::rand::Rng; use test::Bencher; diff --git a/src/libcollections/binary_heap.rs b/src/libcollections/binary_heap.rs index be99c4c0bc72..e1c06736b369 100644 --- a/src/libcollections/binary_heap.rs +++ b/src/libcollections/binary_heap.rs @@ -617,10 +617,9 @@ fn extend>(&mut self, mut iter: Iter) { #[cfg(test)] mod tests { - use std::prelude::*; + use prelude::*; use super::BinaryHeap; - use vec::Vec; #[test] fn test_iterator() { diff --git a/src/libcollections/bit.rs b/src/libcollections/bit.rs index 7f78d56607e7..f59fb1c5d3da 100644 --- a/src/libcollections/bit.rs +++ b/src/libcollections/bit.rs @@ -1686,16 +1686,15 @@ fn size_hint(&self) -> (uint, Option) { #[cfg(test)] mod tests { - use std::prelude::*; - use std::iter::range_step; + use prelude::*; + use core::iter::range_step; + use core::u32; use std::rand; use std::rand::Rng; - use std::u32; use test::{Bencher, black_box}; use super::{Bitv, BitvSet, from_fn, from_bytes}; use bitv; - use vec::Vec; static BENCH_BITS : uint = 1 << 14; @@ -2038,7 +2037,7 @@ fn test_equal_sneaky_big() { #[test] fn test_from_bytes() { let bitv = from_bytes(&[0b10110110, 0b00000000, 0b11111111]); - let str = format!("{}{}{}", "10110110", "00000000", "11111111"); + let str = concat!("10110110", "00000000", "11111111"); assert_eq!(bitv.to_string(), str); } diff --git a/src/libcollections/btree/map.rs b/src/libcollections/btree/map.rs index dc69c5993c1a..01096c1fd4e9 100644 --- a/src/libcollections/btree/map.rs +++ b/src/libcollections/btree/map.rs @@ -1335,7 +1335,7 @@ pub fn entry<'a>(&'a mut self, mut key: K) -> Entry<'a, K, V> { #[cfg(test)] mod test { - use std::prelude::*; + use prelude::*; use super::{BTreeMap, Occupied, Vacant}; @@ -1537,7 +1537,7 @@ fn test_entry(){ #[cfg(test)] mod bench { - use std::prelude::*; + use prelude::*; use std::rand::{weak_rng, Rng}; use test::{Bencher, black_box}; diff --git a/src/libcollections/btree/set.rs b/src/libcollections/btree/set.rs index 4ef2e681992a..890d9be39f98 100644 --- a/src/libcollections/btree/set.rs +++ b/src/libcollections/btree/set.rs @@ -726,7 +726,7 @@ fn next(&mut self) -> Option<&'a T> { #[cfg(test)] mod test { - use std::prelude::*; + use prelude::*; use super::BTreeSet; use std::hash; diff --git a/src/libcollections/dlist.rs b/src/libcollections/dlist.rs index e7454aef51e8..4d7ce92b5491 100644 --- a/src/libcollections/dlist.rs +++ b/src/libcollections/dlist.rs @@ -788,14 +788,14 @@ fn hash(&self, state: &mut S) { #[cfg(test)] mod tests { - use std::prelude::*; + use prelude::*; use std::rand; use std::hash; + use std::task::spawn; use test::Bencher; use test; use super::{DList, Node, ListInsertion}; - use vec::Vec; pub fn check_links(list: &DList) { let mut len = 0u; diff --git a/src/libcollections/enum_set.rs b/src/libcollections/enum_set.rs index caa2051c3f9c..ed7516fec16a 100644 --- a/src/libcollections/enum_set.rs +++ b/src/libcollections/enum_set.rs @@ -295,9 +295,9 @@ fn extend>(&mut self, mut iterator: I) { #[cfg(test)] mod test { - use std::prelude::*; use self::Foo::*; - use std::mem; + use prelude::*; + use core::mem; use super::{EnumSet, CLike}; diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs index 051079a528e5..75d179319f7c 100644 --- a/src/libcollections/lib.rs +++ b/src/libcollections/lib.rs @@ -95,3 +95,41 @@ mod std { pub use core::kinds; // deriving(Copy) pub use core::hash; // deriving(Hash) } + +#[cfg(test)] +mod prelude { + // from core. + pub use core::borrow::IntoCow; + pub use core::char::Char; + pub use core::clone::Clone; + pub use core::cmp::{PartialEq, Eq, Equiv, PartialOrd, Ord}; + pub use core::cmp::Ordering::{Less, Equal, Greater}; + pub use core::iter::range; + pub use core::iter::{FromIterator, Extend, IteratorExt}; + pub use core::iter::{Iterator, DoubleEndedIterator, RandomAccessIterator}; + pub use core::iter::{IteratorCloneExt, CloneIteratorExt, DoubleEndedIteratorExt}; + pub use core::iter::{IteratorOrdExt, MutableDoubleEndedIterator, ExactSizeIterator}; + pub use core::kinds::{Copy, Send, Sized, Sync}; + pub use core::mem::drop; + pub use core::ops::{Drop, Fn, FnMut, FnOnce}; + pub use core::option::Option; + pub use core::option::Option::{Some, None}; + pub use core::ptr::RawPtr; + pub use core::result::Result; + pub use core::result::Result::{Ok, Err}; + + // in core and collections (may differ). + pub use slice::{PartialEqSliceExt, OrdSliceExt}; + pub use slice::{AsSlice, SliceExt}; + pub use str::{from_str, Str, StrPrelude}; + + // from other crates. + pub use alloc::boxed::Box; + pub use unicode::char::UnicodeChar; + + // from collections. + pub use slice::{CloneSliceExt, VectorVector}; + pub use str::{IntoMaybeOwned, UnicodeStrPrelude, StrAllocating, StrVector}; + pub use string::{String, ToString}; + pub use vec::Vec; +} diff --git a/src/libcollections/ring_buf.rs b/src/libcollections/ring_buf.rs index cdb92d302e9d..b02285939230 100644 --- a/src/libcollections/ring_buf.rs +++ b/src/libcollections/ring_buf.rs @@ -1260,18 +1260,17 @@ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { #[cfg(test)] mod tests { - use core::iter; use self::Taggy::*; use self::Taggypar::*; - use std::cmp; + use prelude::*; + use core::cmp; + use core::iter; use std::fmt::Show; - use std::prelude::*; use std::hash; use test::Bencher; use test; use super::RingBuf; - use vec::Vec; #[test] #[allow(deprecated)] @@ -1791,7 +1790,7 @@ fn test_into_iter() { #[test] fn test_from_iter() { - use std::iter; + use core::iter; let v = vec!(1i,2,3,4,5,6,7); let deq: RingBuf = v.iter().map(|&x| x).collect(); let u: Vec = deq.iter().map(|&x| x).collect(); diff --git a/src/libcollections/slice.rs b/src/libcollections/slice.rs index 3bf10192e596..16adf6fa224b 100644 --- a/src/libcollections/slice.rs +++ b/src/libcollections/slice.rs @@ -1343,16 +1343,13 @@ pub mod raw { #[cfg(test)] mod tests { use std::boxed::Box; - use std::cell::Cell; - use std::default::Default; - use std::mem; - use std::prelude::*; + use prelude::*; + use core::cell::Cell; + use core::default::Default; + use core::mem; use std::rand::{Rng, task_rng}; use std::rc::Rc; - use std::rt; - use slice::*; - - use vec::Vec; + use super::ElementSwaps; fn square(n: uint) -> uint { n * n } @@ -2764,14 +2761,12 @@ fn test_to_vec() { #[cfg(test)] mod bench { - use std::prelude::*; + use prelude::*; + use core::mem; + use core::ptr; use std::rand::{weak_rng, Rng}; - use std::mem; - use std::ptr; use test::{Bencher, black_box}; - use vec::Vec; - #[bench] fn iterator(b: &mut Bencher) { // peculiar numbers to stop LLVM from optimising the summation diff --git a/src/libcollections/str.rs b/src/libcollections/str.rs index dc8313386b99..feec2a216c70 100644 --- a/src/libcollections/str.rs +++ b/src/libcollections/str.rs @@ -837,25 +837,12 @@ fn into_string(self) -> String { #[cfg(test)] mod tests { - use std::iter::AdditiveIterator; - use std::iter::range; - use std::default::Default; - use std::char::Char; - use std::clone::Clone; - use std::cmp::{Ord, PartialOrd, Equiv}; - use std::cmp::Ordering::{Equal, Greater, Less}; - use std::option::Option; - use std::option::Option::{Some, None}; - use std::ptr::RawPtr; - use std::iter::{Iterator, IteratorExt, DoubleEndedIteratorExt}; - - use super::*; - use std::slice::{AsSlice, SliceExt}; - use string::String; - use vec::Vec; - use slice::CloneSliceExt; - - use unicode::char::UnicodeChar; + use prelude::*; + use core::default::Default; + use core::iter::AdditiveIterator; + use super::{eq_slice, from_utf8, is_utf8, is_utf16, raw}; + use super::truncate_utf16_at_nul; + use super::{Owned, Slice}; #[test] fn test_eq_slice() { @@ -1829,7 +1816,7 @@ fn test_words() { #[test] fn test_lev_distance() { - use std::char::{ from_u32, MAX }; + use core::char::{ from_u32, MAX }; // Test bytelength agnosticity for c in range(0u32, MAX as u32) .filter_map(|i| from_u32(i)) @@ -1939,7 +1926,7 @@ fn test_lines() { #[test] fn test_graphemes() { - use std::iter::order; + use core::iter::order; // official Unicode test data // from http://www.unicode.org/Public/UCD/latest/ucd/auxiliary/GraphemeBreakTest.txt let test_same: [(_, &[_]), .. 325] = [ @@ -2370,7 +2357,7 @@ fn t(s: &str, sep: &str, u: &[&str]) { #[test] fn test_str_default() { - use std::default::Default; + use core::default::Default; fn t() { let s: S = Default::default(); assert_eq!(s.as_slice(), ""); @@ -2470,12 +2457,10 @@ fn test_into_maybe_owned() { #[cfg(test)] mod bench { + use prelude::*; use test::Bencher; use test::black_box; use super::*; - use std::iter::{IteratorExt, DoubleEndedIteratorExt}; - use std::str::StrPrelude; - use std::slice::SliceExt; #[bench] fn char_iterator(b: &mut Bencher) { diff --git a/src/libcollections/string.rs b/src/libcollections/string.rs index 38ebd686ddbd..bcd1e3b36809 100644 --- a/src/libcollections/string.rs +++ b/src/libcollections/string.rs @@ -1040,14 +1040,11 @@ pub unsafe fn from_utf8(bytes: Vec) -> String { #[cfg(test)] mod tests { - use std::prelude::*; + use prelude::*; use test::Bencher; - use slice::CloneSliceExt; - use str::{Str, StrPrelude}; use str; - use super::{as_string, String, ToString}; - use vec::Vec; + use super::as_string; #[test] fn test_as_string() { diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs index a783d8e63390..e0745a86d71d 100644 --- a/src/libcollections/vec.rs +++ b/src/libcollections/vec.rs @@ -1805,12 +1805,10 @@ fn write(&mut self, buf: &[u8]) -> fmt::Result { #[cfg(test)] mod tests { - extern crate test; - - use std::prelude::*; - use std::mem::size_of; + use prelude::*; + use core::mem::size_of; use test::Bencher; - use super::{as_vec, unzip, raw, Vec}; + use super::{as_vec, unzip, raw}; struct DropCounter<'a> { count: &'a mut int diff --git a/src/libcollections/vec_map.rs b/src/libcollections/vec_map.rs index 75b7c917ced5..1babde6066d0 100644 --- a/src/libcollections/vec_map.rs +++ b/src/libcollections/vec_map.rs @@ -672,8 +672,7 @@ fn next_back(&mut self) -> Option<(uint, V)> { self.iter.next_back() } #[cfg(test)] mod test_map { - use std::prelude::*; - use vec::Vec; + use prelude::*; use core::hash::hash; use super::VecMap; @@ -1046,8 +1045,7 @@ fn test_index_nonexistent() { #[cfg(test)] mod bench { - extern crate test; - use self::test::Bencher; + use test::Bencher; use super::VecMap; use bench::{insert_rand_n, insert_seq_n, find_rand_n, find_seq_n}; diff --git a/src/libcore/hash/sip.rs b/src/libcore/hash/sip.rs index e10f5a9fed18..bdc210f0d8e6 100644 --- a/src/libcore/hash/sip.rs +++ b/src/libcore/hash/sip.rs @@ -271,14 +271,9 @@ pub fn hash_with_keys>(k0: u64, k1: u64, value: &T) -> #[cfg(test)] mod tests { use test::Bencher; - use std::prelude::*; + use prelude::*; use std::fmt; - use str::Str; - use string::String; - use slice::{AsSlice, SliceExt}; - use vec::Vec; - use super::super::{Hash, Writer}; use super::{SipState, hash, hash_with_keys}; diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs index 2c4dc5313bbf..08b17f25e29d 100644 --- a/src/libstd/ascii.rs +++ b/src/libstd/ascii.rs @@ -633,7 +633,6 @@ mod tests { use prelude::*; use super::*; use char::from_u32; - use str::StrPrelude; macro_rules! v2ascii { ( [$($e:expr),*]) => (&[$(Ascii{chr:$e}),*]); diff --git a/src/libstd/bitflags.rs b/src/libstd/bitflags.rs index f467b77dbf4c..c7cf0b5bc8e6 100644 --- a/src/libstd/bitflags.rs +++ b/src/libstd/bitflags.rs @@ -315,7 +315,6 @@ fn not(self) -> $BitFlags { #[cfg(test)] #[allow(non_upper_case_globals)] mod tests { - use kinds::Copy; use hash; use option::Option::{Some, None}; use ops::{BitOr, BitAnd, BitXor, Sub, Not}; diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs index 6bfea7e3cb2a..d068c4610be7 100644 --- a/src/libstd/collections/hash/map.rs +++ b/src/libstd/collections/hash/map.rs @@ -1428,9 +1428,8 @@ mod test_map { use super::HashMap; use super::{Occupied, Vacant}; - use cmp::Equiv; use hash; - use iter::{Iterator,range_inclusive,range_step_inclusive}; + use iter::{range_inclusive, range_step_inclusive}; use cell::RefCell; use rand::{weak_rng, Rng}; diff --git a/src/libstd/collections/hash/set.rs b/src/libstd/collections/hash/set.rs index 67c0f887832f..71cc4a1e5a65 100644 --- a/src/libstd/collections/hash/set.rs +++ b/src/libstd/collections/hash/set.rs @@ -678,7 +678,6 @@ mod test_set { use prelude::*; use super::HashSet; - use slice::PartialEqSliceExt; #[test] fn test_disjoint() { diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs index 25f05940807c..9d9e88275714 100644 --- a/src/libstd/io/buffered.rs +++ b/src/libstd/io/buffered.rs @@ -409,7 +409,6 @@ mod test { use super::super::{IoResult, EndOfFile}; use super::super::mem::MemReader; use self::test::Bencher; - use str::StrPrelude; /// A type, free to create, primarily intended for benchmarking creation of /// wrappers that, just for construction, don't need a Reader/Writer that diff --git a/src/libstd/io/fs.rs b/src/libstd/io/fs.rs index fd3bae73cd36..4e736908c372 100644 --- a/src/libstd/io/fs.rs +++ b/src/libstd/io/fs.rs @@ -823,10 +823,6 @@ mod test { use io; use str; use io::fs::*; - use path::Path; - use io; - use ops::Drop; - use str::StrPrelude; macro_rules! check { ($e:expr) => ( match $e { diff --git a/src/libstd/io/mem.rs b/src/libstd/io/mem.rs index 71e8cb4b5ec1..431e11cf9cac 100644 --- a/src/libstd/io/mem.rs +++ b/src/libstd/io/mem.rs @@ -398,13 +398,12 @@ fn fill_buf(&mut self) -> IoResult<&[u8]> { #[cfg(test)] mod test { - extern crate test; + extern crate "test" as test_crate; use prelude::*; use super::*; use io::*; use io; - use self::test::Bencher; - use str::StrPrelude; + use self::test_crate::Bencher; #[test] fn test_vec_writer() { diff --git a/src/libstd/io/timer.rs b/src/libstd/io/timer.rs index 79048c37ab5b..953effe4345c 100644 --- a/src/libstd/io/timer.rs +++ b/src/libstd/io/timer.rs @@ -225,11 +225,11 @@ fn in_ms_u64(d: Duration) -> u64 { #[cfg(test)] mod test { - use super::*; - use time::Duration; - use task::spawn; use prelude::*; + use super::Timer; + use time::Duration; + #[test] fn test_io_timer_sleep_simple() { let mut timer = Timer::new().unwrap(); diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index c46ebae86759..7de3e1c961a8 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -157,7 +157,7 @@ pub use core::result; pub use core::option; -pub use alloc::boxed; +#[cfg(not(test))] pub use alloc::boxed; pub use alloc::rc; pub use core_collections::slice; diff --git a/src/libstd/num/f32.rs b/src/libstd/num/f32.rs index 60b17de17187..d307e1f74156 100644 --- a/src/libstd/num/f32.rs +++ b/src/libstd/num/f32.rs @@ -349,7 +349,6 @@ pub fn to_str_exp_digits(num: f32, dig: uint, upper: bool) -> String { mod tests { use f32::*; use num::*; - use num; #[test] fn test_min_nan() { @@ -364,8 +363,8 @@ fn test_max_nan() { } #[test] - fn test_num() { - num::test_num(10f32, 2f32); + fn test_num_f32() { + test_num(10f32, 2f32); } #[test] diff --git a/src/libstd/num/f64.rs b/src/libstd/num/f64.rs index 4b31e33236d4..dfe20d59c82c 100644 --- a/src/libstd/num/f64.rs +++ b/src/libstd/num/f64.rs @@ -357,7 +357,6 @@ pub fn to_str_exp_digits(num: f64, dig: uint, upper: bool) -> String { mod tests { use f64::*; use num::*; - use num; #[test] fn test_min_nan() { @@ -372,8 +371,8 @@ fn test_max_nan() { } #[test] - fn test_num() { - num::test_num(10f64, 2f64); + fn test_num_f64() { + test_num(10f64, 2f64); } #[test] diff --git a/src/libstd/os.rs b/src/libstd/os.rs index dcc73f7844a4..20a72f45fbf9 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -1425,7 +1425,6 @@ mod arch_consts { #[cfg(test)] mod tests { use prelude::*; - use c_str::ToCStr; use option; use os::{env, getcwd, getenv, make_absolute}; use os::{split_paths, join_paths, setenv, unsetenv}; diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs index 8f98329a4be7..ed4bb6ee0811 100644 --- a/src/libstd/path/mod.rs +++ b/src/libstd/path/mod.rs @@ -931,8 +931,6 @@ fn contains_nul(v: &T) -> bool { #[cfg(test)] mod tests { use prelude::*; - use super::{GenericPath, PosixPath, WindowsPath}; - use c_str::ToCStr; #[test] fn test_cstring() { diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index 62f64159c047..88907951673d 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -445,7 +445,6 @@ mod tests { use prelude::*; use super::*; use str; - use str::StrPrelude; macro_rules! t { (s: $path:expr, $exp:expr) => ( diff --git a/src/libstd/sync/future.rs b/src/libstd/sync/future.rs index 5e9d234c6423..51899a87a325 100644 --- a/src/libstd/sync/future.rs +++ b/src/libstd/sync/future.rs @@ -153,7 +153,6 @@ mod test { use prelude::*; use sync::Future; use task; - use comm::channel; #[test] fn test_from_value() { diff --git a/src/libstd/sync/task_pool.rs b/src/libstd/sync/task_pool.rs index 793825f1b08f..366e4b7d35b0 100644 --- a/src/libstd/sync/task_pool.rs +++ b/src/libstd/sync/task_pool.rs @@ -131,10 +131,8 @@ fn spawn_in_pool(jobs: Arc>>) { #[cfg(test)] mod test { - use core::prelude::*; + use prelude::*; use super::*; - use comm::channel; - use iter::range; const TEST_TASKS: uint = 4u; diff --git a/src/libstd/thread.rs b/src/libstd/thread.rs index ff9ee01b40ac..89773207347d 100644 --- a/src/libstd/thread.rs +++ b/src/libstd/thread.rs @@ -428,13 +428,11 @@ fn drop(&mut self) { #[cfg(test)] mod test { + use prelude::*; use any::{Any, AnyRefExt}; use boxed::BoxAny; - use prelude::*; - use result::Result::{Ok, Err}; use result; use std::io::{ChanReader, ChanWriter}; - use string::String; use thunk::Thunk; use super::{Thread, Builder}; diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index d6f5d0e248a8..3d0877dd4327 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -745,8 +745,7 @@ mod test { use owned_slice::OwnedSlice; use ast; use abi; - use attr; - use attr::AttrMetaMethods; + use attr::{first_attr_value_str_by_name, AttrMetaMethods}; use parse::parser::Parser; use parse::token::{str_to_ident}; use print::pprust::view_item_to_string; @@ -1195,7 +1194,7 @@ fn wb() -> c_int { O_WRONLY as c_int } let name = "".to_string(); let source = "/// doc comment\r\nfn foo() {}".to_string(); let item = parse_item_from_source_str(name.clone(), source, Vec::new(), &sess).unwrap(); - let doc = attr::first_attr_value_str_by_name(item.attrs.as_slice(), "doc").unwrap(); + let doc = first_attr_value_str_by_name(item.attrs.as_slice(), "doc").unwrap(); assert_eq!(doc.get(), "/// doc comment"); let source = "/// doc comment\r\n/// line 2\r\nfn foo() {}".to_string(); @@ -1207,7 +1206,7 @@ fn wb() -> c_int { O_WRONLY as c_int } let source = "/** doc comment\r\n * with CRLF */\r\nfn foo() {}".to_string(); let item = parse_item_from_source_str(name, source, Vec::new(), &sess).unwrap(); - let doc = attr::first_attr_value_str_by_name(item.attrs.as_slice(), "doc").unwrap(); + let doc = first_attr_value_str_by_name(item.attrs.as_slice(), "doc").unwrap(); assert_eq!(doc.get(), "/** doc comment\n * with CRLF */"); } }