Skip to content

Commit a0960a1

Browse files
committed
auto merge of #14348 : alexcrichton/rust/doc.rust-lang.org, r=huonw
2 parents 87ad19e + 711f531 commit a0960a1

File tree

43 files changed

+221
-114
lines changed

Some content is hidden

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

43 files changed

+221
-114
lines changed

CONTRIBUTING.md

+1-1
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://static.rust-lang.org/doc/master/complement-bugreport.html
5+
http://doc.rust-lang.org/complement-bugreport.html
66

77
## Pull request procedure
88

README.md

+2-2
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://static.rust-lang.org/doc/tutorial.html
16+
[tutorial]: http://doc.rust-lang.org/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://static.rust-lang.org/doc/master/tutorial.html
63+
[tutorial]: http://doc.rust-lang.org/tutorial.html
6464

6565
## Notes
6666

mk/docs.mk

+1-1
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://static.rust-lang.org/doc/master/rust.css $<
159+
$(RUSTDOC) $(RUSTDOC_HTML_OPTS_NO_CSS) --markdown-css http://doc.rust-lang.org/rust.css $<
160160

161161
define DEF_DOC
162162

src/doc/complement-cheatsheet.md

+28-12
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
**Int to string**
66

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

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

1414
**String to int**
1515

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).
16+
Use [`FromStr`](../std/from_str/trait.FromStr.html), and its helper function,
17+
[`from_str`](../std/from_str/fn.from_str.html).
1718

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

3536
**String to int, in non-base-10**
3637

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).
38+
Use [`FromStrRadix`](../std/num/trait.FromStrRadix.html), and its helper
39+
function, [`from_str_radix`](../std/num/fn.from_str_radix.html).
3840

3941
~~~
4042
use std::num;
@@ -45,7 +47,8 @@ let y: i64 = x.unwrap();
4547

4648
**Vector of Bytes to String**
4749

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).
50+
To return a Borrowed String Slice (&str) use the str helper function
51+
[`from_utf8`](../std/str/fn.from_utf8.html).
4952

5053
~~~
5154
use std::str;
@@ -55,7 +58,8 @@ let x: Option<&str> = str::from_utf8(bytes);
5558
let y: &str = x.unwrap();
5659
~~~
5760

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).
61+
To return an Owned String (StrBuf) use the str helper function
62+
[`from_utf8_owned`](../std/str/fn.from_utf8_owned.html).
5963

6064
~~~
6165
use std::str;
@@ -65,7 +69,10 @@ let x: Option<StrBuf> =
6569
let y: StrBuf = x.unwrap();
6670
~~~
6771

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.
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.
6976

7077
~~~
7178
use std::str;
@@ -78,7 +85,13 @@ let y = str::from_utf8_lossy(x);
7885

7986
## How do I read from a file?
8087

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.
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.
8295

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

92105
## How do I iterate over the lines in a file?
93106

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).
107+
Use the [`lines`](../std/io/trait.Buffer.html#method.lines) method on a [`BufferedReader`](../std/io/buffered/struct.BufferedReader.html).
95108

96109
~~~
97110
use std::io::BufferedReader;
@@ -109,7 +122,7 @@ for line in reader.lines() {
109122

110123
## How do I search for a substring?
111124

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

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

121134
## How do I get the length of a vector?
122135

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

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

133146
## How do I iterate over a vector?
134147

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

137150
~~~
138151
let values: ~[int] = ~[1, 2, 3, 4, 5];
@@ -141,7 +154,10 @@ for value in values.iter() { // value: &int
141154
}
142155
~~~
143156

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.)
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.)
145161

146162
# Type system
147163

0 commit comments

Comments
 (0)