Skip to content

Commit 460b49a

Browse files
erickterickt
committed
---
yaml --- r: 53238 b: refs/heads/dist-snap c: 9da641b h: refs/heads/master v: v3
1 parent 47a5b38 commit 460b49a

File tree

25 files changed

+421
-151
lines changed

25 files changed

+421
-151
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
99
refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
10-
refs/heads/dist-snap: a29023e9b2b42e94d77404496e72d0132aa44a6b
10+
refs/heads/dist-snap: 9da641bd8c186412813dca899cc8a0eb509122d9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1313
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

‎branches/dist-snap/Makefile.in

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ CFG_LIBFUZZER :=$(call CFG_LIB_NAME,fuzzer)
134134
CFG_LIBRUSTPKG :=$(call CFG_LIB_NAME,rustpkg)
135135
CFG_LIBRUSTDOC :=$(call CFG_LIB_NAME,rustdoc)
136136
CFG_LIBRUSTI :=$(call CFG_LIB_NAME,rusti)
137+
CFG_LIBRUST :=$(call CFG_LIB_NAME,rust)
137138

138139
STDLIB_GLOB :=$(call CFG_LIB_GLOB,std)
139140
CORELIB_GLOB :=$(call CFG_LIB_GLOB,core)
@@ -143,6 +144,7 @@ LIBFUZZER_GLOB :=$(call CFG_LIB_GLOB,fuzzer)
143144
LIBRUSTPKG_GLOB :=$(call CFG_LIB_GLOB,rustpkg)
144145
LIBRUSTDOC_GLOB :=$(call CFG_LIB_GLOB,rustdoc)
145146
LIBRUSTI_GLOB :=$(call CFG_LIB_GLOB,rusti)
147+
LIBRUST_GLOB :=$(call CFG_LIB_GLOB,rust)
146148
STDLIB_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,std)
147149
CORELIB_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,core)
148150
LIBRUSTC_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rustc)
@@ -151,6 +153,7 @@ LIBFUZZER_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,fuzzer)
151153
LIBRUSTPKG_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rustpkg)
152154
LIBRUSTDOC_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rustdoc)
153155
LIBRUSTI_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rusti)
156+
LIBRUST_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rust)
154157

155158
# version-string calculation
156159
CFG_GIT_DIR := $(CFG_SRC_DIR).git
@@ -374,18 +377,21 @@ CSREQ$(1)_T_$(2)_H_$(3) = \
374377
$$(HBIN$(1)_H_$(3))/rustpkg$$(X) \
375378
$$(HBIN$(1)_H_$(3))/rustdoc$$(X) \
376379
$$(HBIN$(1)_H_$(3))/rusti$$(X) \
380+
$$(HBIN$(1)_H_$(3))/rust$$(X) \
377381
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBFUZZER) \
378382
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBRUSTPKG) \
379383
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBRUSTDOC) \
380384
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBRUSTI) \
385+
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBRUST) \
381386
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_CORELIB) \
382387
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB) \
383388
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX) \
384389
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC) \
385390
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBFUZZER) \
386391
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTPKG) \
387392
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTDOC) \
388-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTI)
393+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTI) \
394+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUST)
389395

390396
ifeq ($(1),0)
391397
# Don't run the the stage0 compiler under valgrind - that ship has sailed

‎branches/dist-snap/mk/clean.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ clean$(1)_H_$(2):
6868
$(Q)rm -f $$(HBIN$(1)_H_$(2))/serializer$(X)
6969
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustdoc$(X)
7070
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rusti$(X)
71+
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rust$(X)
7172
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBFUZZER)
7273
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTPKG)
7374
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTDOC)
@@ -77,6 +78,7 @@ clean$(1)_H_$(2):
7778
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTC)
7879
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBSYNTAX)
7980
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTI)
81+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUST)
8082
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CORELIB_GLOB)
8183
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(STDLIB_GLOB)
8284
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTC_GLOB)
@@ -85,6 +87,7 @@ clean$(1)_H_$(2):
8587
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTPKG_GLOB)
8688
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTDOC_GLOB)
8789
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTI_GLOB)
90+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUST_GLOB)
8891
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUSTLLVM)
8992
$(Q)rm -f $$(HLIB$(1)_H_$(2))/libstd.rlib
9093

‎branches/dist-snap/mk/dist.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ PKG_FILES := \
2727
driver \
2828
librustpkg \
2929
librusti \
30+
librust \
3031
librustc \
3132
compiletest \
3233
etc \

‎branches/dist-snap/mk/install.mk

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
6060
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTDOC_GLOB))
6161
$$(Q)$$(call INSTALL_LIB, \
6262
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTI_GLOB))
63+
$$(Q)$$(call INSTALL_LIB, \
64+
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUST_GLOB))
6365
$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a)
6466

6567
endef
@@ -90,15 +92,18 @@ install-host: $(CSREQ$(ISTAGE)_T_$(CFG_HOST_TRIPLE)_H_$(CFG_HOST_TRIPLE))
9092
$(Q)$(call INSTALL,$(HB2),$(PHB),rustpkg$(X))
9193
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X))
9294
$(Q)$(call INSTALL,$(HB2),$(PHB),rusti$(X))
95+
$(Q)$(call INSTALL,$(HB2),$(PHB),rust$(X))
9396
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTC))
9497
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTPKG))
9598
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTDOC))
9699
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTI))
100+
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUST))
97101
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB))
98102
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(STDLIB_GLOB))
99103
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTC_GLOB))
100104
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBSYNTAX_GLOB))
101105
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTI_GLOB))
106+
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUST_GLOB))
102107
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME))
103108
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM))
104109
$(Q)$(call INSTALL,$(S)/man, \
@@ -114,12 +119,14 @@ uninstall:
114119
$(Q)rm -f $(PHB)/rustc$(X)
115120
$(Q)rm -f $(PHB)/rustpkg$(X)
116121
$(Q)rm -f $(PHB)/rusti$(X)
122+
$(Q)rm -f $(PHB)/rust$(X)
117123
$(Q)rm -f $(PHB)/rustdoc$(X)
118124
$(Q)rm -f $(PHL)/$(CFG_RUSTLLVM)
119125
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTPKG)
120126
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTC)
121127
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTDOC)
122128
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTI)
129+
$(Q)rm -f $(PHL)/$(CFG_LIBRUST)
123130
$(Q)rm -f $(PHL)/$(CFG_RUNTIME)
124131
$(Q)for i in \
125132
$(call HOST_LIB_FROM_HL_GLOB,$(CORELIB_GLOB)) \
@@ -129,6 +136,7 @@ uninstall:
129136
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTPKG_GLOB)) \
130137
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTDOC_GLOB)) \
131138
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTI_GLOB)) \
139+
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUST_GLOB)) \
132140
; \
133141
do rm -f $$i ; \
134142
done

‎branches/dist-snap/mk/pp.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ else
1919
$(S)src/test/*/*/*.rs) \
2020
$(wildcard $(S)src/fuzzer/*.rs) \
2121
$(wildcard $(S)src/rustpkg/*.rs) \
22-
$(wildcard $(S)src/rusti/*.rs)
22+
$(wildcard $(S)src/rusti/*.rs) \
23+
$(wildcard $(S)src/rust/*.rs)
2324

2425
PP_INPUTS_FILTERED = $(shell echo $(PP_INPUTS) | xargs grep -L \
2526
"no-reformat\|xfail-pretty\|xfail-test")

‎branches/dist-snap/mk/tests.mk

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
######################################################################
1515

1616
# The names of crates that must be tested
17-
TEST_CRATES = core std syntax rustc rustdoc rusti rustpkg
17+
TEST_CRATES = core std syntax rustc rustdoc rusti rust rustpkg
1818

1919
# Markdown files under doc/ that should have their code extracted and run
2020
DOC_TEST_NAMES = tutorial tutorial-ffi tutorial-macros tutorial-borrowed-ptr tutorial-tasks rust
@@ -241,6 +241,12 @@ $(3)/test/rustitest.stage$(1)-$(2)$$(X): \
241241
@$$(call E, compile_and_link: $$@)
242242
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
243243

244+
$(3)/test/rusttest.stage$(1)-$(2)$$(X): \
245+
$$(RUST_LIB) $$(RUST_INPUTS) \
246+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC)
247+
@$$(call E, compile_and_link: $$@)
248+
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
249+
244250
$(3)/test/rustdoctest.stage$(1)-$(2)$$(X): \
245251
$$(RUSTDOC_LIB) $$(RUSTDOC_INPUTS) \
246252
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC)
@@ -464,20 +470,20 @@ $(foreach host,$(CFG_TARGET_TRIPLES), \
464470

465471
define DEF_RUN_DOC_TEST
466472

467-
DOC_TEST_ARGS$(1)-T-$(2)-H-$(3)-$(4) := \
473+
DOC_TEST_ARGS$(1)-T-$(2)-H-$(3)-doc-$(4) := \
468474
$$(CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3)) \
469475
--src-base $(3)/test/doc-$(4)/ \
470476
--build-base $(3)/test/doc-$(4)/ \
471477
--mode run-pass
472478

473-
check-stage$(1)-T-$(2)-H-$(3)-doc-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4))
479+
check-stage$(1)-T-$(2)-H-$(3)-doc-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4))
474480

475-
$$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
481+
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)): \
476482
$$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \
477483
doc-$(4)-extract$(3)
478484
@$$(call E, run doc-$(4): $$<)
479485
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<,$(3)) \
480-
$$(DOC_TEST_ARGS$(1)-T-$(2)-H-$(3)-$(4)) \
486+
$$(DOC_TEST_ARGS$(1)-T-$(2)-H-$(3)-doc-$(4)) \
481487
--logfile $$(call TEST_LOG_FILE,$(1),$(2),$(3),doc-$(4)) \
482488
&& touch $$@
483489

‎branches/dist-snap/mk/tools.mk

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ RUSTDOC_INPUTS := $(wildcard $(S)src/librustdoc/*.rs)
3030
RUSTI_LIB := $(S)src/librusti/rusti.rc
3131
RUSTI_INPUTS := $(wildcard $(S)src/librusti/*.rs)
3232

33+
# Rust, the convenience tool
34+
RUST_LIB := $(S)src/librust/rust.rc
35+
RUST_INPUTS := $(wildcard $(S)src/librust/*.rs)
36+
3337
# FIXME: These are only built for the host arch. Eventually we'll
3438
# have tools that need to built for other targets.
3539
define TOOLS_STAGE_N_TARGET
@@ -102,6 +106,21 @@ $$(TBIN$(1)_T_$(4)_H_$(3))/rusti$$(X): \
102106
@$$(call E, compile_and_link: $$@)
103107
$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg rusti -o $$@ $$<
104108

109+
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUST): \
110+
$$(RUST_LIB) $$(RUST_INPUTS) \
111+
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
112+
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_CORELIB) \
113+
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_STDLIB) \
114+
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTC)
115+
@$$(call E, compile_and_link: $$@)
116+
$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$< && touch $$@
117+
118+
$$(TBIN$(1)_T_$(4)_H_$(3))/rust$$(X): \
119+
$$(DRIVER_CRATE) \
120+
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUST)
121+
@$$(call E, compile_and_link: $$@)
122+
$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg rust -o $$@ $$<
123+
105124
endef
106125

107126
define TOOLS_STAGE_N_HOST
@@ -185,6 +204,23 @@ $$(HBIN$(2)_H_$(4))/rusti$$(X): \
185204
@$$(call E, cp: $$@)
186205
$$(Q)cp $$< $$@
187206

207+
$$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUST): \
208+
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUST) \
209+
$$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTC) \
210+
$$(HSREQ$(2)_H_$(4))
211+
@$$(call E, cp: $$@)
212+
$$(Q)cp $$< $$@
213+
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUST_GLOB) \
214+
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUST_DSYM_GLOB)) \
215+
$$(HLIB$(2)_H_$(4))
216+
217+
$$(HBIN$(2)_H_$(4))/rust$$(X): \
218+
$$(TBIN$(1)_T_$(4)_H_$(3))/rust$$(X) \
219+
$$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUST) \
220+
$$(HSREQ$(2)_H_$(4))
221+
@$$(call E, cp: $$@)
222+
$$(Q)cp $$< $$@
223+
188224
endef
189225

190226
$(foreach host,$(CFG_TARGET_TRIPLES), \

‎branches/dist-snap/src/driver/driver.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ extern mod this(name = "rustdoc", vers = "0.6");
2323
#[cfg(rusti)]
2424
extern mod this(name = "rusti", vers = "0.6");
2525

26+
#[cfg(rust)]
27+
extern mod this(name = "rust", vers = "0.6");
28+
2629
#[cfg(rustc)]
2730
extern mod this(name = "rustc", vers = "0.6");
2831

‎branches/dist-snap/src/libcore/rand.rs

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ use u32;
1818
use uint;
1919
use util;
2020
use vec;
21+
use libc::size_t;
2122

2223
/// A type that can be randomly generated using an RNG
2324
pub trait Rand {
@@ -120,9 +121,9 @@ enum rust_rng {}
120121

121122
#[abi = "cdecl"]
122123
extern mod rustrt {
123-
unsafe fn rand_seed() -> ~[u8];
124-
unsafe fn rand_new() -> *rust_rng;
125-
unsafe fn rand_new_seeded2(&&seed: ~[u8]) -> *rust_rng;
124+
unsafe fn rand_seed_size() -> size_t;
125+
unsafe fn rand_gen_seed(buf: *mut u8, sz: size_t);
126+
unsafe fn rand_new_seeded(buf: *u8, sz: size_t) -> *rust_rng;
126127
unsafe fn rand_next(rng: *rust_rng) -> u32;
127128
unsafe fn rand_free(rng: *rust_rng);
128129
}
@@ -388,15 +389,18 @@ impl Rng for @RandRes {
388389
/// Create a new random seed for seeded_rng
389390
pub fn seed() -> ~[u8] {
390391
unsafe {
391-
rustrt::rand_seed()
392+
let n = rustrt::rand_seed_size() as uint;
393+
let mut s = vec::from_elem(n, 0_u8);
394+
do vec::as_mut_buf(s) |p, sz| {
395+
rustrt::rand_gen_seed(p, sz as size_t)
396+
}
397+
s
392398
}
393399
}
394400

395401
/// Create a random number generator with a system specified seed
396402
pub fn Rng() -> Rng {
397-
unsafe {
398-
@RandRes(rustrt::rand_new()) as Rng
399-
}
403+
seeded_rng(seed())
400404
}
401405

402406
/**
@@ -405,9 +409,15 @@ pub fn Rng() -> Rng {
405409
* all other generators constructed with the same seed. The seed may be any
406410
* length.
407411
*/
408-
pub fn seeded_rng(seed: &~[u8]) -> Rng {
412+
pub fn seeded_rng(seed: &[u8]) -> Rng {
413+
seeded_randres(seed) as Rng
414+
}
415+
416+
fn seeded_randres(seed: &[u8]) -> @RandRes {
409417
unsafe {
410-
@RandRes(rustrt::rand_new_seeded2(*seed)) as Rng
418+
do vec::as_imm_buf(seed) |p, sz| {
419+
@RandRes(rustrt::rand_new_seeded(p, sz as size_t))
420+
}
411421
}
412422
}
413423

@@ -457,7 +467,7 @@ pub fn task_rng() -> Rng {
457467
match r {
458468
None => {
459469
unsafe {
460-
let rng = @RandRes(rustrt::rand_new());
470+
let rng = seeded_randres(seed());
461471
task::local_data::local_data_set(tls_rng_state, rng);
462472
rng as Rng
463473
}
@@ -483,24 +493,24 @@ pub mod tests {
483493
#[test]
484494
pub fn rng_seeded() {
485495
let seed = rand::seed();
486-
let ra = rand::seeded_rng(&seed);
487-
let rb = rand::seeded_rng(&seed);
496+
let ra = rand::seeded_rng(seed);
497+
let rb = rand::seeded_rng(seed);
488498
assert ra.gen_str(100u) == rb.gen_str(100u);
489499
}
490500

491501
#[test]
492502
pub fn rng_seeded_custom_seed() {
493503
// much shorter than generated seeds which are 1024 bytes
494-
let seed = ~[2u8, 32u8, 4u8, 32u8, 51u8];
495-
let ra = rand::seeded_rng(&seed);
496-
let rb = rand::seeded_rng(&seed);
504+
let seed = [2u8, 32u8, 4u8, 32u8, 51u8];
505+
let ra = rand::seeded_rng(seed);
506+
let rb = rand::seeded_rng(seed);
497507
assert ra.gen_str(100u) == rb.gen_str(100u);
498508
}
499509

500510
#[test]
501511
pub fn rng_seeded_custom_seed2() {
502-
let seed = ~[2u8, 32u8, 4u8, 32u8, 51u8];
503-
let ra = rand::seeded_rng(&seed);
512+
let seed = [2u8, 32u8, 4u8, 32u8, 51u8];
513+
let ra = rand::seeded_rng(seed);
504514
// Regression test that isaac is actually using the above vector
505515
let r = ra.next();
506516
error!("%?", r);

0 commit comments

Comments
 (0)