Skip to content

Commit 1682710

Browse files
committed
---
yaml --- r: 39903 b: refs/heads/dist-snap c: 8f9bb5d h: refs/heads/master i: 39901: 5b8708b 39899: f123b44 39895: 7bdf82b 39887: 6ad321d 39871: e7821ea v: v3
1 parent a6b2d07 commit 1682710

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
99
refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
10-
refs/heads/dist-snap: d81a7aba3cc634ae11c412f528591a1647a02de1
10+
refs/heads/dist-snap: 8f9bb5d2030abf71b42af1898d67446e11678c99
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1313
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/doc/rust.md

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ If you have suggestions to make, please try to focus them on *reductions* to
4141
the language: possible features that can be combined or omitted. We aim to
4242
keep the size and complexity of the language under control.
4343

44-
> **Note:** This manual is very out of date. The best source of Rust
45-
> documentation is currently the tutorial.
46-
4744
> **Note:** The grammar for Rust given in this document is rough and
4845
> very incomplete; only a modest number of sections have accompanying grammar
4946
> rules. Formalizing the grammar accepted by the Rust parser is ongoing work,
@@ -1370,10 +1367,8 @@ mod bar {
13701367
fn add(x: int, y: int) { x + y }
13711368
~~~~~~~~
13721369

1373-
In future versions of Rust, user-provided extensions to the compiler will be
1374-
able to interpret attributes. When this facility is provided, the compiler
1375-
will distinguish will be made between language-reserved and user-available
1376-
attributes.
1370+
> **Note:** In future versions of Rust, user-provided extensions to the compiler will be able to interpret attributes.
1371+
> When this facility is provided, the compiler will distinguish between language-reserved and user-available attributes.
13771372
13781373
At present, only the Rust compiler interprets attributes, so all attribute
13791374
names are effectively reserved. Some significant attributes include:
@@ -2938,8 +2933,8 @@ An example of a *receive*:
29382933
let s = comm::recv(po);
29392934
~~~~~~~~
29402935

2941-
Note: this communication system will be replaced by a higher-performance system called "pipes",
2942-
in future versions of Rust.
2936+
> **Note:** this communication system will be replaced by a higher-performance system called "pipes",
2937+
> in future versions of Rust.
29432938
29442939

29452940
# Runtime services, linkage and debugging
@@ -2951,7 +2946,7 @@ run-time. It is smaller and simpler than many modern language runtimes. It is
29512946
tightly integrated into the language's execution model of memory, tasks,
29522947
communication and logging.
29532948

2954-
Note: The runtime library will merge with the `core` library in future versions of Rust.
2949+
> **Note:** The runtime library will merge with the `core` library in future versions of Rust.
29552950
29562951
### Memory allocation
29572952

0 commit comments

Comments
 (0)