Skip to content

Commit 1053b60

Browse files
committed
---
yaml --- r: 81783 b: refs/heads/master c: 06b11ba h: refs/heads/master i: 81781: 888b304 81779: f87dcff 81775: 0c9a404 v: v3
1 parent 65f2e62 commit 1053b60

File tree

5 files changed

+19
-17
lines changed

5 files changed

+19
-17
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 2e77c25e0dd8d6b4fc28c1ca4248a4f47d99d9b8
2+
refs/heads/master: 06b11ba1723e920d544e917bbe27e7eb7b03a610
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
55
refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729

trunk/RELEASES.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ Version 0.8 (October 2013)
3131
* `ref` bindings in irrefutable patterns work correctly now.
3232
* `char` is now prevented from containing invalid code points.
3333
* Casting to `bool` is no longer allowed.
34-
* `\0` is now accepted as an escape in chars and strings.
3534
* `yield` is a reserved keyword.
3635
* `typeof` is a reserved keyword.
3736
* Crates may be imported by URL with `extern mod foo = "url";`.
@@ -112,9 +111,6 @@ Version 0.8 (October 2013)
112111
the `MutableSet` and `MutableMap` traits. `Container::is_empty`,
113112
`Map::contains_key`, `MutableMap::insert`, and `MutableMap::remove` have
114113
default implementations.
115-
* std: Various `from_str` functions were removed in favor of a generic
116-
`from_str` which is available in the prelude.
117-
* std: `util::unreachable` removed in favor of the `unreachable!` macro.
118114
* extra: `dlist`, the doubly-linked list was modernized.
119115
* extra: Added a `hex` module with `ToHex` and `FromHex` traits.
120116
* extra: Added `glob` module, replacing `std::os::glob`.
@@ -129,9 +125,6 @@ Version 0.8 (October 2013)
129125
* extra: `semver` updated to SemVer 2.0.0.
130126
* extra: `term` handles more terminals correctly.
131127
* extra: `dbg` module removed.
132-
* extra: `par` module removed.
133-
* extra: `future` was cleaned up, with some method renames.
134-
* extra: Most free functions in `getopts` were converted to methods.
135128

136129
* Other
137130
* rustc's debug info generation (`-Z debug-info`) is greatly improved.
@@ -212,7 +205,6 @@ Version 0.7 (July 2013)
212205
* std: Many old internal vector and string iterators,
213206
incl. `any`, `all`. removed.
214207
* std: The `finalize` method of `Drop` renamed to `drop`.
215-
* std: The `drop` method now takes `&mut self` instead of `&self`.
216208
* std: The prelude no longer reexports any modules, only types and traits.
217209
* std: Prelude additions: `print`, `println`, `FromStr`, `ApproxEq`, `Equiv`,
218210
`Iterator`, `IteratorUtil`, many numeric traits, many tuple traits.

trunk/doc/tutorial-rustpkg.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package up your Rust code and share it with other people. This tutorial will
77
get you started on all of the concepts and commands you need to give the gift
88
of Rust code to someone else.
99

10-
## Installing External Packages
10+
# Installing External Packages
1111

1212
First, let's try to use an external package somehow. I've made a sample package
1313
called `hello` to demonstrate how to do so. Here's how `hello` is used:
@@ -68,7 +68,7 @@ Hello, world.
6868

6969
Simple! That's all it takes.
7070

71-
## Workspaces
71+
# Workspaces
7272

7373
Before we can talk about how to make packages of your own, you have to
7474
understand the big concept with `rustpkg`: workspaces. A 'workspace' is simply
@@ -88,14 +88,14 @@ There are also default file names you'll want to follow as well:
8888
* `main.rs`: A file that's going to become an executable.
8989
* `lib.rs`: A file that's going to become a library.
9090

91-
## Building your own Package
91+
# Building your own Package
9292

9393
Now that you've got workspaces down, let's build your own copy of `hello`. Go
9494
to wherever you keep your personal projects, and let's make all of the
9595
directories we'll need. I'll refer to this personal project directory as
9696
`~/src` for the rest of this tutorial.
9797

98-
### Creating our workspace
98+
## Creating our workspace
9999

100100
~~~ {.notrust}
101101
$ cd ~/src
@@ -150,15 +150,15 @@ pub fn world() {
150150

151151
Put this into `src/hello/lib.rs`. Let's talk about each of these attributes:
152152

153-
### Crate attributes for packages
153+
## Crate attributes for packages
154154

155155
`license` is equally simple: the license we want this code to have. I chose MIT
156156
here, but you should pick whatever license makes the most sense for you.
157157

158158
`desc` is a description of the package and what it does. This should just be a
159159
sentence or two.
160160

161-
### Building your package
161+
## Building your package
162162

163163
Building your package is simple:
164164

@@ -206,7 +206,7 @@ note: Installed package github.com/YOUR_USERNAME/hello-0.1 to /home/yourusername
206206

207207
That's it!
208208

209-
## More resources
209+
# More resources
210210

211211
There's a lot more going on with `rustpkg`, this is just to get you started.
212212
Check out [the rustpkg manual](rustpkg.html) for the full details on how to

trunk/doc/tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3023,7 +3023,7 @@ There is further documentation on the [wiki], however those tend to be even more
30233023
[tasks]: tutorial-tasks.html
30243024
[macros]: tutorial-macros.html
30253025
[ffi]: tutorial-ffi.html
3026-
[rustpkg]: rustpkg.html
3026+
[rustpkg]: tutorial-rustpkg.html
30273027

30283028
[wiki]: https://github.com/mozilla/rust/wiki/Docs
30293029

trunk/mk/docs.mk

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,16 @@ doc/tutorial-conditions.html: tutorial-conditions.md doc/version_info.html doc/r
160160
--include-before-body=doc/version_info.html \
161161
--output=$@
162162

163+
DOCS += doc/tutorial-rustpkg.html
164+
doc/tutorial-rustpkg.html: tutorial-rustpkg.md doc/version_info.html doc/rust.css
165+
@$(call E, pandoc: $@)
166+
$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
167+
$(CFG_PANDOC) --standalone --toc \
168+
--section-divs --number-sections \
169+
--from=markdown --to=html --css=rust.css \
170+
--include-before-body=doc/version_info.html \
171+
--output=$@
172+
163173
ifeq ($(CFG_PDFLATEX),)
164174
$(info cfg: no pdflatex found, omitting doc/rust.pdf)
165175
else

0 commit comments

Comments
 (0)