Skip to content

Commit 05eb847

Browse files
pcwaltonpcwalton
committed
---
yaml --- r: 152548 b: refs/heads/try2 c: 1a852a6 h: refs/heads/master v: v3
1 parent c883476 commit 05eb847

File tree

408 files changed

+2025
-2818
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

408 files changed

+2025
-2818
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 8a5c5b6081ee041145024176c668cb19e39a01d4
8+
refs/heads/try2: 1a852a6df77d6676e3f88f166a277888742acdbc
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/mk/platform.mk

Lines changed: 28 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -155,76 +155,36 @@ CFG_LDPATH_i686-unknown-linux-gnu :=
155155
CFG_RUN_i686-unknown-linux-gnu=$(2)
156156
CFG_RUN_TARG_i686-unknown-linux-gnu=$(call CFG_RUN_i686-unknown-linux-gnu,,$(2))
157157

158-
# arm-apple-ios configuration
159-
CFG_SDK_NAME_arm-apple-ios = iphoneos
160-
CFG_SDK_ARCHS_arm-apple-ios = armv7
161-
ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
158+
# arm-apple-darwin configuration
159+
ifeq ($(CFG_OSTYPE),apple-darwin)
162160
CFG_IOS_SDK = $(shell xcrun --show-sdk-path -sdk iphoneos 2>/dev/null)
163-
CFG_IOS_FLAGS = -target armv7-apple-darwin -isysroot $(CFG_IOS_SDK) -mios-version-min=7.0
164-
CC_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang)
165-
CXX_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
166-
CPP_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
167-
AR_arm-apple-ios = $(shell xcrun -find -sdk iphoneos ar)
161+
CFG_IOS_FLAGS = -target arm-apple-darwin -isysroot $(CFG_IOS_SDK) -I$(CFG_IOS_SDK)/usr/include -I$(CFG_IOS_SDK)/usr/include/c++/4.2.1
162+
CC_arm-apple-darwin = $(shell xcrun -find -sdk iphoneos clang)
163+
CXX_arm-apple-darwin = $(shell xcrun -find -sdk iphoneos clang++)
164+
CPP_arm-apple-darwin = $(shell xcrun -find -sdk iphoneos clang++)
165+
AR_arm-apple-darwin = $(shell xcrun -find -sdk iphoneos ar)
166+
CFG_LIB_NAME_arm-apple-darwin = lib$(1).dylib
167+
CFG_LIB_GLOB_arm-apple-darwin = lib$(1)-*.dylib
168+
CFG_LIB_DSYM_GLOB_arm-apple-darwin = lib$(1)-*.dylib.dSYM
169+
CFG_CFLAGS_arm-apple-darwin := $(CFG_IOS_FLAGS) $(CFLAGS)
170+
CFG_GCCISH_CFLAGS_arm-apple-darwin := -Wall -Werror -g -fPIC $(CFG_IOS_FLAGS) $(CFLAGS)
171+
CFG_GCCISH_CXXFLAGS_arm-apple-darwin := -fno-rtti $(CFG_IOS_FLAGS) $(CXXFLAGS)
172+
CFG_GCCISH_LINK_FLAGS_arm-apple-darwin := -dynamiclib -lpthread -framework CoreServices -Wl,-no_compact_unwind
173+
CFG_GCCISH_DEF_FLAG_arm-apple-darwin := -Wl,-exported_symbols_list,
174+
CFG_GCCISH_PRE_LIB_FLAGS_arm-apple-darwin :=
175+
CFG_GCCISH_POST_LIB_FLAGS_arm-apple-darwin :=
176+
CFG_DEF_SUFFIX_arm-apple-darwin := .darwin.def
177+
CFG_LLC_FLAGS_arm-apple-darwin :=
178+
CFG_INSTALL_NAME_arm-apple-darwin = -Wl,-install_name,@rpath/$(1)
179+
CFG_LIBUV_LINK_FLAGS_arm-apple-darwin =
180+
CFG_EXE_SUFFIX_arm-apple-darwin :=
181+
CFG_WINDOWSY_arm-apple-darwin :=
182+
CFG_UNIXY_arm-apple-darwin := 1
183+
CFG_PATH_MUNGE_arm-apple-darwin := true
184+
CFG_LDPATH_arm-apple-darwin :=
185+
CFG_RUN_arm-apple-darwin = $(2)
186+
CFG_RUN_TARG_arm-apple-darwin = $(call CFG_RUN_arm-apple-darwin,,$(2))
168187
endif
169-
CFG_LIB_NAME_arm-apple-ios = lib$(1).a
170-
CFG_LIB_GLOB_arm-apple-ios = lib$(1)-*.a
171-
CFG_STATIC_LIB_NAME_arm-apple-ios=lib$(1).a
172-
CFG_LIB_DSYM_GLOB_arm-apple-ios = lib$(1)-*.a.dSYM
173-
CFG_CFLAGS_arm-apple-ios := -arch armv7 -mfpu=vfp3 $(CFG_IOS_FLAGS)
174-
CFG_GCCISH_CFLAGS_arm-apple-ios := -Wall -Werror -g -fPIC $(CFG_IOS_FLAGS) -mfpu=vfp3 -arch armv7
175-
CFG_GCCISH_CXXFLAGS_arm-apple-ios := -fno-rtti $(CFG_IOS_FLAGS) -I$(CFG_IOS_SDK)/usr/include/c++/4.2.1
176-
CFG_GCCISH_LINK_FLAGS_arm-apple-ios := -lpthread -syslibroot $(CFG_IOS_SDK) -Wl,-no_compact_unwind
177-
CFG_GCCISH_DEF_FLAG_arm-apple-ios := -Wl,-exported_symbols_list,
178-
CFG_GCCISH_PRE_LIB_FLAGS_arm-apple-ios :=
179-
CFG_GCCISH_POST_LIB_FLAGS_arm-apple-ios :=
180-
CFG_DEF_SUFFIX_arm-apple-ios := .darwin.def
181-
CFG_LLC_FLAGS_arm-apple-ios := -mattr=+vfp3,+v7,+thumb2,+neon -march=arm
182-
CFG_INSTALL_NAME_arm-apple-ios = -Wl,-install_name,@rpath/$(1)
183-
CFG_LIBUV_LINK_FLAGS_arm-apple-ios =
184-
CFG_EXE_SUFFIX_arm-apple-ios :=
185-
CFG_WINDOWSY_arm-apple-ios :=
186-
CFG_UNIXY_arm-apple-ios := 1
187-
CFG_PATH_MUNGE_arm-apple-ios := true
188-
CFG_LDPATH_arm-apple-ios :=
189-
CFG_RUN_arm-apple-ios = $(2)
190-
CFG_RUN_TARG_arm-apple-ios = $(call CFG_RUN_arm-apple-ios,,$(2))
191-
RUSTC_FLAGS_arm-apple-ios := -C relocation_model=pic
192-
RUSTC_CROSS_FLAGS_arm-apple-ios :=-C relocation_model=pic
193-
194-
# i386-apple-ios configuration
195-
CFG_SDK_NAME_i386-apple-ios = iphonesimulator
196-
CFG_SDK_ARCHS_i386-apple-ios = i386
197-
ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
198-
CFG_IOSSIM_SDK = $(shell xcrun --show-sdk-path -sdk iphonesimulator 2>/dev/null)
199-
CFG_IOSSIM_FLAGS = -target i386-apple-ios -isysroot $(CFG_IOSSIM_SDK) -mios-simulator-version-min=7.0
200-
CC_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang)
201-
CXX_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang++)
202-
CPP_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang++)
203-
AR_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator ar)
204-
endif
205-
CFG_LIB_NAME_i386-apple-ios = lib$(1).a
206-
CFG_LIB_GLOB_i386-apple-ios = lib$(1)-*.dylib
207-
CFG_STATIC_LIB_NAME_i386-apple-ios=lib$(1).a
208-
CFG_LIB_DSYM_GLOB_i386-apple-ios = lib$(1)-*.dylib.dSYM
209-
CFG_CFLAGS_i386-apple-ios = $(CFG_IOSSIM_FLAGS)
210-
CFG_GCCISH_CFLAGS_i386-apple-ios = -Wall -Werror -g -fPIC -m32 $(CFG_IOSSIM_FLAGS)
211-
CFG_GCCISH_CXXFLAGS_i386-apple-ios = -fno-rtti $(CFG_IOSSIM_FLAGS) -I$(CFG_IOSSIM_SDK)/usr/include/c++/4.2.1
212-
CFG_GCCISH_LINK_FLAGS_i386-apple-ios = -lpthread -Wl,-no_compact_unwind -m32 -Wl,-syslibroot $(CFG_IOSSIM_SDK)
213-
CFG_GCCISH_DEF_FLAG_i386-apple-ios = -Wl,-exported_symbols_list,
214-
CFG_GCCISH_PRE_LIB_FLAGS_i386-apple-ios =
215-
CFG_GCCISH_POST_LIB_FLAGS_i386-apple-ios =
216-
CFG_DEF_SUFFIX_i386-apple-ios = .darwin.def
217-
CFG_LLC_FLAGS_i386-apple-ios =
218-
CFG_INSTALL_NAME_i386-apple-ios = -Wl,-install_name,@rpath/$(1)
219-
CFG_LIBUV_LINK_FLAGS_i386-apple-ios =
220-
CFG_EXE_SUFFIX_i386-apple-ios =
221-
CFG_WINDOWSY_i386-apple-ios =
222-
CFG_UNIXY_i386-apple-ios = 1
223-
CFG_PATH_MUNGE_i386-apple-ios = true
224-
CFG_LDPATH_i386-apple-ios =
225-
CFG_RUN_i386-apple-ios = $(2)
226-
CFG_RUN_TARG_i386-apple-ios = $(call CFG_RUN_i386-apple-ios,,$(2))
227-
CFG_JEMALLOC_CFLAGS_i386-apple-ios = -target i386-apple-ios -Wl,-syslibroot $(CFG_IOSSIM_SDK) -Wl,-no_compact_unwind
228188

229189
# x86_64-apple-darwin configuration
230190
CC_x86_64-apple-darwin=$(CC)

‎branches/try2/mk/rt.mk

Lines changed: 6 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,6 @@ ifeq ($$(CFG_WINDOWSY_$(1)), 1)
166166
JEMALLOC_ARGS_$(1) := --enable-lazy-lock
167167
else ifeq ($(OSTYPE_$(1)), apple-darwin)
168168
LIBUV_OSTYPE_$(1) := mac
169-
else ifeq ($(OSTYPE_$(1)), apple-ios)
170-
LIBUV_OSTYPE_$(1) := ios
171-
JEMALLOC_ARGS_$(1) := --disable-tls
172169
else ifeq ($(OSTYPE_$(1)), unknown-freebsd)
173170
LIBUV_OSTYPE_$(1) := freebsd
174171
else ifeq ($(OSTYPE_$(1)), linux-androideabi)
@@ -184,8 +181,6 @@ LIBUV_DIR_$(1) := $$(RT_OUTPUT_DIR_$(1))/libuv
184181
LIBUV_LIB_$(1) := $$(RT_OUTPUT_DIR_$(1))/$$(LIBUV_NAME_$(1))
185182

186183
LIBUV_MAKEFILE_$(1) := $$(CFG_BUILD_DIR)$$(RT_OUTPUT_DIR_$(1))/libuv/Makefile
187-
LIBUV_BUILD_DIR_$(1) := $$(CFG_BUILD_DIR)$$(RT_OUTPUT_DIR_$(1))/libuv
188-
LIBUV_XCODEPROJ_$(1) := $$(LIBUV_BUILD_DIR_$(1))/uv.xcodeproj
189184

190185
LIBUV_STAMP_$(1) = $$(LIBUV_DIR_$(1))/libuv-auto-clean-stamp
191186

@@ -217,30 +212,6 @@ $$(LIBUV_LOCAL_$(1)): $$(LIBUV_DEPS) $$(MKFILE_DEPS)
217212
CXX="$$(CXX_$(1))" \
218213
AR="$$(AR_$(1))" \
219214
V=$$(VERBOSE)
220-
else ifeq ($(OSTYPE_$(1)), apple-ios) # iOS
221-
$$(LIBUV_XCODEPROJ_$(1)): $$(LIBUV_DEPS) $$(MKFILE_DEPS) $$(LIBUV_STAMP_$(1))
222-
cp -rf $(S)src/libuv/ $$(LIBUV_BUILD_DIR_$(1))
223-
(cd $$(LIBUV_BUILD_DIR_$(1)) && \
224-
$$(CFG_PYTHON) ./gyp_uv.py -f xcode \
225-
-D ninja \
226-
-R libuv)
227-
touch $$@
228-
229-
LIBUV_XCODE_OUT_LIB_$(1) := $$(LIBUV_BUILD_DIR_$(1))/build/Release-$$(CFG_SDK_NAME_$(1))/libuv.a
230-
231-
$$(LIBUV_LIB_$(1)): $$(LIBUV_XCODE_OUT_LIB_$(1)) $$(MKFILE_DEPS)
232-
$$(Q)cp $$< $$@
233-
$$(LIBUV_XCODE_OUT_LIB_$(1)): $$(LIBUV_DEPS) $$(LIBUV_XCODEPROJ_$(1)) \
234-
$$(MKFILE_DEPS)
235-
$$(Q)xcodebuild -project $$(LIBUV_BUILD_DIR_$(1))/uv.xcodeproj \
236-
CFLAGS="$$(LIBUV_CFLAGS_$(1)) $$(SNAP_DEFINES)" \
237-
LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS_$(1))" \
238-
$$(LIBUV_ARGS_$(1)) \
239-
V=$$(VERBOSE) \
240-
-configuration Release \
241-
-sdk "$$(CFG_SDK_NAME_$(1))" \
242-
ARCHS="$$(CFG_SDK_ARCHS_$(1))"
243-
$$(Q)touch $$@
244215
else
245216
LIBUV_LOCAL_$(1) := $$(LIBUV_DIR_$(1))/Release/libuv.a
246217
$$(LIBUV_LOCAL_$(1)): $$(LIBUV_DEPS) $$(LIBUV_MAKEFILE_$(1)) $$(MKFILE_DEPS)
@@ -255,6 +226,7 @@ $$(LIBUV_LOCAL_$(1)): $$(LIBUV_DEPS) $$(LIBUV_MAKEFILE_$(1)) $$(MKFILE_DEPS)
255226
NO_LOAD="$$(LIBUV_NO_LOAD)" \
256227
V=$$(VERBOSE)
257228
$$(Q)touch $$@
229+
258230
endif
259231

260232
ifeq ($(1),$$(CFG_BUILD))
@@ -297,13 +269,13 @@ JEMALLOC_LOCAL_$(1) := $$(JEMALLOC_BUILD_DIR_$(1))/lib/$$(JEMALLOC_REAL_NAME_$(1
297269
$$(JEMALLOC_LOCAL_$(1)): $$(JEMALLOC_DEPS) $$(MKFILE_DEPS)
298270
@$$(call E, make: jemalloc)
299271
cd "$$(JEMALLOC_BUILD_DIR_$(1))"; "$(S)src/jemalloc/configure" \
300-
$$(JEMALLOC_ARGS_$(1)) --with-jemalloc-prefix=je_ \
301-
--build=$(CFG_BUILD) --host=$(1) \
272+
$$(JEMALLOC_ARGS_$(1)) --enable-cc-silence --with-jemalloc-prefix=je_ \
273+
--disable-experimental --build=$(CFG_BUILD) --host=$(1) \
302274
CC="$$(CC_$(1))" \
303275
AR="$$(AR_$(1))" \
304276
RANLIB="$$(AR_$(1)) s" \
305277
CPPFLAGS="-I $(S)src/rt/" \
306-
EXTRA_CFLAGS="$$(CFG_CFLAGS_$(1)) $$(CFG_JEMALLOC_CFLAGS_$(1)) -g1"
278+
EXTRA_CFLAGS="$$(CFG_CFLAGS_$(1)) -g1"
307279
$$(Q)$$(MAKE) -C "$$(JEMALLOC_BUILD_DIR_$(1))" build_lib_static
308280

309281
ifeq ($(1),$$(CFG_BUILD))
@@ -363,22 +335,15 @@ BACKTRACE_NAME_$(1) := $$(call CFG_STATIC_LIB_NAME_$(1),backtrace)
363335
BACKTRACE_LIB_$(1) := $$(RT_OUTPUT_DIR_$(1))/$$(BACKTRACE_NAME_$(1))
364336
BACKTRACE_BUILD_DIR_$(1) := $$(RT_OUTPUT_DIR_$(1))/libbacktrace
365337

338+
ifeq ($$(findstring darwin,$$(OSTYPE_$(1))),darwin)
339+
366340
# We don't use this on platforms that aren't linux-based, so just make the file
367341
# available, the compilation of libstd won't actually build it.
368-
ifeq ($$(findstring darwin,$$(OSTYPE_$(1))),darwin)
369-
# See comment above
370342
$$(BACKTRACE_LIB_$(1)):
371343
touch $$@
372344

373345
else
374-
ifeq ($$(findstring ios,$$(OSTYPE_$(1))),ios)
375-
# See comment above
376-
$$(BACKTRACE_LIB_$(1)):
377-
touch $$@
378-
else
379-
380346
ifeq ($$(CFG_WINDOWSY_$(1)),1)
381-
# See comment above
382347
$$(BACKTRACE_LIB_$(1)):
383348
touch $$@
384349
else
@@ -423,7 +388,6 @@ $$(BACKTRACE_LIB_$(1)): $$(BACKTRACE_BUILD_DIR_$(1))/Makefile $$(MKFILE_DEPS)
423388
$$(Q)cp $$(BACKTRACE_BUILD_DIR_$(1))/.libs/libbacktrace.a $$@
424389

425390
endif # endif for windowsy
426-
endif # endif for ios
427391
endif # endif for darwin
428392

429393
endef

‎branches/try2/src/compiler-rt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 7b97b8468f0614072cf3299fa8c51e85f609316f
1+
Subproject commit ed112ca1e4275e1c5707a898f2bf6164707ba378

‎branches/try2/src/compiletest/compiletest.rs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,14 @@ extern crate test;
2020
extern crate getopts;
2121
extern crate green;
2222
extern crate rustuv;
23-
#[phase(plugin, link)] extern crate log;
23+
24+
#[cfg(stage0)]
25+
#[phase(syntax, link)]
26+
extern crate log;
27+
28+
#[cfg(not(stage0))]
29+
#[phase(plugin, link)]
30+
extern crate log;
2431

2532
extern crate regex;
2633

@@ -103,7 +110,7 @@ pub fn parse_config(args: Vec<String> ) -> Config {
103110
let matches =
104111
&match getopts::getopts(args_.as_slice(), groups.as_slice()) {
105112
Ok(m) => m,
106-
Err(f) => fail!("{}", f)
113+
Err(f) => fail!("{}", f.to_err_msg())
107114
};
108115

109116
if matches.opt_present("h") || matches.opt_present("help") {

‎branches/try2/src/doc/tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2518,8 +2518,8 @@ valid types:
25182518
trait Foo {}
25192519
trait Bar<T> {}
25202520

2521-
fn sendable_foo(f: Box<Foo + Send>) { /* ... */ }
2522-
fn shareable_bar<T: Share>(b: &Bar<T> + Share) { /* ... */ }
2521+
fn sendable_foo(f: Box<Foo:Send>) { /* ... */ }
2522+
fn shareable_bar<T: Share>(b: &Bar<T>: Share) { /* ... */ }
25232523
~~~
25242524

25252525
When no colon is specified (such as the type `~Foo`), it is inferred that the

‎branches/try2/src/jemalloc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 024c67ad651e1a3ca228936c4cfb13a37329baf2
1+
Subproject commit 6a96910f2eaea6d2c705bb12379b23576b30d7d5

‎branches/try2/src/liballoc/lib.rs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,25 @@
7070
#![no_std]
7171
#![feature(phase)]
7272

73+
#[cfg(stage0)]
74+
#[phase(syntax, link)]
75+
extern crate core;
76+
77+
#[cfg(not(stage0))]
7378
#[phase(plugin, link)]
7479
extern crate core;
80+
7581
extern crate libc;
7682

83+
7784
// Allow testing this library
7885

7986
#[cfg(test)] extern crate debug;
8087
#[cfg(test)] extern crate native;
81-
#[cfg(test)] #[phase(plugin, link)] extern crate std;
82-
#[cfg(test)] #[phase(plugin, link)] extern crate log;
88+
#[cfg(test, stage0)] #[phase(syntax, link)] extern crate std;
89+
#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log;
90+
#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate std;
91+
#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate log;
8392

8493
// Heaps provided for low-level allocation strategies
8594

‎branches/try2/src/libarena/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,8 +406,7 @@ impl<T> TypedArenaChunk<T> {
406406
None => {}
407407
Some(mut next) => {
408408
// We assume that the next chunk is completely filled.
409-
let capacity = next.capacity;
410-
next.destroy(capacity)
409+
next.destroy(next.capacity)
411410
}
412411
}
413412
}

‎branches/try2/src/libcollections/bitv.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -842,6 +842,20 @@ impl cmp::PartialEq for BitvSet {
842842
}
843843

844844
impl fmt::Show for BitvSet {
845+
#[cfg(stage0)]
846+
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
847+
try!(write!(fmt, r"\{"));
848+
let mut first = true;
849+
for n in self.iter() {
850+
if !first {
851+
try!(write!(fmt, ", "));
852+
}
853+
try!(write!(fmt, "{}", n));
854+
first = false;
855+
}
856+
write!(fmt, r"\}")
857+
}
858+
#[cfg(not(stage0))]
845859
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
846860
try!(write!(fmt, "{{"));
847861
let mut first = true;

‎branches/try2/src/libcollections/lib.rs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,24 @@
2323
#![feature(macro_rules, managed_boxes, default_type_params, phase, globs)]
2424
#![no_std]
2525

26-
#[phase(plugin, link)] extern crate core;
2726
extern crate alloc;
2827

28+
#[cfg(stage0)]
29+
#[phase(syntax, link)]
30+
extern crate core;
31+
32+
#[cfg(not(stage0))]
33+
#[phase(plugin, link)]
34+
extern crate core;
35+
2936
#[cfg(test)] extern crate native;
3037
#[cfg(test)] extern crate test;
3138
#[cfg(test)] extern crate debug;
3239

33-
#[cfg(test)] #[phase(plugin, link)] extern crate std;
34-
#[cfg(test)] #[phase(plugin, link)] extern crate log;
40+
#[cfg(test, stage0)] #[phase(syntax, link)] extern crate std;
41+
#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log;
42+
#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate std;
43+
#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate log;
3544

3645
use core::prelude::*;
3746

‎branches/try2/src/libcollections/ringbuf.rs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ impl<T> Deque<T> for RingBuf<T> {
6666

6767
/// Return a mutable reference to the last element in the RingBuf
6868
fn back_mut<'a>(&'a mut self) -> Option<&'a mut T> {
69-
let nelts = self.nelts;
70-
if nelts > 0 { Some(self.get_mut(nelts - 1)) } else { None }
69+
if self.nelts > 0 { Some(self.get_mut(self.nelts - 1)) } else { None }
7170
}
7271

7372
/// Remove and return the first element in the RingBuf, or None if it is empty
@@ -419,7 +418,6 @@ impl<T: fmt::Show> fmt::Show for RingBuf<T> {
419418
mod tests {
420419
use std::fmt::Show;
421420
use std::prelude::*;
422-
use std::gc::{GC, Gc};
423421
use test::Bencher;
424422
use test;
425423

@@ -474,10 +472,10 @@ mod tests {
474472

475473
#[test]
476474
fn test_boxes() {
477-
let a: Gc<int> = box(GC) 5;
478-
let b: Gc<int> = box(GC) 72;
479-
let c: Gc<int> = box(GC) 64;
480-
let d: Gc<int> = box(GC) 175;
475+
let a: @int = @5;
476+
let b: @int = @72;
477+
let c: @int = @64;
478+
let d: @int = @175;
481479

482480
let mut deq = RingBuf::new();
483481
assert_eq!(deq.len(), 0);
@@ -622,8 +620,7 @@ mod tests {
622620

623621
#[test]
624622
fn test_param_at_int() {
625-
test_parameterized::<Gc<int>>(box(GC) 5, box(GC) 72,
626-
box(GC) 64, box(GC) 175);
623+
test_parameterized::<@int>(@5, @72, @64, @175);
627624
}
628625

629626
#[test]

0 commit comments

Comments
 (0)