Skip to content

Commit 7064d0f

Browse files
committed
---
yaml --- r: 68461 b: refs/heads/auto c: a2227f9 h: refs/heads/master i: 68459: 248743d v: v3
1 parent 1477ae3 commit 7064d0f

File tree

206 files changed

+2065
-3749
lines changed

Some content is hidden

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

206 files changed

+2065
-3749
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: f44b951a1ea40b61508b2d0abb3f239797f885c5
17+
refs/heads/auto: a2227f9e0c295c3582683129a8511d7660b644a0
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/RELEASES.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ Version 0.7 (July 2013)
101101
dynamic borrowcheck failures for debugging.
102102
* rustdoc has a nicer stylesheet.
103103
* Various improvements to rustdoc.
104-
* Improvements to rustpkg (see the detailed release notes)
105104

106105
* Other
107106
* More and improved library documentation.

branches/auto/doc/rust.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -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/auto/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

branches/auto/doc/tutorial-container.md

Lines changed: 0 additions & 207 deletions
This file was deleted.

branches/auto/doc/tutorial-ffi.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ pub struct Unique<T> {
159159
priv ptr: *mut T
160160
}
161161
162-
impl<T: Send> Unique<T> {
162+
impl<T: Owned> Unique<T> {
163163
pub fn new(value: T) -> Unique<T> {
164164
unsafe {
165165
let ptr = malloc(std::sys::size_of::<T>() as size_t) as *mut T;
@@ -182,7 +182,7 @@ impl<T: Send> Unique<T> {
182182
}
183183
184184
#[unsafe_destructor]
185-
impl<T: Send> Drop for Unique<T> {
185+
impl<T: Owned> Drop for Unique<T> {
186186
fn drop(&self) {
187187
unsafe {
188188
let x = intrinsics::init(); // dummy value to swap in

0 commit comments

Comments
 (0)