Skip to content

Commit 015cb29

Browse files
author
jihyun
committed
---
yaml --- r: 63887 b: refs/heads/snap-stage3 c: 7bcde87 h: refs/heads/master i: 63885: 34fc73f 63883: fc6cf6e 63879: d5ad126 63871: 2ae6147 v: v3
1 parent 41ed988 commit 015cb29

File tree

361 files changed

+5240
-8818
lines changed

Some content is hidden

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

361 files changed

+5240
-8818
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: df39932090887086c2d7ce6aa8d30827ab458fd1
4+
refs/heads/snap-stage3: 7bcde87d1baccc857f766d01444e3dd172d92226
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/.gitmodules

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
[submodule "src/llvm"]
22
path = src/llvm
33
url = https://github.com/brson/llvm.git
4-
branch = master
54
[submodule "src/libuv"]
65
path = src/libuv
76
url = https://github.com/brson/libuv.git
8-
branch = master

branches/snap-stage3/Makefile.in

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,8 @@ endif
139139

140140
# version-string calculation
141141
CFG_GIT_DIR := $(CFG_SRC_DIR).git
142-
CFG_RELEASE = 0.7-pre
142+
CFG_RELEASE = 0.6
143143
CFG_VERSION = $(CFG_RELEASE)
144-
# windows exe's need numeric versions - don't use anything but
145-
# numbers and dots here
146-
CFG_VERSION_WIN = 0.7
147144

148145
ifneq ($(wildcard $(CFG_GIT)),)
149146
ifneq ($(wildcard $(CFG_GIT_DIR)),)
@@ -314,7 +311,6 @@ $(foreach host,$(CFG_HOST_TRIPLES), \
314311
export CFG_SRC_DIR
315312
export CFG_BUILD_DIR
316313
export CFG_VERSION
317-
export CFG_VERSION_WIN
318314
export CFG_BUILD_TRIPLE
319315
export CFG_LLVM_ROOT
320316
export CFG_ENABLE_MINGW_CROSS
@@ -540,19 +536,10 @@ ALL_TARGET_RULES = $(foreach target,$(CFG_TARGET_TRIPLES), \
540536
$(foreach host,$(CFG_HOST_TRIPLES), \
541537
all-target-$(target)-host-$(host)))
542538

543-
all: rustllvm/llvm-auto-clean-stamp \
544-
$(ALL_TARGET_RULES) $(GENERATED) docs
539+
all: $(ALL_TARGET_RULES) $(GENERATED) docs
545540

546541
endif
547542

548-
# This is used to independently force an LLVM clean rebuild
549-
# when we changed something not otherwise captured by builtin
550-
# dependencies. In these cases, commit a change that touches
551-
# the stamp in the source dir.
552-
rustllvm/llvm-auto-clean-stamp: $(S)src/rustllvm/llvm-auto-clean-trigger
553-
$(Q)$(MAKE) clean-llvm
554-
touch $@
555-
556543

557544
######################################################################
558545
# Re-configuration

branches/snap-stage3/RELEASES.txt

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ Version 0.7 (July 2013)
44
* ??? changes, numerous bugfixes
55

66
* Syntax changes
7-
* `impl`s no longer accept a visibility qualifier. Put them on methods
8-
instead.
97
* `use mod` is no longer valid.
108
* `fail!` and `assert!` accept `~str`, `&'static str` or `fmt!`-style
119
argument list.
@@ -27,10 +25,6 @@ Version 0.7 (July 2013)
2725
no padding between fields.
2826
* The `for` loop protocol now requires `for`-iterators to return `bool`
2927
so they compose better.
30-
* Trait default methods work more often.
31-
* Type parameters bound by `Copy` must now be copied explicitly with
32-
the `copy` keyword.
33-
* It is now illegal to move out of a dereferenced unsafe pointer.
3428
* `Option<~T>` is now represented as a nullable pointer.
3529
* `@mut` does dynamic borrow checks correctly.
3630
* Macros TODO
@@ -49,30 +43,26 @@ Version 0.7 (July 2013)
4943
* Libraries
5044
* The `core` crate was renamed to `std`.
5145
* The `std` crate was renamed to `extra`.
52-
* std: `iterator` module for external iterator objects.
53-
* Many old-style (internal, higher-order function) iterators replaced by
54-
implementations of `Iterator`.
55-
* std: Many old internal vector and string iterators,
56-
incl. `any`, `all`. removed.
57-
* std: The `finalize` method of `Drop` renamed to `drop`.
46+
* `std::mut` removed.
5847
* std: The prelude no longer reexports any modules, only types and traits.
5948
* std: Prelude additions: `print`, `println`, `FromStr`, `ApproxEq`, `Equiv`,
6049
`Iterator`, `IteratorUtil`, many numeric traits, many tuple traits.
61-
* std: New numeric traits: `Fractional`, `Real`, `RealExt`, `Integer`, `Ratio`,
50+
* std: `iterator` module for external iterator objects.
51+
* std: Many old internal vector and string iterators,
52+
incl. `any`, `all`. removed.
53+
* std: new numeric traits: `Fractional`, `Real`, `RealExt`, `Integer`, `Ratio`,
6254
`Algebraic`, `Trigonometric`, `Exponential`, `Primitive`.
6355
* std: Tuple traits and accessors defined for up to 12-tuples, e.g.
6456
`(0, 1, 2).n2()` or `(0, 1, 2).n2_ref()`.
65-
* std: Many types implement `Clone`.
57+
* std: many types implement `Clone`.
6658
* std: `path` type renamed to `Path`.
67-
* std: `mut` module and `Mut` type removed.
6859
* std: Many standalone functions removed in favor of methods and iterators
6960
in `vec`, `str`. In the future methods will also work as functions.
70-
* std: `reinterpret_cast` removed. Use `transmute`.
61+
* std: `reinterpret_cast` removed. Used `transmute`.
7162
* std: ascii string handling in `std::ascii`.
7263
* std: `Rand` is implemented for ~/@.
7364
* std: `run` module for spawning processes overhauled.
7465
* std: Various atomic types added to `unstable::atomic`.
75-
* std: Various types implement `Zero`.
7666
* std: `LinearMap` and `LinearSet` renamed to `HashMap` and `HashSet`.
7767
* std: Borrowed pointer functions moved from `ptr` to `borrow`.
7868
* std: Added `os::mkdir_recursive`.
@@ -101,12 +91,12 @@ Version 0.7 (July 2013)
10191
dynamic borrowcheck failures for debugging.
10292
* rustdoc has a nicer stylesheet.
10393
* Various improvements to rustdoc.
104-
* Improvements to rustpkg (see the detailed release notes)
10594

10695
* Other
10796
* More and improved library documentation.
10897
* Various improvements on ARM and Android.
10998
* Various improvements to MIPS backend.
99+
* jemalloc is the Rust allocator.
110100

111101
Version 0.6 (April 2013)
112102
------------------------

branches/snap-stage3/doc/rust.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2620,7 +2620,7 @@ assert!(b != "world");
26202620

26212621
The vector type constructor represents a homogeneous array of values of a given type.
26222622
A vector has a fixed size.
2623-
(Operations like `vec.push` operate solely on owned vectors.)
2623+
(Operations like `vec::push` operate solely on owned vectors.)
26242624
A vector type can be annotated with a _definite_ size,
26252625
written with a trailing asterisk and integer literal, such as `[int * 10]`.
26262626
Such a definite-sized vector type is a first-class type, since its size is known statically.
@@ -2862,13 +2862,13 @@ call to the method `make_string`.
28622862
Types in Rust are categorized into kinds, based on various properties of the components of the type.
28632863
The kinds are:
28642864

2865-
`Freeze`
2865+
`Const`
28662866
: Types of this kind are deeply immutable;
28672867
they contain no mutable memory locations directly or indirectly via pointers.
2868-
`Send`
2868+
`Owned`
28692869
: Types of this kind can be safely sent between tasks.
28702870
This kind includes scalars, owning pointers, owned closures, and
2871-
structural types containing only other owned types. All `Send` types are `Static`.
2871+
structural types containing only other owned types. All `Owned` types are `Static`.
28722872
`Static`
28732873
: Types of this kind do not contain any borrowed pointers;
28742874
this can be a useful guarantee for code that breaks borrowing assumptions using [`unsafe` operations](#unsafe-functions).
@@ -2882,7 +2882,7 @@ The kinds are:
28822882
trait provides a single method `finalize` that takes no parameters, and is run
28832883
when values of the type are dropped. Such a method is called a "destructor",
28842884
and are always executed in "top-down" order: a value is completely destroyed
2885-
before any of the values it owns run their destructors. Only `Send` types
2885+
before any of the values it owns run their destructors. Only `Owned` types
28862886
that do not implement `Copy` can implement `Drop`.
28872887

28882888
> **Note:** The `finalize` method may be renamed in future versions of Rust.
@@ -2968,10 +2968,10 @@ frame they are allocated within.
29682968
A task owns all memory it can *safely* reach through local variables,
29692969
as well as managed, owning and borrowed pointers.
29702970

2971-
When a task sends a value that has the `Send` trait to another task,
2971+
When a task sends a value that has the `Owned` trait to another task,
29722972
it loses ownership of the value sent and can no longer refer to it.
29732973
This is statically guaranteed by the combined use of "move semantics",
2974-
and the compiler-checked _meaning_ of the `Send` trait:
2974+
and the compiler-checked _meaning_ of the `Owned` trait:
29752975
it is only instantiated for (transitively) sendable kinds of data constructor and pointers,
29762976
never including managed or borrowed pointers.
29772977

@@ -3116,7 +3116,7 @@ These include:
31163116
- read-only and read-write shared variables with various safe mutual exclusion patterns
31173117
- simple locks and semaphores
31183118

3119-
When such facilities carry values, the values are restricted to the [`Send` type-kind](#type-kinds).
3119+
When such facilities carry values, the values are restricted to the [`Owned` type-kind](#type-kinds).
31203120
Restricting communication interfaces to this kind ensures that no borrowed or managed pointers move between tasks.
31213121
Thus access to an entire data structure can be mediated through its owning "root" value;
31223122
no further locking or copying is required to avoid data races within the substructure of such a value.

branches/snap-stage3/doc/rustpkg.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,22 +95,12 @@ When building a package that is in a `git` repository,
9595
When building a package that is not under version control,
9696
or that has no tags, `rustpkg` assumes the intended version is 0.1.
9797

98-
# Dependencies
99-
100-
rustpkg infers dependencies from `extern mod` directives.
101-
Thus, there should be no need to pass a `-L` flag to rustpkg to tell it where to find a library.
102-
(In the future, it will also be possible to write an `extern mod` directive referring to a remote package.)
103-
10498
# Custom build scripts
10599

106100
A file called `pkg.rs` at the root level in a workspace is called a *package script*.
107101
If a package script exists, rustpkg executes it to build the package
108102
rather than inferring crates as described previously.
109103

110-
Inside `pkg.rs`, it's possible to call back into rustpkg to finish up the build.
111-
`rustpkg::api` contains functions to build, install, or clean libraries and executables
112-
in the way rustpkg normally would without custom build logic.
113-
114104
# Command reference
115105

116106
## build

0 commit comments

Comments
 (0)