Skip to content

Commit e558318

Browse files
author
korenchkin
committed
---
yaml --- r: 68811 b: refs/heads/auto c: 3cb3d75 h: refs/heads/master i: 68809: 8d47326 68807: f4bea72 v: v3
1 parent 53e4379 commit e558318

File tree

3 files changed

+32
-27
lines changed

3 files changed

+32
-27
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 663a9597b24f841f44e560e2478225353dbcec30
17+
refs/heads/auto: 3cb3d754a5bb1a6b22ab3a30d01a7f950127fe61
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libstd/libc.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,6 @@ pub mod types {
186186
// Standard types that are opaque or common, so are not per-target.
187187
pub mod common {
188188
pub mod c95 {
189-
/**
190-
Type used to construct void pointers for use with C.
191-
192-
This type is only useful as a pointer target. Do not use it as a
193-
return type for FFI functions which have the `void` return type in
194-
C. Use the unit type `()` or omit the return type instead.
195-
*/
196189
pub enum c_void {}
197190
pub enum FILE {}
198191
pub enum fpos_t {}

branches/auto/src/libstd/rand.rs

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ distributions like normal and exponential.
2222
# Examples
2323
2424
~~~ {.rust}
25-
use core::rand::RngUtil;
25+
use std::rand;
26+
use std::rand::RngUtil;
2627
2728
fn main() {
2829
let mut rng = rand::rng();
@@ -33,6 +34,8 @@ fn main() {
3334
~~~
3435
3536
~~~ {.rust}
37+
use std::rand;
38+
3639
fn main () {
3740
let tuple_ptr = rand::random::<~(f64, char)>();
3841
println(fmt!("%?", tuple_ptr))
@@ -292,10 +295,11 @@ pub trait RngUtil {
292295
*
293296
* ~~~ {.rust}
294297
*
295-
* use core::rand::RngUtil;
298+
* use std::rand;
299+
* use std::rand::RngUtil;
296300
*
297301
* fn main() {
298-
* rng = rand::rng();
302+
* let mut rng = rand::rng();
299303
* println(fmt!("%b",rng.gen_weighted_bool(3)));
300304
* }
301305
* ~~~
@@ -308,10 +312,11 @@ pub trait RngUtil {
308312
*
309313
* ~~~ {.rust}
310314
*
311-
* use core::rand::RngUtil;
315+
* use std::rand;
316+
* use std::rand::RngUtil;
312317
*
313318
* fn main() {
314-
* rng = rand::rng();
319+
* let mut rng = rand::rng();
315320
* println(rng.gen_str(8));
316321
* }
317322
* ~~~
@@ -324,10 +329,11 @@ pub trait RngUtil {
324329
*
325330
* ~~~ {.rust}
326331
*
327-
* use core::rand::RngUtil;
332+
* use std::rand;
333+
* use std::rand::RngUtil;
328334
*
329335
* fn main() {
330-
* rng = rand::rng();
336+
* let mut rng = rand::rng();
331337
* println(fmt!("%?",rng.gen_bytes(8)));
332338
* }
333339
* ~~~
@@ -340,10 +346,11 @@ pub trait RngUtil {
340346
*
341347
* ~~~ {.rust}
342348
*
343-
* use core::rand::RngUtil;
349+
* use std::rand;
350+
* use std::rand::RngUtil;
344351
*
345352
* fn main() {
346-
* rng = rand::rng();
353+
* let mut rng = rand::rng();
347354
* println(fmt!("%d",rng.choose([1,2,4,8,16,32])));
348355
* }
349356
* ~~~
@@ -359,10 +366,11 @@ pub trait RngUtil {
359366
*
360367
* ~~~ {.rust}
361368
*
362-
* use core::rand::RngUtil;
369+
* use std::rand;
370+
* use std::rand::RngUtil;
363371
*
364372
* fn main() {
365-
* rng = rand::rng();
373+
* let mut rng = rand::rng();
366374
* let x = [rand::Weighted {weight: 4, item: 'a'},
367375
* rand::Weighted {weight: 2, item: 'b'},
368376
* rand::Weighted {weight: 2, item: 'c'}];
@@ -379,10 +387,11 @@ pub trait RngUtil {
379387
*
380388
* ~~~ {.rust}
381389
*
382-
* use core::rand::RngUtil;
390+
* use std::rand;
391+
* use std::rand::RngUtil;
383392
*
384393
* fn main() {
385-
* rng = rand::rng();
394+
* let mut rng = rand::rng();
386395
* let x = [rand::Weighted {weight: 4, item: 'a'},
387396
* rand::Weighted {weight: 2, item: 'b'},
388397
* rand::Weighted {weight: 2, item: 'c'}];
@@ -400,10 +409,11 @@ pub trait RngUtil {
400409
*
401410
* ~~~ {.rust}
402411
*
403-
* use core::rand::RngUtil;
412+
* use std::rand;
413+
* use std::rand::RngUtil;
404414
*
405415
* fn main() {
406-
* rng = rand::rng();
416+
* let mut rng = rand::rng();
407417
* let x = [rand::Weighted {weight: 4, item: 'a'},
408418
* rand::Weighted {weight: 2, item: 'b'},
409419
* rand::Weighted {weight: 2, item: 'c'}];
@@ -419,10 +429,11 @@ pub trait RngUtil {
419429
*
420430
* ~~~ {.rust}
421431
*
422-
* use core::rand::RngUtil;
432+
* use std::rand;
433+
* use std::rand::RngUtil;
423434
*
424435
* fn main() {
425-
* rng = rand::rng();
436+
* let mut rng = rand::rng();
426437
* println(fmt!("%?",rng.shuffle([1,2,3])));
427438
* }
428439
* ~~~
@@ -435,10 +446,11 @@ pub trait RngUtil {
435446
*
436447
* ~~~ {.rust}
437448
*
438-
* use core::rand::RngUtil;
449+
* use std::rand;
450+
* use std::rand::RngUtil;
439451
*
440452
* fn main() {
441-
* rng = rand::rng();
453+
* let mut rng = rand::rng();
442454
* let mut y = [1,2,3];
443455
* rng.shuffle_mut(y);
444456
* println(fmt!("%?",y));

0 commit comments

Comments
 (0)