Skip to content

Commit 98a135c

Browse files
graydongraydon
committed
---
yaml --- r: 22446 b: refs/heads/master c: 2cf6bf8 h: refs/heads/master v: v3
1 parent d57d00c commit 98a135c

Some content is hidden

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

57 files changed

+400
-1274
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 650009f80cfc20d1c3a8d31ebe6593b65e5951bf
2+
refs/heads/master: 2cf6bf87c348f4a1079aa1c17e51eb45d9b89a5f
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

‎trunk/Makefile.in

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,10 @@ CFG_STDLIB :=$(call CFG_LIB_NAME,std)
118118
CFG_LIBRUSTC :=$(call CFG_LIB_NAME,rustc)
119119
CFG_LIBSYNTAX :=$(call CFG_LIB_NAME,syntax)
120120

121-
STDLIB_GLOB :=$(call CFG_LIB_GLOB,std)
122-
CORELIB_GLOB :=$(call CFG_LIB_GLOB,core)
123-
LIBRUSTC_GLOB :=$(call CFG_LIB_GLOB,rustc)
124-
LIBSYNTAX_GLOB :=$(call CFG_LIB_GLOB,syntax)
125-
STDLIB_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,std)
126-
CORELIB_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,core)
127-
LIBRUSTC_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rustc)
128-
LIBSYNTAX_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,syntax)
121+
STDLIB_GLOB =$(call CFG_LIB_GLOB,$(1),std)
122+
CORELIB_GLOB =$(call CFG_LIB_GLOB,$(1),core)
123+
LIBRUSTC_GLOB =$(call CFG_LIB_GLOB,$(1),rustc)
124+
LIBSYNTAX_GLOB =$(call CFG_LIB_GLOB,$(1),syntax)
129125

130126
# version-string calculation
131127
CFG_GIT_DIR := $(CFG_SRC_DIR).git

‎trunk/RELEASES.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Version 0.3 (July 2012) - not yet!
2-
-----------------------------------
1+
Version 0.3 (July 2012)
2+
------------------------
33

4-
* ~1500 changes, numerous bugfixes
4+
* ~1900 changes, numerous bugfixes
55

66
* New coding conveniences
77
* Integer-literal suffix inference
@@ -33,7 +33,7 @@ Version 0.3 (July 2012) - not yet!
3333

3434
* Removal of various obsolete features
3535
* Keywords: 'be', 'prove', 'syntax', 'note', 'mutable', 'bind',
36-
'crust', 'native' (now 'extern')
36+
'crust', 'native' (now 'extern'), 'cont' (now 'again')
3737

3838
* Constructs: do-while loops ('do' repurposed), fn binding,
3939
resources (replaced by destructors)

‎trunk/doc/tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2320,11 +2320,11 @@ and one for values. This means that this code is valid:
23202320
~~~~
23212321
mod buffalo {
23222322
type buffalo = int;
2323-
fn buffalo<buffalo: copy>(buffalo: buffalo) -> buffalo { buffalo }
2323+
fn buffalo(buffalo: buffalo) -> buffalo { buffalo }
23242324
}
23252325
fn main() {
23262326
let buffalo: buffalo::buffalo = 1;
2327-
buffalo::buffalo::<buffalo::buffalo>(buffalo::buffalo(buffalo));
2327+
buffalo::buffalo(buffalo::buffalo(buffalo));
23282328
}
23292329
~~~~
23302330

‎trunk/mk/clean.mk

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ clean$(1)_H_$(2):
6262
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_STDLIB)
6363
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTC)
6464
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBSYNTAX)
65-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CORELIB_GLOB)
66-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(STDLIB_GLOB)
67-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTC_GLOB)
68-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBSYNTAX_GLOB)
65+
$(Q)rm -f $$(call CORELIB_GLOB,$$(HLIB$(1)_H_$(2)))
66+
$(Q)rm -f $$(call STDLIB_GLOB,$$(HLIB$(1)_H_$(2))))
67+
$(Q)rm -f $$(call LIBRUSTC_GLOB,$$(HLIB$(1)_H_$(2)))
68+
$(Q)rm -f $$(call LIBSYNTAX_GLOB,$$(HLIB$(1)_H_$(2)))
6969
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUSTLLVM)
7070
$(Q)rm -f $$(HLIB$(1)_H_$(2))/libstd.rlib
7171

@@ -88,10 +88,10 @@ clean$(1)_T_$(2)_H_$(3):
8888
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB)
8989
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC)
9090
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX)
91-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CORELIB_GLOB)
92-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(STDLIB_GLOB)
93-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTC_GLOB)
94-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBSYNTAX_GLOB)
91+
$(Q)rm -f $$(call CORELIB_GLOB,$$(TLIB$(1)_T_$(2)_H_$(3)))
92+
$(Q)rm -f $$(call STDLIB_GLOB,$$(TLIB$(1)_T_$(2)_H_$(3)))
93+
$(Q)rm -f $$(call LIBRUSTC_GLOB,$$(TLIB$(1)_T_$(2)_H_$(3)))
94+
$(Q)rm -f $$(call LIBSYNTAX_GLOB,$$(TLIB$(1)_T_$(2)_H_$(3)))
9595
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM)
9696
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libstd.rlib
9797
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a

‎trunk/mk/host.mk

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTC): \
3030
$$(HSTDLIB_DEFAULT$(2)_H_$(3))
3131
@$$(call E, cp: $$@)
3232
$$(Q)cp $$< $$@
33-
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTC_GLOB) \
34-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTC_DSYM_GLOB) \
33+
$$(Q)cp -R $$(call LIBRUSTC_GLOB,$$(TLIB$(1)_T_$(4)_H_$(3))) \
3534
$$(HLIB$(2)_H_$(4))
3635

3736
$$(HLIB$(2)_H_$(4))/$$(CFG_LIBSYNTAX): \
@@ -42,8 +41,7 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBSYNTAX): \
4241
$$(HSTDLIB_DEFAULT$(2)_H_$(3))
4342
@$$(call E, cp: $$@)
4443
$$(Q)cp $$< $$@
45-
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBSYNTAX_GLOB) \
46-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBSYNTAX_DSYM_GLOB) \
44+
$$(Q)cp -R $$(call LIBSYNTAX_GLOB,$$(TLIB$(1)_T_$(4)_H_$(3))) \
4745
$$(HLIB$(2)_H_$(4))
4846

4947
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME): \
@@ -56,15 +54,7 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_CORELIB): \
5654
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME)
5755
@$$(call E, cp: $$@)
5856
$$(Q)cp $$< $$@
59-
# Subtle: We do not let the shell expand $(CORELIB_DSYM_GLOB) directly rather
60-
# we use Make's $$(wildcard) facility. The reason is that, on mac, when using
61-
# USE_SNAPSHOT_CORELIB, we copy the core.dylib file out of the snapshot.
62-
# In that case, there is no .dSYM file. Annoyingly, bash then refuses to expand
63-
# glob, and cp reports an error because libcore-*.dylib.dsym does not exist.
64-
# Make instead expands the glob to nothing, which gives us the correct behavior.
65-
# (Copy .dsym file if it exists, but do nothing otherwise)
66-
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(CORELIB_GLOB) \
67-
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(CORELIB_DSYM_GLOB)) \
57+
$$(Q)cp -R $$(call CORELIB_GLOB,$$(TLIB$(1)_T_$(4)_H_$(3))) \
6858
$$(HLIB$(2)_H_$(4))
6959

7060
$$(HLIB$(2)_H_$(4))/$$(CFG_STDLIB): \
@@ -73,8 +63,7 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_STDLIB): \
7363
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME)
7464
@$$(call E, cp: $$@)
7565
$$(Q)cp $$< $$@
76-
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(STDLIB_GLOB) \
77-
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(STDLIB_DSYM_GLOB)) \
66+
$$(Q)cp -R $$(call STDLIB_GLOB,$$(TLIB$(1)_T_$(4)_H_$(3))) \
7867
$$(HLIB$(2)_H_$(4))
7968

8069
$$(HLIB$(2)_H_$(4))/libcore.rlib: \

‎trunk/mk/install.mk

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
# destination directory as arg 2, and filename/libname-glob as arg 3
77
ifdef VERBOSE
88
INSTALL = install -m755 $(1)/$(3) $(2)/$(3)
9-
INSTALL_LIB = install -m644 `ls -rt1 $(1)/$(3) | tail -1` $(2)/
9+
INSTALL_LIB = install -m644 $(3) $(2)/
1010
else
1111
INSTALL = $(Q)$(call E, install: $(2)/$(3)) && install -m755 $(1)/$(3) $(2)/$(3)
12-
INSTALL_LIB = $(Q)$(call E, install_lib: $(2)/$(3)) && \
13-
install -m644 `ls -rt1 $(1)/$(3) | tail -1` $(2)/
12+
INSTALL_LIB = $(Q)$(call E, install_lib: \
13+
$(addprefix $(2)/,$(basename $(3)))) && \
14+
install -m644 $(3) $(2)/
1415
endif
1516

1617
# The stage we install from
@@ -37,13 +38,17 @@ install-target-$(1)-host-$(2): $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
3738
$$(Q)mkdir -p $$(PTL$(1)$(2))
3839
$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CFG_RUNTIME))
3940
$$(Q)$$(call INSTALL_LIB, \
40-
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CORELIB_GLOB))
41+
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),\
42+
$$(call CORELIB_GLOB,$$(TL$(1)$(2))))
4143
$$(Q)$$(call INSTALL_LIB, \
42-
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(STDLIB_GLOB))
44+
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),\
45+
$$(call STDLIB_GLOB,$$(TL$(1)$(2))))
4346
$$(Q)$$(call INSTALL_LIB, \
44-
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTC_GLOB))
47+
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),\
48+
$$(call LIBRUSTC_GLOB,$$(TL$(1)$(2))))
4549
$$(Q)$$(call INSTALL_LIB, \
46-
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBSYNTAX_GLOB))
50+
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),\
51+
$$(call LIBSYNTAX_GLOB,$$(TL$(1)$(2))))
4752
$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a)
4853

4954
endef
@@ -74,10 +79,10 @@ install-host: $(SREQ$(ISTAGE)_T_$(CFG_HOST_TRIPLE)_H_$(CFG_HOST_TRIPLE))
7479
$(Q)$(call INSTALL,$(HB2),$(PHB),cargo$(X))
7580
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X))
7681
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME))
77-
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB))
78-
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(STDLIB_GLOB))
79-
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTC_GLOB))
80-
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBSYNTAX_GLOB))
82+
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(call CORELIB_GLOB,$(PHL)))
83+
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(call STDLIB_GLOB,$(PHL)))
84+
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(call LIBRUSTC_GLOB,$(PHL)))
85+
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(call LIBSYNTAX_GLOB,$(PHL)))
8186
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM))
8287
$(Q)$(call INSTALL,$(S)/man, \
8388
$(PREFIX_ROOT)/share/man/man1,rustc.1)
@@ -86,7 +91,7 @@ install-targets: $(INSTALL_TARGET_RULES)
8691

8792

8893
HOST_LIB_FROM_HL_GLOB = \
89-
$(patsubst $(HL)/%,$(PHL)/%,$(wildcard $(HL)/$(1)))
94+
$(patsubst $(HL)/%,$(PHL)/%,$(1))
9095

9196
uninstall:
9297
$(Q)rm -f $(PHB)/rustc$(X)
@@ -95,10 +100,10 @@ uninstall:
95100
$(Q)rm -f $(PHL)/$(CFG_RUSTLLVM)
96101
$(Q)rm -f $(PHL)/$(CFG_RUNTIME)
97102
$(Q)for i in \
98-
$(call HOST_LIB_FROM_HL_GLOB,$(CORELIB_GLOB)) \
99-
$(call HOST_LIB_FROM_HL_GLOB,$(STDLIB_GLOB)) \
100-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTC_GLOB)) \
101-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBSYNTAX_GLOB)) \
103+
$(call HOST_LIB_FROM_HL_GLOB,$(call CORELIB_GLOB,$(HL))) \
104+
$(call HOST_LIB_FROM_HL_GLOB,$(call STDLIB_GLOB,$(HL))) \
105+
$(call HOST_LIB_FROM_HL_GLOB,$(call LIBRUSTC_GLOB,$(HL))) \
106+
$(call HOST_LIB_FROM_HL_GLOB,$(call LIBSYNTAX_GLOB,$(HL))) \
102107
; \
103108
do rm -f $$i ; \
104109
done

‎trunk/mk/platform.mk

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ CFG_DSYMUTIL := true
2121

2222
ifneq ($(findstring freebsd,$(CFG_OSTYPE)),)
2323
CFG_LIB_NAME=lib$(1).so
24-
CFG_LIB_GLOB=lib$(1)-*.so
24+
CFG_LIB_GLOB=$(wildcard $(1)/lib$(2)-*.so)
2525
CFG_GCCISH_CFLAGS += -fPIC -I/usr/local/include
2626
CFG_GCCISH_LINK_FLAGS += -shared -fPIC -lpthread -lrt
2727
CFG_GCCISH_DEF_FLAG := -Wl,--export-dynamic,--dynamic-list=
@@ -40,7 +40,7 @@ endif
4040

4141
ifneq ($(findstring linux,$(CFG_OSTYPE)),)
4242
CFG_LIB_NAME=lib$(1).so
43-
CFG_LIB_GLOB=lib$(1)-*.so
43+
CFG_LIB_GLOB=$(wildcard $(1)/lib$(2)-*.so)
4444
CFG_GCCISH_CFLAGS += -fPIC
4545
CFG_GCCISH_LINK_FLAGS += -shared -fPIC -ldl -lpthread -lrt
4646
CFG_GCCISH_DEF_FLAG := -Wl,--export-dynamic,--dynamic-list=
@@ -76,8 +76,7 @@ endif
7676

7777
ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
7878
CFG_LIB_NAME=lib$(1).dylib
79-
CFG_LIB_GLOB=lib$(1)-*.dylib
80-
CFG_LIB_DSYM_GLOB=lib$(1)-*.dylib.dSYM
79+
CFG_LIB_GLOB=$(wildcard $(1)/lib$(2)-*.dylib $(1)/lib$(2)-*.dylib.dSYM)
8180
CFG_UNIXY := 1
8281
CFG_LDENV := DYLD_LIBRARY_PATH
8382
CFG_GCCISH_LINK_FLAGS += -dynamiclib -lpthread -framework CoreServices -Wl,-no_compact_unwind
@@ -174,7 +173,7 @@ ifdef CFG_WINDOWSY
174173

175174
CFG_EXE_SUFFIX := .exe
176175
CFG_LIB_NAME=$(1).dll
177-
CFG_LIB_GLOB=$(1)-*.dll
176+
CFG_LIB_GLOB=$(wildcard $(1)/$(2)-*.dll)
178177
CFG_DEF_SUFFIX := .def
179178
ifdef MSYSTEM
180179
CFG_LDPATH :=$(CFG_LDPATH):$$PATH

‎trunk/src/cargo/cargo.rc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// End:
1212

1313
#[link(name = "cargo",
14-
vers = "0.2",
14+
vers = "0.3",
1515
uuid = "9ff87a04-8fed-4295-9ff8-f99bb802650b",
1616
url = "https://github.com/mozilla/rust/tree/master/src/cargo")];
1717

@@ -21,10 +21,10 @@
2121

2222
#[warn(no_non_implicitly_copyable_typarams,no_vecs_not_implicitly_copyable)];
2323

24-
use core(vers = "0.2");
25-
use std(vers = "0.2");
26-
use rustc(vers = "0.2");
27-
use syntax(vers = "0.2");
24+
use core(vers = "0.3");
25+
use std(vers = "0.3");
26+
use rustc(vers = "0.3");
27+
use syntax(vers = "0.3");
2828

2929
import core::*;
3030

‎trunk/src/compiletest/compiletest.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
#[warn(no_vecs_not_implicitly_copyable)];
66

7-
use core(vers = "0.2");
8-
use std(vers = "0.2");
7+
use core(vers = "0.3");
8+
use std(vers = "0.3");
99

1010
import core::*;
1111

‎trunk/src/etc/pkg/rust.iss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
SetupIconFile=rust-logo.ico
66
AppName=Rust
77
AppVersion={#CFG_VERSION}
8-
AppCopyright=Copyright (C) 2006-2011 Mozilla Foundation, MIT license
8+
AppCopyright=Copyright (C) 2006-2012 Mozilla Foundation, MIT license
99
AppPublisher=Mozilla Foundation
1010
AppPublisherURL=http://www.rust-lang.org
1111
VersionInfoVersion={#CFG_VERSION}

‎trunk/src/etc/vim/syntax/rust.vim

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@ syn keyword rustConstant STDIN_FILENO STDOUT_FILENO STDERR_FILENO
6666
syn match rustModPath "\w\(\w\)*::[^<]"he=e-3,me=e-3
6767
syn match rustModPathSep "::"
6868

69-
syn match rustFuncCall "\w\(\w\)*("he=e-1,me=e-1
70-
syn match rustFuncCall "\w\(\w\)*::<"he=e-3,me=e-3 " foo::<T>();
71-
7269
syn region rustString start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=rustTodo
7370

7471
syn region rustAttribute start="#\[" end="\]" contains=rustString
@@ -122,7 +119,6 @@ hi def link rustAttribute PreProc
122119
" Other Suggestions:
123120
" hi def link rustModPathSep Conceal
124121
" hi rustAssert ctermfg=yellow
125-
" hi rustFuncCall ctermfg=magenta
126122

127123
syn sync minlines=200
128124
syn sync maxlines=500

‎trunk/src/fuzzer/fuzzer.rc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
#[warn(no_vecs_not_implicitly_copyable)];
88

9-
use core(vers = "0.2");
10-
use std(vers = "0.2");
11-
use syntax(vers = "0.2");
9+
use core(vers = "0.3");
10+
use std(vers = "0.3");
11+
use syntax(vers = "0.3");
1212

1313
import core::*;
1414

‎trunk/src/libcore/arc.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ fn clone<T: const send>(rc: &arc<T>) -> arc<T> {
8484
}
8585

8686
// An arc over mutable data that is protected by a lock.
87-
type ex_data<T: send> = {lock: sys::lock_and_signal, mut data: T};
87+
type ex_data<T: send> = {lock: sys::lock_and_signal, data: T};
8888
type exclusive<T: send> = arc_destruct<ex_data<T>>;
8989

9090
fn exclusive<T:send >(-data: T) -> exclusive<T> {
@@ -110,12 +110,12 @@ impl methods<T: send> for exclusive<T> {
110110
arc_destruct(self.data)
111111
}
112112

113-
unsafe fn with<U>(f: fn(sys::condition, x: &mut T) -> U) -> U {
113+
unsafe fn with<U>(f: fn(sys::condition, x: &T) -> U) -> U {
114114
let ptr: ~arc_data<ex_data<T>> =
115115
unsafe::reinterpret_cast(self.data);
116116
let r = {
117117
let rec: &ex_data<T> = &(*ptr).data;
118-
rec.lock.lock_cond(|c| f(c, &mut rec.data))
118+
rec.lock.lock_cond(|c| f(c, &rec.data))
119119
};
120120
unsafe::forget(ptr);
121121
r

‎trunk/src/libcore/core.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#[link(name = "core",
2-
vers = "0.2",
2+
vers = "0.3",
33
uuid = "c70c24a7-5551-4f73-8e37-380b11d80be8",
44
url = "https://github.com/mozilla/rust/tree/master/src/libcore")];
55

‎trunk/src/libcore/core.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ mod core {
5959
// Similar to above. Some magic to make core testable.
6060
#[cfg(test)]
6161
mod std {
62-
use std(vers = "0.2");
62+
use std(vers = "0.3");
6363
import std::test;
6464
}
6565

0 commit comments

Comments
 (0)