squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge remote-tracking branch 'origin/dist-snap' into incoming

Browse source
This commit is contained in:
Graydon Hoare 2012-07-12 17:14:55 -07:00
parent c84c4a8d71 2f32a1581f
commit 18da7fef88
18 changed files with 42 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
RELEASES.txt
View file

@ -1,7 +1,7 @@
Version 0.3 (July 2012) - not yet!
-----------------------------------
Version 0.3 (July 2012)
------------------------
* ~1500 changes, numerous bugfixes
* ~1900 changes, numerous bugfixes
* New coding conveniences
* Integer-literal suffix inference
@ -33,7 +33,7 @@ Version 0.3 (July 2012) - not yet!
* Removal of various obsolete features
* Keywords: 'be', 'prove', 'syntax', 'note', 'mutable', 'bind',
'crust', 'native' (now 'extern')
'crust', 'native' (now 'extern'), 'cont' (now 'again')
* Constructs: do-while loops ('do' repurposed), fn binding,
resources (replaced by destructors)

2
man/rustc.1
View file

@ -1,4 +1,4 @@
.TH RUSTC "1" "May 2012" "rustc 0.2 (23fcab9)" "User Commands"
.TH RUSTC "1" "July 2012" "rustc 0.3" "User Commands"
.SH NAME
rustc \- rust compiler
.SH SYNOPSIS

11
mk/host.mk
View file

@ -31,7 +31,6 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTC): \
@$$(call E, cp: $$@)
$$(Q)cp $$< $$@
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTC_GLOB) \
$$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTC_DSYM_GLOB) \
$$(HLIB$(2)_H_$(4))
$$(HLIB$(2)_H_$(4))/$$(CFG_LIBSYNTAX): \
@ -43,7 +42,6 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBSYNTAX): \
@$$(call E, cp: $$@)
$$(Q)cp $$< $$@
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBSYNTAX_GLOB) \
$$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBSYNTAX_DSYM_GLOB) \
$$(HLIB$(2)_H_$(4))
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME): \
@ -56,15 +54,7 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_CORELIB): \
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME)
@$$(call E, cp: $$@)
$$(Q)cp $$< $$@
# Subtle: We do not let the shell expand $(CORELIB_DSYM_GLOB) directly rather
# we use Make's $$(wildcard) facility. The reason is that, on mac, when using
# USE_SNAPSHOT_CORELIB, we copy the core.dylib file out of the snapshot.
# In that case, there is no .dSYM file. Annoyingly, bash then refuses to expand
# glob, and cp reports an error because libcore-*.dylib.dsym does not exist.
# Make instead expands the glob to nothing, which gives us the correct behavior.
# (Copy .dsym file if it exists, but do nothing otherwise)
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(CORELIB_GLOB) \
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(CORELIB_DSYM_GLOB)) \
$$(HLIB$(2)_H_$(4))
$$(HLIB$(2)_H_$(4))/$$(CFG_STDLIB): \
@ -74,7 +64,6 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_STDLIB): \
@$$(call E, cp: $$@)
$$(Q)cp $$< $$@
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(STDLIB_GLOB) \
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(STDLIB_DSYM_GLOB)) \
$$(HLIB$(2)_H_$(4))
$$(HLIB$(2)_H_$(4))/libcore.rlib: \

4
mk/install.mk
View file

@ -6,11 +6,11 @@
# destination directory as arg 2, and filename/libname-glob as arg 3
ifdef VERBOSE
INSTALL = install -m755 $(1)/$(3) $(2)/$(3)
INSTALL_LIB = install -m644 `ls -rt1 $(1)/$(3) | tail -1` $(2)/
INSTALL_LIB = install -m644 `ls -drt1 $(1)/$(3) | tail -1` $(2)/
else
INSTALL = $(Q)$(call E, install: $(2)/$(3)) && install -m755 $(1)/$(3) $(2)/$(3)
INSTALL_LIB = $(Q)$(call E, install_lib: $(2)/$(3)) && \
install -m644 `ls -rt1 $(1)/$(3) | tail -1` $(2)/
install -m644 `ls -drt1 $(1)/$(3) | tail -1` $(2)/
endif
# The stage we install from

4
mk/platform.mk
View file

@ -76,8 +76,8 @@ endif
ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
CFG_LIB_NAME=lib$(1).dylib
CFG_LIB_GLOB=lib$(1)-*.dylib
CFG_LIB_DSYM_GLOB=lib$(1)-*.dylib.dSYM
# needs trailing * to pick up the .dSYM file too
CFG_LIB_GLOB=lib$(1)-*.dylib*
CFG_UNIXY := 1
CFG_LDENV := DYLD_LIBRARY_PATH
CFG_GCCISH_LINK_FLAGS += -dynamiclib -lpthread -framework CoreServices -Wl,-no_compact_unwind

10
src/cargo/cargo.rc
View file

@ -11,7 +11,7 @@
// End:
#[link(name = "cargo",
vers = "0.2",
vers = "0.3",
uuid = "9ff87a04-8fed-4295-9ff8-f99bb802650b",
url = "https://github.com/mozilla/rust/tree/master/src/cargo")];
@ -21,10 +21,10 @@
#[warn(no_non_implicitly_copyable_typarams,no_vecs_not_implicitly_copyable)];
use core(vers = "0.2");
use std(vers = "0.2");
use rustc(vers = "0.2");
use syntax(vers = "0.2");
use core(vers = "0.3");
use std(vers = "0.3");
use rustc(vers = "0.3");
use syntax(vers = "0.3");
import core::*;

4
src/compiletest/compiletest.rc
View file

@ -4,8 +4,8 @@
#[warn(no_vecs_not_implicitly_copyable)];
use core(vers = "0.2");
use std(vers = "0.2");
use core(vers = "0.3");
use std(vers = "0.3");
import core::*;

2
src/etc/pkg/rust.iss
View file

@ -5,7 +5,7 @@
SetupIconFile=rust-logo.ico
AppName=Rust
AppVersion={#CFG_VERSION}
AppCopyright=Copyright (C) 2006-2011 Mozilla Foundation, MIT license
AppCopyright=Copyright (C) 2006-2012 Mozilla Foundation, MIT license
AppPublisher=Mozilla Foundation
AppPublisherURL=http://www.rust-lang.org
VersionInfoVersion={#CFG_VERSION}

6
src/fuzzer/fuzzer.rc
View file

@ -6,9 +6,9 @@
#[warn(no_vecs_not_implicitly_copyable)];
use core(vers = "0.2");
use std(vers = "0.2");
use syntax(vers = "0.2");
use core(vers = "0.3");
use std(vers = "0.3");
use syntax(vers = "0.3");
import core::*;

2
src/libcore/core.rc
View file

@ -1,5 +1,5 @@
#[link(name = "core",
vers = "0.2",
vers = "0.3",
uuid = "c70c24a7-5551-4f73-8e37-380b11d80be8",
url = "https://github.com/mozilla/rust/tree/master/src/libcore")];

2
src/libcore/core.rs
View file

@ -59,7 +59,7 @@ mod core {
// Similar to above. Some magic to make core testable.
#[cfg(test)]
mod std {
use std(vers = "0.2");
use std(vers = "0.3");
import std::test;
}

4
src/libstd/std.rc
View file

@ -1,5 +1,5 @@
#[link(name = "std",
vers = "0.2",
vers = "0.3",
uuid = "122bed0b-c19b-4b82-b0b7-7ae8aead7297",
url = "https://github.com/mozilla/rust/tree/master/src/libstd")];
@ -12,7 +12,7 @@
#[warn(no_vecs_not_implicitly_copyable)];
use core(vers = "0.2");
use core(vers = "0.3");
import core::*;
export net, net_tcp, net_ip;

6
src/libsyntax/syntax.rc
View file

@ -1,5 +1,5 @@
#[link(name = "syntax",
vers = "0.2",
vers = "0.3",
uuid = "9311401b-d6ea-4cd9-a1d9-61f89499c645")];
@ -10,8 +10,8 @@
#[warn(no_vecs_not_implicitly_copyable)];
use core(vers = "0.2");
use std(vers = "0.2");
use core(vers = "0.3");
use std(vers = "0.3");
import core::*;

1
src/rt/rust_signal.h
View file

@ -5,6 +5,7 @@
class rust_signal {
public:
virtual void signal() = 0;
virtual ~rust_signal() {}
};
#endif /* RUST_SIGNAL_H */

8
src/rustc/driver/rustc.rs
View file

@ -1,10 +1,10 @@
#[no_core];
#[warn(no_vecs_not_implicitly_copyable)];
use core(vers = "0.2");
use std(vers = "0.2");
use rustc(vers = "0.2");
use syntax(vers = "0.2");
use core(vers = "0.3");
use std(vers = "0.3");
use rustc(vers = "0.3");
use syntax(vers = "0.3");
import core::*;

8
src/rustc/rustc.rc
View file

@ -1,7 +1,7 @@
// -*- rust -*-
#[link(name = "rustc",
vers = "0.2",
vers = "0.3",
uuid = "0ce89b41-2f92-459e-bbc1-8f5fe32f16cf",
url = "https://github.com/mozilla/rust/tree/master/src/rustc")];
@ -13,9 +13,9 @@
#[warn(no_vecs_not_implicitly_copyable)];
use core(vers = "0.2");
use std(vers = "0.2");
use syntax(vers = "0.2");
use core(vers = "0.3");
use std(vers = "0.3");
use syntax(vers = "0.3");
import core::*;

10
src/rustdoc/rustdoc.rc
View file

@ -1,7 +1,7 @@
//! Rustdoc - The Rust documentation generator
#[link(name = "rustdoc",
vers = "0.2",
vers = "0.3",
uuid = "f8abd014-b281-484d-a0c3-26e3de8e2412",
url = "https://github.com/mozilla/rust/tree/master/src/rustdoc")];
@ -13,10 +13,10 @@
#[warn(no_vecs_not_implicitly_copyable)];
use core(vers = "0.2");
use std(vers = "0.2");
use rustc(vers = "0.2");
use syntax(vers = "0.2");
use core(vers = "0.3");
use std(vers = "0.3");
use rustc(vers = "0.3");
use syntax(vers = "0.3");
import core::*;

2
src/test/run-pass/use.rs
View file

@ -1,7 +1,7 @@
#[no_core];
use core;
use zed(name = "core");
use bar(name = "core", vers = "0.2");
use bar(name = "core", vers = "0.3");
import core::str;