diff options
| -rw-r--r-- | src/doc/book/the-stack-and-the-heap.md | 42 | ||||
| -rw-r--r-- | src/doc/nomicon/lifetimes.md | 4 | ||||
| -rw-r--r-- | src/libcollections/slice.rs | 9 | ||||
| -rw-r--r-- | src/libcore/lib.rs | 6 | ||||
| -rw-r--r-- | src/libcore/num/mod.rs | 4 | ||||
| -rw-r--r-- | src/libcore/ops.rs | 2 | ||||
| -rw-r--r-- | src/librustc/diagnostics.rs | 2 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 2 | ||||
| -rw-r--r-- | src/libstd/prelude/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/primitive_docs.rs | 2 |
10 files changed, 31 insertions, 44 deletions
diff --git a/src/doc/book/the-stack-and-the-heap.md b/src/doc/book/the-stack-and-the-heap.md index 9cc3e12aa04..63b73a7fc31 100644 --- a/src/doc/book/the-stack-and-the-heap.md +++ b/src/doc/book/the-stack-and-the-heap.md @@ -130,63 +130,64 @@ on the stack is the first one you retrieve from it. Let’s try a three-deep example: ```rust -fn bar() { +fn italic() { let i = 6; } -fn foo() { +fn bold() { let a = 5; let b = 100; let c = 1; - bar(); + italic(); } fn main() { let x = 42; - foo(); + bold(); } ``` +We have some kooky function names to make the diagrams clearer. + Okay, first, we call `main()`: | Address | Name | Value | |---------|------|-------| | 0 | x | 42 | -Next up, `main()` calls `foo()`: +Next up, `main()` calls `bold()`: | Address | Name | Value | |---------|------|-------| -| 3 | c | 1 | -| 2 | b | 100 | -| 1 | a | 5 | +| **3** | **c**|**1** | +| **2** | **b**|**100**| +| **1** | **a**| **5** | | 0 | x | 42 | -And then `foo()` calls `bar()`: +And then `bold()` calls `italic()`: | Address | Name | Value | |---------|------|-------| -| 4 | i | 6 | -| 3 | c | 1 | -| 2 | b | 100 | -| 1 | a | 5 | +| *4* | *i* | *6* | +| **3** | **c**|**1** | +| **2** | **b**|**100**| +| **1** | **a**| **5** | | 0 | x | 42 | - Whew! Our stack is growing tall. -After `bar()` is over, its frame is deallocated, leaving just `foo()` and +After `italic()` is over, its frame is deallocated, leaving just `bold()` and `main()`: | Address | Name | Value | |---------|------|-------| -| 3 | c | 1 | -| 2 | b | 100 | -| 1 | a | 5 | -| 0 | x | 42 | +| **3** | **c**|**1** | +| **2** | **b**|**100**| +| **1** | **a**| **5** | +| 0 | x | 42 | -And then `foo()` ends, leaving just `main()`: +And then `bold()` ends, leaving just `main()`: | Address | Name | Value | |---------|------|-------| @@ -578,3 +579,4 @@ comes at the cost of either significant runtime support (e.g. in the form of a garbage collector) or significant programmer effort (in the form of explicit memory management calls that require verification not provided by the Rust compiler). + diff --git a/src/doc/nomicon/lifetimes.md b/src/doc/nomicon/lifetimes.md index e21207efdcf..45eb68baeb7 100644 --- a/src/doc/nomicon/lifetimes.md +++ b/src/doc/nomicon/lifetimes.md @@ -107,8 +107,8 @@ This signature of `as_str` takes a reference to a u32 with *some* lifetime, and promises that it can produce a reference to a str that can live *just as long*. Already we can see why this signature might be trouble. That basically implies that we're going to find a str somewhere in the scope the reference -to the u32 originated in, or somewhere *even earlier*. That's a bit of a big -ask. +to the u32 originated in, or somewhere *even earlier*. That's a bit of a tall +order. We then proceed to compute the string `s`, and return a reference to it. Since the contract of our function says the reference must outlive `'a`, that's the diff --git a/src/libcollections/slice.rs b/src/libcollections/slice.rs index 9aab6c93c82..bc5927f3d5e 100644 --- a/src/libcollections/slice.rs +++ b/src/libcollections/slice.rs @@ -909,15 +909,6 @@ pub trait SliceConcatExt<T: ?Sized> { #[stable(feature = "rename_connect_to_join", since = "1.3.0")] fn join(&self, sep: &T) -> Self::Output; - /// Flattens a slice of `T` into a single value `Self::Output`, placing a - /// given separator between each. - /// - /// # Examples - /// - /// ``` - /// # #![allow(deprecated)] - /// assert_eq!(["hello", "world"].connect(" "), "hello world"); - /// ``` #[stable(feature = "rust1", since = "1.0.0")] #[rustc_deprecated(since = "1.3.0", reason = "renamed to join")] fn connect(&self, sep: &T) -> Self::Output; diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index 454e2b02b1c..cde86230d75 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -23,12 +23,6 @@ //! nor does it provide concurrency or I/O. These things require //! platform integration, and this library is platform-agnostic. //! -//! *It is not recommended to use the core library*. The stable -//! functionality of libcore is reexported from the -//! [standard library](../std/index.html). The composition of this library is -//! subject to change over time; only the interface exposed through libstd is -//! intended to be stable. -//! //! # How to use the core library //! // FIXME: Fill me in with more detail when the interface settles diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs index 4f3c1256709..8abb12706a5 100644 --- a/src/libcore/num/mod.rs +++ b/src/libcore/num/mod.rs @@ -644,7 +644,7 @@ macro_rules! int_impl { self.overflowing_shl(rhs).0 } - /// Panic-free bitwise shift-left; yields `self >> mask(rhs)`, + /// Panic-free bitwise shift-right; yields `self >> mask(rhs)`, /// where `mask` removes any high-order bits of `rhs` that /// would cause the shift to exceed the bitwidth of the type. /// @@ -1446,7 +1446,7 @@ macro_rules! uint_impl { self.overflowing_shl(rhs).0 } - /// Panic-free bitwise shift-left; yields `self >> mask(rhs)`, + /// Panic-free bitwise shift-right; yields `self >> mask(rhs)`, /// where `mask` removes any high-order bits of `rhs` that /// would cause the shift to exceed the bitwidth of the type. /// diff --git a/src/libcore/ops.rs b/src/libcore/ops.rs index 0abbd70762d..dd4702376d4 100644 --- a/src/libcore/ops.rs +++ b/src/libcore/ops.rs @@ -1616,7 +1616,7 @@ impl<Idx: fmt::Debug> fmt::Debug for RangeTo<Idx> { } /// The `Deref` trait is used to specify the functionality of dereferencing -/// operations like `*v`. +/// operations, like `*v`. /// /// `Deref` also enables ['`Deref` coercions'][coercions]. /// diff --git a/src/librustc/diagnostics.rs b/src/librustc/diagnostics.rs index cde8e7a6d1e..6a5910074d9 100644 --- a/src/librustc/diagnostics.rs +++ b/src/librustc/diagnostics.rs @@ -1337,7 +1337,7 @@ explanatory comments for the same example: // `for`-loops use a protocol based on the `Iterator` // trait. Each item yielded in a `for` loop has the - // type `Iterator::Item` -- that is,I `Item` is the + // type `Iterator::Item` -- that is, `Item` is the // associated type of the concrete iterator impl. for v in &vs { // ~ ~~~ diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 054f281c070..0f8b2f6e17b 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -25,7 +25,7 @@ //! //! # How to read this documentation //! -//! If you already know the name of what you are looking for the fastest way to +//! If you already know the name of what you are looking for, the fastest way to //! find it is to use the <a href="#" onclick="focusSearchBar();">search //! bar</a> at the top of the page. //! diff --git a/src/libstd/prelude/mod.rs b/src/libstd/prelude/mod.rs index bda4cdfb437..04568ad85bf 100644 --- a/src/libstd/prelude/mod.rs +++ b/src/libstd/prelude/mod.rs @@ -43,7 +43,7 @@ //! //! [`std::io::prelude`]: ../io/prelude/index.html //! -//! The differece between 'the prelude' and these other preludes is that they +//! The difference between 'the prelude' and these other preludes is that they //! are not automatically `use`'d, and must be imported manually. This is still //! easier than importing all of their consitutent components. //! diff --git a/src/libstd/primitive_docs.rs b/src/libstd/primitive_docs.rs index afeb4231aba..ed59c51b0f0 100644 --- a/src/libstd/primitive_docs.rs +++ b/src/libstd/primitive_docs.rs @@ -333,7 +333,7 @@ mod prim_slice { } /// let ptr = story.as_ptr(); /// let len = story.len(); /// -/// // story has thirteen bytes +/// // story has nineteen bytes /// assert_eq!(19, len); /// /// // We can re-build a str out of ptr and len. This is all unsafe becuase |