Skip to content

Commit 5ca6460

Browse files
committed
---
yaml --- r: 81389 b: refs/heads/snap-stage3 c: 4cc925a h: refs/heads/master i: 81387: 4e83fea v: v3
1 parent 19b156e commit 5ca6460

File tree

6 files changed

+15
-27
lines changed

6 files changed

+15
-27
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: a9d54acc3eb8f381f481d070a34d27651f86785e
4+
refs/heads/snap-stage3: 4cc925a5f41193b805f60295ebcf74b0a34242cb
55
refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/rand/mod.rs

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,9 @@ pub trait Rng {
259259
///
260260
/// ```rust
261261
/// use std::rand;
262-
/// use std::rand::Rng;
263262
///
264263
/// fn main() {
265-
/// let mut rng = rand::task_rng();
264+
/// let rng = rand::task_rng();
266265
/// let x: uint = rng.gen();
267266
/// println!("{}", x);
268267
/// println!("{:?}", rng.gen::<(f64, bool)>());
@@ -279,10 +278,9 @@ pub trait Rng {
279278
///
280279
/// ```rust
281280
/// use std::rand;
282-
/// use std::rand::Rng;
283281
///
284282
/// fn main() {
285-
/// let mut rng = rand::task_rng();
283+
/// let rng = rand::task_rng();
286284
/// let x: ~[uint] = rng.gen_vec(10);
287285
/// println!("{:?}", x);
288286
/// println!("{:?}", rng.gen_vec::<(f64, bool)>(5));
@@ -305,13 +303,12 @@ pub trait Rng {
305303
///
306304
/// ```rust
307305
/// use std::rand;
308-
/// use std::rand::Rng;
309306
///
310307
/// fn main() {
311-
/// let mut rng = rand::task_rng();
308+
/// let rng = rand::task_rng();
312309
/// let n: uint = rng.gen_integer_range(0u, 10);
313310
/// println!("{}", n);
314-
/// let m: int = rng.gen_integer_range(-40, 400);
311+
/// let m: i16 = rng.gen_integer_range(-40, 400);
315312
/// println!("{}", m);
316313
/// }
317314
/// ```
@@ -351,7 +348,6 @@ pub trait Rng {
351348
///
352349
/// ```rust
353350
/// use std::rand;
354-
/// use std::rand::Rng;
355351
///
356352
/// fn main() {
357353
/// println(rand::task_rng().gen_ascii_str(10));
@@ -380,7 +376,6 @@ pub trait Rng {
380376
///
381377
/// ```rust
382378
/// use std::rand;
383-
/// use std::rand::Rng;
384379
///
385380
/// fn main() {
386381
/// println!("{:?}", rand::task_rng().choose_option([1,2,4,8,16,32]));
@@ -486,7 +481,6 @@ pub trait Rng {
486481
///
487482
/// ```rust
488483
/// use std::rand;
489-
/// use std::rand::Rng;
490484
///
491485
/// fn main() {
492486
/// println!("{:?}", rand::task_rng().shuffle(~[1,2,3]));
@@ -504,10 +498,9 @@ pub trait Rng {
504498
///
505499
/// ```rust
506500
/// use std::rand;
507-
/// use std::rand::Rng;
508501
///
509502
/// fn main() {
510-
/// let mut rng = rand::task_rng();
503+
/// let rng = rand::task_rng();
511504
/// let mut y = [1,2,3];
512505
/// rng.shuffle_mut(y);
513506
/// println!("{:?}", y);
@@ -531,10 +524,9 @@ pub trait Rng {
531524
///
532525
/// ```rust
533526
/// use std::rand;
534-
/// use std::rand::Rng;
535527
///
536528
/// fn main() {
537-
/// let mut rng = rand::task_rng();
529+
/// let rng = rand::task_rng();
538530
/// let sample = rng.sample(range(1, 100), 5);
539531
/// println!("{:?}", sample);
540532
/// }

branches/snap-stage3/src/libstd/reflect.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -166,14 +166,6 @@ impl<V:TyVisitor + MovePtr> TyVisitor for MovePtrAdaptor<V> {
166166
true
167167
}
168168

169-
#[cfg(stage0)]
170-
fn visit_float(&mut self) -> bool {
171-
self.align_to::<float>();
172-
if ! self.inner.visit_float() { return false; }
173-
self.bump_past::<float>();
174-
true
175-
}
176-
177169
fn visit_f32(&mut self) -> bool {
178170
self.align_to::<f32>();
179171
if ! self.inner.visit_f32() { return false; }

branches/snap-stage3/src/libstd/repr.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,6 @@ impl<'self> TyVisitor for ReprVisitor<'self> {
271271
fn visit_u32(&mut self) -> bool { self.write::<u32>() }
272272
fn visit_u64(&mut self) -> bool { self.write::<u64>() }
273273

274-
#[cfg(stage0)]
275-
fn visit_float(&mut self) -> bool { self.write::<f64>() }
276274
fn visit_f32(&mut self) -> bool { self.write::<f32>() }
277275
fn visit_f64(&mut self) -> bool { self.write::<f64>() }
278276

branches/snap-stage3/src/libstd/unstable/intrinsics.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@ pub trait TyVisitor {
9494
fn visit_u32(&mut self) -> bool;
9595
fn visit_u64(&mut self) -> bool;
9696

97-
#[cfg(stage0)]
98-
fn visit_float(&mut self) -> bool;
9997
fn visit_f32(&mut self) -> bool;
10098
fn visit_f64(&mut self) -> bool;
10199

branches/snap-stage3/src/snapshots.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
S 2013-10-04 8bb55db
2+
freebsd-x86_64 8b68b99033e68f5d98e3e3d077de9d2e085be1ba
3+
linux-i386 10bc0069efdca378155640963d70d3a08a7248dc
4+
linux-x86_64 b69a32998c798c0e6d3b628aa9c2aa5b56e01e5b
5+
macos-i386 e7deef6e0252322086697b40caf45d7614795b5a
6+
macos-x86_64 3664ef781d302e115d8d90bdbb58759b94247542
7+
winnt-i386 443fa28f8168e25413dcf23bfd35578829e73360
8+
19
S 2013-10-01 320af9b
210
freebsd-x86_64 a228e126beacd282bf64dfea972775e4bbf0f2cb
311
linux-i386 5ea6415f07001dfe628009059fe84621ded9569e

0 commit comments

Comments
 (0)