diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-10-02 14:53:18 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-10-02 14:53:18 -0700 |
| commit | 7ae802f57bf8a1ac2a47760a936c56e6fff16821 (patch) | |
| tree | a6063128be15d8bb988d61b4ce695eafd8fb1ec6 /src/doc | |
| parent | ebe4da971aa4b2a9db597b682b96133f373dbec5 (diff) | |
| parent | 58bea31ca0e11bf49439d33e1d21f11de7161567 (diff) | |
| download | rust-7ae802f57bf8a1ac2a47760a936c56e6fff16821.tar.gz rust-7ae802f57bf8a1ac2a47760a936c56e6fff16821.zip | |
rollup merge of #17666 : eddyb/take-garbage-out
Conflicts: src/libcollections/lib.rs src/libcore/lib.rs src/librustdoc/lib.rs src/librustrt/lib.rs src/libserialize/lib.rs src/libstd/lib.rs src/test/run-pass/issue-8898.rs
Diffstat (limited to 'src/doc')
| -rw-r--r-- | src/doc/guide-pointers.md | 13 | ||||
| -rw-r--r-- | src/doc/guide-runtime.md | 1 | ||||
| -rw-r--r-- | src/doc/guide-unsafe.md | 4 | ||||
| -rw-r--r-- | src/doc/reference.md | 2 |
4 files changed, 2 insertions, 18 deletions
diff --git a/src/doc/guide-pointers.md b/src/doc/guide-pointers.md index b920ffbdd1a..dd9c6871722 100644 --- a/src/doc/guide-pointers.md +++ b/src/doc/guide-pointers.md @@ -632,19 +632,6 @@ This part is coming soon. This part is coming soon. -# Gc - -The `Gc<T>` type exists for historical reasons, and is [still used -internally](https://github.com/rust-lang/rust/issues/7929) by the compiler. -It is not even a 'real' garbage collected type at the moment. - -In the future, Rust may have a real garbage collected type, and so it -has not yet been removed for that reason. - -## Best practices - -There is currently no legitimate use case for the `Gc<T>` type. - # Raw Pointers This part is coming soon. diff --git a/src/doc/guide-runtime.md b/src/doc/guide-runtime.md index 66a1e46c82a..578ff0edf14 100644 --- a/src/doc/guide-runtime.md +++ b/src/doc/guide-runtime.md @@ -31,7 +31,6 @@ list): * Task synchronization * Task-local storage * Logging -* Local heaps (GC heaps) * Task unwinding ## What is the runtime accomplishing? diff --git a/src/doc/guide-unsafe.md b/src/doc/guide-unsafe.md index 1e67c8a13e9..fe6664bd848 100644 --- a/src/doc/guide-unsafe.md +++ b/src/doc/guide-unsafe.md @@ -208,9 +208,7 @@ pub struct Unique<T> { // Implement methods for creating and using the values in the box. // NB: For simplicity and correctness, we require that T has kind Send -// (owned boxes relax this restriction, and can contain managed (GC) boxes). -// This is because, as implemented, the garbage collector would not know -// about any shared boxes stored in the malloc'd region of memory. +// (owned boxes relax this restriction). impl<T: Send> Unique<T> { pub fn new(value: T) -> Unique<T> { unsafe { diff --git a/src/doc/reference.md b/src/doc/reference.md index 3da3d4c5807..74efa5425bd 100644 --- a/src/doc/reference.md +++ b/src/doc/reference.md @@ -3381,7 +3381,7 @@ fn main() { ``` -Patterns can also dereference pointers by using the `&`, `box` or `@` symbols, +Patterns can also dereference pointers by using the `&`, `box` symbols, as appropriate. For example, these two matches on `x: &int` are equivalent: ``` |