Skip to content

Commit d845857

Browse files
committed
Fix deprecation warnings in check-docs.
Fallout of closing #17185.
1 parent 52ea83d commit d845857

File tree

6 files changed

+20
-7
lines changed

6 files changed

+20
-7
lines changed

src/libcollections/lib.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ pub trait MutableMap<K, V>: Map<K, V> + Mutable {
131131
/// let mut map = HashMap::new();
132132
/// assert_eq!(map.insert("key", 2i), true);
133133
/// assert_eq!(map.insert("key", 9i), false);
134-
/// assert_eq!(map.get(&"key"), &9i);
134+
/// assert_eq!(map["key"], 9i);
135135
/// ```
136136
#[inline]
137137
fn insert(&mut self, key: K, value: V) -> bool {
@@ -171,7 +171,7 @@ pub trait MutableMap<K, V>: Map<K, V> + Mutable {
171171
///
172172
/// map.insert("a", 1i);
173173
/// assert_eq!(map.swap("a", 37i), Some(1i));
174-
/// assert_eq!(map.get(&"a"), &37i);
174+
/// assert_eq!(map["a"], 37i);
175175
/// ```
176176
fn swap(&mut self, k: K, v: V) -> Option<V>;
177177

@@ -203,7 +203,7 @@ pub trait MutableMap<K, V>: Map<K, V> + Mutable {
203203
/// Some(x) => *x = 7i,
204204
/// None => (),
205205
/// }
206-
/// assert_eq!(map.get(&"a"), &7i);
206+
/// assert_eq!(map["a"], 7i);
207207
/// ```
208208
fn find_mut<'a>(&'a mut self, key: &K) -> Option<&'a mut V>;
209209
}

src/libcollections/smallintmap.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -348,11 +348,11 @@ impl<V:Clone> SmallIntMap<V> {
348348
/// let mut map = SmallIntMap::new();
349349
///
350350
/// // Key does not exist, will do a simple insert
351-
/// assert!(map.update(1, vec![1i, 2], |old, new| old.append(new.as_slice())));
351+
/// assert!(map.update(1, vec![1i, 2], |mut old, new| { old.extend(new.into_iter()); old }));
352352
/// assert_eq!(map[1], vec![1i, 2]);
353353
///
354354
/// // Key exists, update the value
355-
/// assert!(!map.update(1, vec![3i, 4], |old, new| old.append(new.as_slice())));
355+
/// assert!(!map.update(1, vec![3i, 4], |mut old, new| { old.extend(new.into_iter()); old }));
356356
/// assert_eq!(map[1], vec![1i, 2, 3, 4]);
357357
/// ```
358358
pub fn update(&mut self, key: uint, newval: V, ff: |V, V| -> V) -> bool {

src/libcollections/vec.rs

+2
Original file line numberDiff line numberDiff line change
@@ -960,6 +960,7 @@ impl<T> Vec<T> {
960960
/// # Example
961961
///
962962
/// ```
963+
/// #![allow(deprecated)]
963964
/// let vec = vec![1i, 2, 3, 4];
964965
/// assert!(vec.tailn(2) == [3, 4]);
965966
/// ```
@@ -1065,6 +1066,7 @@ impl<T> Vec<T> {
10651066
/// # Example
10661067
///
10671068
/// ```
1069+
/// #![allow(deprecated)]
10681070
/// let mut vec = vec![1i, 2, 3];
10691071
/// assert!(vec.shift() == Some(1));
10701072
/// assert_eq!(vec, vec![2, 3]);

src/libcore/slice.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1062,11 +1062,11 @@ pub trait MutableCloneableSlice<T> {
10621062
/// let mut dst = [0i, 0, 0];
10631063
/// let src = [1i, 2];
10641064
///
1065-
/// assert!(dst.copy_from(src) == 2);
1065+
/// assert!(dst.clone_from_slice(src) == 2);
10661066
/// assert!(dst == [1, 2, 0]);
10671067
///
10681068
/// let src2 = [3i, 4, 5, 6];
1069-
/// assert!(dst.copy_from(src2) == 3);
1069+
/// assert!(dst.clone_from_slice(src2) == 3);
10701070
/// assert!(dst == [3i, 4, 5]);
10711071
/// ```
10721072
fn clone_from_slice(self, &[T]) -> uint;

src/libglob/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ impl Pattern {
336336
* # Example
337337
*
338338
* ```rust
339+
* #![allow(deprecated)]
339340
* use glob::Pattern;
340341
*
341342
* assert!(Pattern::new("c?t").matches("cat"));

src/libnum/integer.rs

+10
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ pub trait Integer: Num + PartialOrd
1818
/// # Examples
1919
///
2020
/// ```
21+
/// # #![allow(deprecated)]
2122
/// # use num::Integer;
2223
/// assert!(( 8i).div_floor(& 3) == 2);
2324
/// assert!(( 8i).div_floor(&-3) == -3);
@@ -34,6 +35,7 @@ pub trait Integer: Num + PartialOrd
3435
/// Floored integer modulo, satisfying:
3536
///
3637
/// ```
38+
/// # #![allow(deprecated)]
3739
/// # use num::Integer;
3840
/// # let n = 1i; let d = 1i;
3941
/// assert!(n.div_floor(&d) * d + n.mod_floor(&d) == n)
@@ -42,6 +44,7 @@ pub trait Integer: Num + PartialOrd
4244
/// # Examples
4345
///
4446
/// ```
47+
/// # #![allow(deprecated)]
4548
/// # use num::Integer;
4649
/// assert!(( 8i).mod_floor(& 3) == 2);
4750
/// assert!(( 8i).mod_floor(&-3) == -1);
@@ -60,6 +63,7 @@ pub trait Integer: Num + PartialOrd
6063
/// # Examples
6164
///
6265
/// ```
66+
/// # #![allow(deprecated)]
6367
/// # use num::Integer;
6468
/// assert_eq!(6i.gcd(&8), 2);
6569
/// assert_eq!(7i.gcd(&3), 1);
@@ -71,6 +75,7 @@ pub trait Integer: Num + PartialOrd
7175
/// # Examples
7276
///
7377
/// ```
78+
/// # #![allow(deprecated)]
7479
/// # use num::Integer;
7580
/// assert_eq!(7i.lcm(&3), 21);
7681
/// assert_eq!(2i.lcm(&4), 4);
@@ -86,6 +91,7 @@ pub trait Integer: Num + PartialOrd
8691
/// # Examples
8792
///
8893
/// ```
94+
/// # #![allow(deprecated)]
8995
/// # use num::Integer;
9096
/// assert_eq!(9i.is_multiple_of(&3), true);
9197
/// assert_eq!(3i.is_multiple_of(&9), false);
@@ -97,6 +103,7 @@ pub trait Integer: Num + PartialOrd
97103
/// # Examples
98104
///
99105
/// ```
106+
/// # #![allow(deprecated)]
100107
/// # use num::Integer;
101108
/// assert_eq!(3i.is_even(), false);
102109
/// assert_eq!(4i.is_even(), true);
@@ -108,6 +115,7 @@ pub trait Integer: Num + PartialOrd
108115
/// # Examples
109116
///
110117
/// ```
118+
/// # #![allow(deprecated)]
111119
/// # use num::Integer;
112120
/// assert_eq!(3i.is_odd(), true);
113121
/// assert_eq!(4i.is_odd(), false);
@@ -120,6 +128,7 @@ pub trait Integer: Num + PartialOrd
120128
/// # Examples
121129
///
122130
/// ```
131+
/// # #![allow(deprecated)]
123132
/// # use num::Integer;
124133
/// assert_eq!(( 8i).div_rem( &3), ( 2, 2));
125134
/// assert_eq!(( 8i).div_rem(&-3), (-2, 2));
@@ -142,6 +151,7 @@ pub trait Integer: Num + PartialOrd
142151
/// # Examples
143152
///
144153
/// ```
154+
/// # #![allow(deprecated)]
145155
/// # use num::Integer;
146156
/// assert_eq!(( 8i).div_mod_floor( &3), ( 2, 2));
147157
/// assert_eq!(( 8i).div_mod_floor(&-3), (-3, -1));

0 commit comments

Comments
 (0)