diff options
| author | bors <bors@rust-lang.org> | 2014-05-07 03:21:47 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-05-07 03:21:47 -0700 |
| commit | 4a5d39001b1da84fe4be2996a2c7d894d5c248c6 (patch) | |
| tree | 8adeb549f225f21064989a0bd8dc22bb8ca67b8c /src/libstd | |
| parent | 897b96a2e28778a5819907a74fc800508eadeffc (diff) | |
| parent | d7891c7c0e964fc9f947e0aefc7494218d531af2 (diff) | |
| download | rust-4a5d39001b1da84fe4be2996a2c7d894d5c248c6.tar.gz rust-4a5d39001b1da84fe4be2996a2c7d894d5c248c6.zip | |
auto merge of #13914 : alexcrichton/rust/pile-o-rustdoc-fixes, r=brson
Lots of assorted things here and there, all the details are in the commits. Closes #11712
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/c_str.rs | 2 | ||||
| -rw-r--r-- | src/libstd/iter.rs | 2 | ||||
| -rw-r--r-- | src/libstd/local_data.rs | 2 | ||||
| -rw-r--r-- | src/libstd/slice.rs | 8 | ||||
| -rw-r--r-- | src/libstd/str.rs | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/libstd/c_str.rs b/src/libstd/c_str.rs index 310bc861cd3..7de74dbe507 100644 --- a/src/libstd/c_str.rs +++ b/src/libstd/c_str.rs @@ -61,7 +61,7 @@ fn main() { unsafe { puts(c_buffer); } }); } - ``` +``` */ diff --git a/src/libstd/iter.rs b/src/libstd/iter.rs index daeba2365e6..3e6f55e8251 100644 --- a/src/libstd/iter.rs +++ b/src/libstd/iter.rs @@ -52,7 +52,7 @@ loop { None => { break } } } - ``` +``` This `for` loop syntax can be applied to any iterator over any type. diff --git a/src/libstd/local_data.rs b/src/libstd/local_data.rs index e5c7ba4aa54..635b729314f 100644 --- a/src/libstd/local_data.rs +++ b/src/libstd/local_data.rs @@ -33,7 +33,7 @@ local_data::get(key_int, |opt| assert_eq!(opt.map(|x| *x), Some(3))); local_data::set(key_vector, ~[4]); local_data::get(key_vector, |opt| assert_eq!(*opt.unwrap(), ~[4])); - ``` +``` */ diff --git a/src/libstd/slice.rs b/src/libstd/slice.rs index d8c866ef44a..b8b39928ecf 100644 --- a/src/libstd/slice.rs +++ b/src/libstd/slice.rs @@ -19,7 +19,7 @@ homogeneous types: ```rust let int_vector = [1,2,3]; let str_vector = ["one", "two", "three"]; - ``` +``` This is a big module, but for a high-level overview: @@ -44,7 +44,7 @@ a vector or a vector slice from the index interval `[a, b)`: let numbers = [0, 1, 2]; let last_numbers = numbers.slice(1, 3); // last_numbers is now &[1, 2] - ``` +``` Traits defined for the `~[T]` type, like `OwnedVector`, can only be called on such vectors. These methods deal with adding elements or otherwise changing @@ -57,7 +57,7 @@ of the vector: let mut numbers = vec![0, 1, 2]; numbers.push(7); // numbers is now vec![0, 1, 2, 7]; - ``` +``` ## Implementations of other traits @@ -79,7 +79,7 @@ let numbers = [0, 1, 2]; for &x in numbers.iter() { println!("{} is a number!", x); } - ``` +``` * `.mut_iter()` returns an iterator that allows modifying each value. * `.move_iter()` converts an owned vector into an iterator that diff --git a/src/libstd/str.rs b/src/libstd/str.rs index 430f6326327..d7696dc53c0 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -37,7 +37,7 @@ fn main() { let borrowed_string1 = "This string is borrowed with the 'static lifetime"; let borrowed_string2: &str = owned_string; // owned strings can be borrowed } - ``` +``` From the example above, you can see that Rust has 2 different kinds of string literals. The owned literals correspond to the owned string types, but the |
