diff options
| author | bors <bors@rust-lang.org> | 2019-01-24 01:24:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-24 01:24:13 +0000 |
| commit | cd3d580d59e8af62fb8fc25b996900dd5ccd5ad9 (patch) | |
| tree | bdd151640dbbe35520823f2a649f56b24d8336e2 /src/libstd | |
| parent | 19f8958f827e379be9b0ffc93fca580ec8ffac77 (diff) | |
| parent | e90cdfd50768feb612dcea84ea25a725c72df39a (diff) | |
| download | rust-cd3d580d59e8af62fb8fc25b996900dd5ccd5ad9.tar.gz rust-cd3d580d59e8af62fb8fc25b996900dd5ccd5ad9.zip | |
Auto merge of #57869 - Centril:rollup, r=Centril
Rollup of 11 pull requests Successful merges: - #57179 (Update std/lib.rs docs to reflect Rust 2018 usage) - #57730 (Merge visitors in AST validation) - #57779 (Recover from parse errors in literal struct fields and incorrect float literals) - #57793 (Explain type mismatch cause pointing to return type when it is `impl Trait`) - #57795 (Use structured suggestion in stead of notes) - #57817 (Add error for trailing angle brackets.) - #57834 (Stabilize Any::get_type_id and rename to type_id) - #57836 (Fix some cross crate existential type ICEs) - #57840 (Fix issue 57762) - #57844 (use port 80 for retrieving GPG key) - #57858 (Ignore line ending on older git versions) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 83db3f347a7..82f3463dba0 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -7,11 +7,9 @@ //! primitives](#primitives), [standard macros](#macros), [I/O] and //! [multithreading], among [many other things][other]. //! -//! `std` is available to all Rust crates by default, just as if each one -//! contained an `extern crate std;` import at the [crate root]. Therefore the +//! `std` is available to all Rust crates by default. Therefore the //! standard library can be accessed in [`use`] statements through the path -//! `std`, as in [`use std::env`], or in expressions through the absolute path -//! `::std`, as in [`::std::env::args`]. +//! `std`, as in [`use std::env`]. //! //! # How to read this documentation //! @@ -157,7 +155,6 @@ //! [TCP]: net/struct.TcpStream.html //! [The Rust Prelude]: prelude/index.html //! [UDP]: net/struct.UdpSocket.html -//! [`::std::env::args`]: env/fn.args.html //! [`Arc`]: sync/struct.Arc.html //! [owned slice]: boxed/index.html //! [`Cell`]: cell/struct.Cell.html @@ -191,7 +188,6 @@ //! [`thread`]: thread/index.html //! [`use std::env`]: env/index.html //! [`use`]: ../book/ch07-02-modules-and-use-to-control-scope-and-privacy.html#the-use-keyword-to-bring-paths-into-a-scope -//! [crate root]: ../book/ch07-01-packages-and-crates-for-making-libraries-and-executables.html //! [crates.io]: https://crates.io //! [deref-coercions]: ../book/ch15-02-deref.html#implicit-deref-coercions-with-functions-and-methods //! [files]: fs/struct.File.html |