Skip to content

Commit f20fb98

Browse files
Sawyer47Sawyer47
committed
---
yaml --- r: 118479 b: refs/heads/try c: b71fa9b h: refs/heads/master i: 118477: c5cb252 118475: c650a13 118471: be3a934 118463: 0a92d60 v: v3
1 parent 6cb268b commit f20fb98

File tree

140 files changed

+1073
-1131
lines changed

Some content is hidden

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

140 files changed

+1073
-1131
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 3770c42a4959cbabc73da52abc7e3db96657974e
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: d6736a1440d42f6af967a8a20ab8d73522112b72
5-
refs/heads/try: 5abf7947076ec2c0d5730bd6a3ab794b9a469398
5+
refs/heads/try: b71fa9bd72fafdade16894c93048aced97b1026b
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

‎branches/try/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/try/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/try/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/try/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/try/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/try/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/try/src/libcollections/smallintmap.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,18 @@ impl<V:Clone> SmallIntMap<V> {
185185
}
186186

187187
impl<V: fmt::Show> fmt::Show for SmallIntMap<V> {
188+
#[cfg(stage0)]
189+
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
190+
try!(write!(f, r"\{"));
191+
192+
for (i, (k, v)) in self.iter().enumerate() {
193+
if i != 0 { try!(write!(f, ", ")); }
194+
try!(write!(f, "{}: {}", k, *v));
195+
}
196+
197+
write!(f, r"\}")
198+
}
199+
#[cfg(not(stage0))]
188200
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
189201
try!(write!(f, "{{"));
190202

‎branches/try/src/libcollections/treemap.rs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,18 @@ impl<K: PartialOrd + Ord, V: PartialOrd> PartialOrd for TreeMap<K, V> {
7676
}
7777

7878
impl<K: Ord + Show, V: Show> Show for TreeMap<K, V> {
79+
#[cfg(stage0)]
80+
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
81+
try!(write!(f, r"\{"));
82+
83+
for (i, (k, v)) in self.iter().enumerate() {
84+
if i != 0 { try!(write!(f, ", ")); }
85+
try!(write!(f, "{}: {}", *k, *v));
86+
}
87+
88+
write!(f, r"\}")
89+
}
90+
#[cfg(not(stage0))]
7991
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
8092
try!(write!(f, "{{"));
8193

@@ -574,6 +586,18 @@ impl<T: PartialOrd + Ord> PartialOrd for TreeSet<T> {
574586
}
575587

576588
impl<T: Ord + Show> Show for TreeSet<T> {
589+
#[cfg(stage0)]
590+
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
591+
try!(write!(f, r"\{"));
592+
593+
for (i, x) in self.iter().enumerate() {
594+
if i != 0 { try!(write!(f, ", ")); }
595+
try!(write!(f, "{}", *x));
596+
}
597+
598+
write!(f, r"\}")
599+
}
600+
#[cfg(not(stage0))]
577601
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
578602
try!(write!(f, "{{"));
579603

‎branches/try/src/libcore/fmt/mod.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -744,6 +744,11 @@ impl Show for () {
744744
}
745745

746746
impl<T: Copy + Show> Show for Cell<T> {
747+
#[cfg(stage0)]
748+
fn fmt(&self, f: &mut Formatter) -> Result {
749+
write!(f, r"Cell \{ value: {} \}", self.get())
750+
}
751+
#[cfg(not(stage0))]
747752
fn fmt(&self, f: &mut Formatter) -> Result {
748753
write!(f, "Cell {{ value: {} }}", self.get())
749754
}

‎branches/try/src/libcore/fmt/rt.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
//! these can be statically allocated and are slightly optimized for the runtime
1616
1717

18+
#[cfg(stage0)]
19+
use option::Option;
20+
1821
#[doc(hidden)]
1922
pub enum Piece<'a> {
2023
String(&'a str),
@@ -25,6 +28,8 @@ pub enum Piece<'a> {
2528
pub struct Argument<'a> {
2629
pub position: Position,
2730
pub format: FormatSpec,
31+
#[cfg(stage0)]
32+
pub method: Option<uint>,
2833
}
2934

3035
#[doc(hidden)]

‎branches/try/src/libcore/intrinsics.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ pub trait TyVisitor {
100100

101101
fn visit_char(&mut self) -> bool;
102102

103+
#[cfg(stage0)]
104+
fn visit_estr_box(&mut self) -> bool;
105+
#[cfg(stage0)]
106+
fn visit_estr_uniq(&mut self) -> bool;
103107
fn visit_estr_slice(&mut self) -> bool;
104108
fn visit_estr_fixed(&mut self, n: uint, sz: uint, align: uint) -> bool;
105109

@@ -108,6 +112,10 @@ pub trait TyVisitor {
108112
fn visit_ptr(&mut self, mtbl: uint, inner: *TyDesc) -> bool;
109113
fn visit_rptr(&mut self, mtbl: uint, inner: *TyDesc) -> bool;
110114

115+
#[cfg(stage0)]
116+
fn visit_evec_box(&mut self, mtbl: uint, inner: *TyDesc) -> bool;
117+
#[cfg(stage0)]
118+
fn visit_evec_uniq(&mut self, mtbl: uint, inner: *TyDesc) -> bool;
111119
fn visit_evec_slice(&mut self, mtbl: uint, inner: *TyDesc) -> bool;
112120
fn visit_evec_fixed(&mut self, n: uint, sz: uint, align: uint,
113121
mtbl: uint, inner: *TyDesc) -> bool;

0 commit comments

Comments
 (0)