Skip to content

Commit af5c40c

Browse files
graydongraydon
committed
---
yaml --- r: 22477 b: refs/heads/master c: 18da7fe h: refs/heads/master i: 22475: e1c5f36 v: v3
1 parent 379d4bb commit af5c40c

File tree

19 files changed

+43
-53
lines changed

19 files changed

+43
-53
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: c84c4a8d71914b5bc0cb3546158bc053aacb7a96
2+
refs/heads/master: 18da7fef888cc51a4cb16e495f0c4682350a449a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

‎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/man/rustc.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH RUSTC "1" "May 2012" "rustc 0.2 (23fcab9)" "User Commands"
1+
.TH RUSTC "1" "July 2012" "rustc 0.3" "User Commands"
22
.SH NAME
33
rustc \- rust compiler
44
.SH SYNOPSIS

‎trunk/mk/host.mk

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTC): \
3131
@$$(call E, cp: $$@)
3232
$$(Q)cp $$< $$@
3333
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTC_GLOB) \
34-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTC_DSYM_GLOB) \
3534
$$(HLIB$(2)_H_$(4))
3635

3736
$$(HLIB$(2)_H_$(4))/$$(CFG_LIBSYNTAX): \
@@ -43,7 +42,6 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBSYNTAX): \
4342
@$$(call E, cp: $$@)
4443
$$(Q)cp $$< $$@
4544
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBSYNTAX_GLOB) \
46-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBSYNTAX_DSYM_GLOB) \
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)
6657
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(CORELIB_GLOB) \
67-
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(CORELIB_DSYM_GLOB)) \
6858
$$(HLIB$(2)_H_$(4))
6959

7060
$$(HLIB$(2)_H_$(4))/$$(CFG_STDLIB): \
@@ -74,7 +64,6 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_STDLIB): \
7464
@$$(call E, cp: $$@)
7565
$$(Q)cp $$< $$@
7666
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(STDLIB_GLOB) \
77-
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(STDLIB_DSYM_GLOB)) \
7867
$$(HLIB$(2)_H_$(4))
7968

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

‎trunk/mk/install.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
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 `ls -drt1 $(1)/$(3) | tail -1` $(2)/
1010
else
1111
INSTALL = $(Q)$(call E, install: $(2)/$(3)) && install -m755 $(1)/$(3) $(2)/$(3)
1212
INSTALL_LIB = $(Q)$(call E, install_lib: $(2)/$(3)) && \
13-
install -m644 `ls -rt1 $(1)/$(3) | tail -1` $(2)/
13+
install -m644 `ls -drt1 $(1)/$(3) | tail -1` $(2)/
1414
endif
1515

1616
# The stage we install from

‎trunk/mk/platform.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ 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+
# needs trailing * to pick up the .dSYM file too
80+
CFG_LIB_GLOB=lib$(1)-*.dylib*
8181
CFG_UNIXY := 1
8282
CFG_LDENV := DYLD_LIBRARY_PATH
8383
CFG_GCCISH_LINK_FLAGS += -dynamiclib -lpthread -framework CoreServices -Wl,-no_compact_unwind

‎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/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/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

‎trunk/src/libstd/std.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#[link(name = "std",
2-
vers = "0.2",
2+
vers = "0.3",
33
uuid = "122bed0b-c19b-4b82-b0b7-7ae8aead7297",
44
url = "https://github.com/mozilla/rust/tree/master/src/libstd")];
55

@@ -12,7 +12,7 @@
1212

1313
#[warn(no_vecs_not_implicitly_copyable)];
1414

15-
use core(vers = "0.2");
15+
use core(vers = "0.3");
1616
import core::*;
1717

1818
export net, net_tcp, net_ip;

‎trunk/src/libsyntax/syntax.rc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#[link(name = "syntax",
2-
vers = "0.2",
2+
vers = "0.3",
33
uuid = "9311401b-d6ea-4cd9-a1d9-61f89499c645")];
44

55

@@ -10,8 +10,8 @@
1010

1111
#[warn(no_vecs_not_implicitly_copyable)];
1212

13-
use core(vers = "0.2");
14-
use std(vers = "0.2");
13+
use core(vers = "0.3");
14+
use std(vers = "0.3");
1515

1616
import core::*;
1717

‎trunk/src/rt/rust_signal.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
class rust_signal {
66
public:
77
virtual void signal() = 0;
8+
virtual ~rust_signal() {}
89
};
910

1011
#endif /* RUST_SIGNAL_H */

‎trunk/src/rustc/driver/rustc.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#[no_core];
22
#[warn(no_vecs_not_implicitly_copyable)];
33

4-
use core(vers = "0.2");
5-
use std(vers = "0.2");
6-
use rustc(vers = "0.2");
7-
use syntax(vers = "0.2");
4+
use core(vers = "0.3");
5+
use std(vers = "0.3");
6+
use rustc(vers = "0.3");
7+
use syntax(vers = "0.3");
88

99
import core::*;
1010

‎trunk/src/rustc/rustc.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// -*- rust -*-
22

33
#[link(name = "rustc",
4-
vers = "0.2",
4+
vers = "0.3",
55
uuid = "0ce89b41-2f92-459e-bbc1-8f5fe32f16cf",
66
url = "https://github.com/mozilla/rust/tree/master/src/rustc")];
77

@@ -13,9 +13,9 @@
1313

1414
#[warn(no_vecs_not_implicitly_copyable)];
1515

16-
use core(vers = "0.2");
17-
use std(vers = "0.2");
18-
use syntax(vers = "0.2");
16+
use core(vers = "0.3");
17+
use std(vers = "0.3");
18+
use syntax(vers = "0.3");
1919

2020
import core::*;
2121

‎trunk/src/rustdoc/rustdoc.rc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! Rustdoc - The Rust documentation generator
22

33
#[link(name = "rustdoc",
4-
vers = "0.2",
4+
vers = "0.3",
55
uuid = "f8abd014-b281-484d-a0c3-26e3de8e2412",
66
url = "https://github.com/mozilla/rust/tree/master/src/rustdoc")];
77

@@ -13,10 +13,10 @@
1313

1414
#[warn(no_vecs_not_implicitly_copyable)];
1515

16-
use core(vers = "0.2");
17-
use std(vers = "0.2");
18-
use rustc(vers = "0.2");
19-
use syntax(vers = "0.2");
16+
use core(vers = "0.3");
17+
use std(vers = "0.3");
18+
use rustc(vers = "0.3");
19+
use syntax(vers = "0.3");
2020

2121
import core::*;
2222

‎trunk/src/test/run-pass/use.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#[no_core];
22
use core;
33
use zed(name = "core");
4-
use bar(name = "core", vers = "0.2");
4+
use bar(name = "core", vers = "0.3");
55

66

77
import core::str;

0 commit comments

Comments
 (0)