Skip to content

Commit 6c71b9f

Browse files
committed
---
yaml --- r: 114429 b: refs/heads/master c: 2571d42 h: refs/heads/master i: 114427: 0cca349 v: v3
1 parent 5871671 commit 6c71b9f

Some content is hidden

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

92 files changed

+690
-457
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: 53db981148eb359f63ecfe4cf9815b5ed0da8f3f
2+
refs/heads/master: 2571d42241f5abeca64516c4bde00c32caf3e8e1
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ec0258a381b88b5574e3f8ce72ae553ac3a574b7
55
refs/heads/try: 7c6c492fb2af9a85f21ff952942df3523b22fd17

trunk/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
If you're just reporting a bug, please see:
44

5-
http://doc.rust-lang.org/complement-bugreport.html
5+
http://static.rust-lang.org/doc/master/complement-bugreport.html
66

77
## Pull request procedure
88

trunk/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ documentation.
1313
> [getting started][wiki-start] notes on the wiki.
1414
1515
[installer]: http://www.rust-lang.org/install.html
16-
[tutorial]: http://doc.rust-lang.org/tutorial.html
16+
[tutorial]: http://static.rust-lang.org/doc/tutorial.html
1717
[wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
1818
[win-wiki]: https://github.com/mozilla/rust/wiki/Using-Rust-on-Windows
1919

@@ -60,7 +60,7 @@ documentation.
6060

6161
[repo]: https://github.com/mozilla/rust
6262
[tarball]: http://static.rust-lang.org/dist/rust-nightly.tar.gz
63-
[tutorial]: http://doc.rust-lang.org/tutorial.html
63+
[tutorial]: http://static.rust-lang.org/doc/master/tutorial.html
6464

6565
## Notes
6666

trunk/mk/docs.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ doc/footer.tex: $(D)/footer.inc | doc/
156156
# HTML (rustdoc)
157157
DOC_TARGETS += doc/not_found.html
158158
doc/not_found.html: $(D)/not_found.md $(HTML_DEPS) | doc/
159-
$(RUSTDOC) $(RUSTDOC_HTML_OPTS_NO_CSS) --markdown-css http://doc.rust-lang.org/rust.css $<
159+
$(RUSTDOC) $(RUSTDOC_HTML_OPTS_NO_CSS) --markdown-css http://static.rust-lang.org/doc/master/rust.css $<
160160

161161
define DEF_DOC
162162

trunk/src/doc/complement-cheatsheet.md

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
**Int to string**
66

7-
Use [`ToStr`](../std/to_str/trait.ToStr.html).
7+
Use [`ToStr`](http://static.rust-lang.org/doc/master/std/to_str/trait.ToStr.html).
88

99
~~~
1010
let x: int = 42;
@@ -13,8 +13,7 @@ let y: StrBuf = x.to_str().to_strbuf();
1313

1414
**String to int**
1515

16-
Use [`FromStr`](../std/from_str/trait.FromStr.html), and its helper function,
17-
[`from_str`](../std/from_str/fn.from_str.html).
16+
Use [`FromStr`](http://static.rust-lang.org/doc/master/std/from_str/trait.FromStr.html), and its helper function, [`from_str`](http://static.rust-lang.org/doc/master/std/from_str/fn.from_str.html).
1817

1918
~~~
2019
let x: Option<int> = from_str("42");
@@ -35,8 +34,7 @@ let y: StrBuf = format_strbuf!("{:X}", x); // uppercase hexadecimal
3534

3635
**String to int, in non-base-10**
3736

38-
Use [`FromStrRadix`](../std/num/trait.FromStrRadix.html), and its helper
39-
function, [`from_str_radix`](../std/num/fn.from_str_radix.html).
37+
Use [`FromStrRadix`](http://static.rust-lang.org/doc/master/std/num/trait.FromStrRadix.html), and its helper function, [`from_str_radix`](http://static.rust-lang.org/doc/master/std/num/fn.from_str_radix.html).
4038

4139
~~~
4240
use std::num;
@@ -47,8 +45,7 @@ let y: i64 = x.unwrap();
4745

4846
**Vector of Bytes to String**
4947

50-
To return a Borrowed String Slice (&str) use the str helper function
51-
[`from_utf8`](../std/str/fn.from_utf8.html).
48+
To return a Borrowed String Slice (&str) use the str helper function [`from_utf8`](http://static.rust-lang.org/doc/master/std/str/fn.from_utf8.html).
5249

5350
~~~
5451
use std::str;
@@ -58,8 +55,7 @@ let x: Option<&str> = str::from_utf8(bytes);
5855
let y: &str = x.unwrap();
5956
~~~
6057

61-
To return an Owned String (StrBuf) use the str helper function
62-
[`from_utf8_owned`](../std/str/fn.from_utf8_owned.html).
58+
To return an Owned String (StrBuf) use the str helper function [`from_utf8_owned`](http://static.rust-lang.org/doc/master/std/str/fn.from_utf8_owned.html).
6359

6460
~~~
6561
use std::str;
@@ -69,10 +65,7 @@ let x: Option<StrBuf> =
6965
let y: StrBuf = x.unwrap();
7066
~~~
7167

72-
To return a [`MaybeOwned`](../std/str/enum.MaybeOwned.html) use the str helper
73-
function [`from_utf8_lossy`](../std/str/fn.from_utf8_owned.html).
74-
This function also replaces non-valid utf-8 sequences with U+FFFD replacement
75-
character.
68+
To return a [`MaybeOwned`](http://static.rust-lang.org/doc/master/std/str/enum.MaybeOwned.html) use the str helper function [`from_utf8_lossy`](http://static.rust-lang.org/doc/master/std/str/fn.from_utf8_owned.html). This function also replaces non-valid utf-8 sequences with U+FFFD replacement character.
7669

7770
~~~
7871
use std::str;
@@ -85,13 +78,7 @@ let y = str::from_utf8_lossy(x);
8578

8679
## How do I read from a file?
8780

88-
Use
89-
[`File::open`](../std/io/fs/struct.File.html#method.open)
90-
to create a
91-
[`File`](../std/io/fs/struct.File.html)
92-
struct, which implements the
93-
[`Reader`](../std/io/trait.Reader.html)
94-
trait.
81+
Use [`File::open`](http://static.rust-lang.org/doc/master/std/io/fs/struct.File.html#method.open) to create a [`File`](http://static.rust-lang.org/doc/master/std/io/fs/struct.File.html) struct, which implements the [`Reader`](http://static.rust-lang.org/doc/master/std/io/trait.Reader.html) trait.
9582

9683
~~~ {.ignore}
9784
use std::path::Path;
@@ -104,7 +91,7 @@ let reader : File = File::open(&path).unwrap_or_else(on_error);
10491

10592
## How do I iterate over the lines in a file?
10693

107-
Use the [`lines`](../std/io/trait.Buffer.html#method.lines) method on a [`BufferedReader`](../std/io/buffered/struct.BufferedReader.html).
94+
Use the [`lines`](http://static.rust-lang.org/doc/master/std/io/trait.Buffer.html#method.lines) method on a [`BufferedReader`](http://static.rust-lang.org/doc/master/std/io/buffered/struct.BufferedReader.html).
10895

10996
~~~
11097
use std::io::BufferedReader;
@@ -122,7 +109,7 @@ for line in reader.lines() {
122109

123110
## How do I search for a substring?
124111

125-
Use the [`find_str`](../std/str/trait.StrSlice.html#tymethod.find_str) method.
112+
Use the [`find_str`](http://static.rust-lang.org/doc/master/std/str/trait.StrSlice.html#tymethod.find_str) method.
126113

127114
~~~
128115
let str = "Hello, this is some random string";
@@ -133,7 +120,7 @@ let index: Option<uint> = str.find_str("rand");
133120

134121
## How do I get the length of a vector?
135122

136-
The [`Container`](../std/container/trait.Container.html) trait provides the `len` method.
123+
The [`Container`](http://static.rust-lang.org/doc/master/std/container/trait.Container.html) trait provides the `len` method.
137124

138125
~~~
139126
let u: ~[u32] = ~[0, 1, 2];
@@ -145,7 +132,7 @@ println!("u: {}, v: {}, w: {}", u.len(), v.len(), w.len()); // 3, 4, 5
145132

146133
## How do I iterate over a vector?
147134

148-
Use the [`iter`](../std/vec/trait.ImmutableVector.html#tymethod.iter) method.
135+
Use the [`iter`](http://static.rust-lang.org/doc/master/std/vec/trait.ImmutableVector.html#tymethod.iter) method.
149136

150137
~~~
151138
let values: ~[int] = ~[1, 2, 3, 4, 5];
@@ -154,10 +141,7 @@ for value in values.iter() { // value: &int
154141
}
155142
~~~
156143

157-
(See also [`mut_iter`](../std/vec/trait.MutableVector.html#tymethod.mut_iter)
158-
which yields `&mut int` and
159-
[`move_iter`](../std/vec/trait.OwnedVector.html#tymethod.move_iter) which yields
160-
`int` while consuming the `values` vector.)
144+
(See also [`mut_iter`](http://static.rust-lang.org/doc/master/std/vec/trait.MutableVector.html#tymethod.mut_iter) which yields `&mut int` and [`move_iter`](http://static.rust-lang.org/doc/master/std/vec/trait.OwnedVector.html#tymethod.move_iter) which yields `int` while consuming the `values` vector.)
161145

162146
# Type system
163147

0 commit comments

Comments
 (0)