Skip to content

Commit c88ae6e

Browse files
committed
---
yaml --- r: 38265 b: refs/heads/try c: eeec4a7 h: refs/heads/master i: 38263: 5aeb168 v: v3
1 parent 0052222 commit c88ae6e

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
5-
refs/heads/try: 84a37a38593f3ee51adf2b1d064819ee399941cc
5+
refs/heads/try: eeec4a76678c88e8c6c3e2bba081eeebcfd3a47d
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/doc/rust.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3258,12 +3258,12 @@ crate name the crate is given a default name that matches the source file,
32583258
with the extension removed. In that case, to turn on logging for a program
32593259
compiled from, e.g. `helloworld.rs`, `RUST_LOG` should be set to `helloworld`.
32603260

3261-
As a convenience, the logging spec can also be set to a special psuedo-crate,
3261+
As a convenience, the logging spec can also be set to a special pseudo-crate,
32623262
`::help`. In this case, when the application starts, the runtime will
32633263
simply output a list of loaded modules containing log expressions, then exit.
32643264

32653265
The Rust runtime itself generates logging information. The runtime's logs are
3266-
generated for a number of artificial modules in the `::rt` psuedo-crate,
3266+
generated for a number of artificial modules in the `::rt` pseudo-crate,
32673267
and can be enabled just like the logs for any standard module. The full list
32683268
of runtime logging modules follows.
32693269

@@ -3341,7 +3341,7 @@ have come and gone during the course of Rust's development:
33413341

33423342
* The Newsqueak (1988), Alef (1995), and Limbo (1996) family. These
33433343
languages were developed by Rob Pike, Phil Winterbottom, Sean Dorward and
3344-
others in their group at Bell labs Computing Sciences Research Center
3344+
others in their group at Bell Labs Computing Sciences Research Center
33453345
(Murray Hill, NJ, USA).
33463346

33473347
* The Napier (1985) and Napier88 (1988) family. These languages were

branches/try/doc/tutorial.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ type system and memory model, generics, and modules. [Additional
3636
tutorials](#what-next) cover specific language features in greater
3737
depth.
3838

39-
This tutorial assumes that the reader is already familiar with one or more
39+
This tutorial assumes that the reader is already familiar with one or
4040
more languages in the C family. Understanding of pointers and general
4141
memory management techniques will help.
4242

@@ -1284,7 +1284,7 @@ distinct type. They support most of the same allocation options as
12841284
vectors, though the string literal without a storage sigil (for
12851285
example, `"foo"`) is treated differently than a comparable vector
12861286
(`[foo]`). Whereas plain vectors are stack-allocated fixed-length
1287-
vectors, plain strings are region pointers to read-only
1287+
vectors, plain strings are borrowed pointers to read-only (static)
12881288
memory. All strings are immutable.
12891289

12901290
~~~
@@ -1947,7 +1947,7 @@ trait Printable {
19471947
Traits may be implemented for specific types with [impls]. An impl
19481948
that implements a trait includes the name of the trait at the start of
19491949
the definition, as in the following impls of `Printable` for `int`
1950-
and `~str`.
1950+
and `&str`.
19511951

19521952
[impls]: #functions-and-methods
19531953

0 commit comments

Comments
 (0)