diff options
| author | Carol (Nichols || Goulding) <carol.nichols@gmail.com> | 2018-01-12 16:41:25 -0500 |
|---|---|---|
| committer | Carol (Nichols || Goulding) <carol.nichols@gmail.com> | 2018-01-15 13:36:53 -0500 |
| commit | e168aa385b9afb6c84071a09910724bdde3dfc5f (patch) | |
| tree | 550d6318fb18091ea7959bd550bdf1f646b1137f /src/libstd/prelude | |
| parent | 90fcd4476c6346fad0aa4a952da0ebec39ff9d4e (diff) | |
| download | rust-e168aa385b9afb6c84071a09910724bdde3dfc5f.tar.gz rust-e168aa385b9afb6c84071a09910724bdde3dfc5f.zip | |
Reexport -> re-export in prose and documentation comments
Diffstat (limited to 'src/libstd/prelude')
| -rw-r--r-- | src/libstd/prelude/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/prelude/v1.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/prelude/mod.rs b/src/libstd/prelude/mod.rs index 538753d8692..919e033f2b4 100644 --- a/src/libstd/prelude/mod.rs +++ b/src/libstd/prelude/mod.rs @@ -52,7 +52,7 @@ //! # Prelude contents //! //! The current version of the prelude (version 1) lives in -//! [`std::prelude::v1`], and reexports the following. +//! [`std::prelude::v1`], and re-exports the following. //! //! * [`std::marker`]::{[`Copy`], [`Send`], [`Sized`], [`Sync`]}. The marker //! traits indicate fundamental properties of types. diff --git a/src/libstd/prelude/v1.rs b/src/libstd/prelude/v1.rs index 9ca5b445c86..feedd4e1abe 100644 --- a/src/libstd/prelude/v1.rs +++ b/src/libstd/prelude/v1.rs @@ -14,17 +14,17 @@ #![stable(feature = "rust1", since = "1.0.0")] -// Reexported core operators +// Re-exported core operators #[stable(feature = "rust1", since = "1.0.0")] #[doc(no_inline)] pub use marker::{Copy, Send, Sized, Sync}; #[stable(feature = "rust1", since = "1.0.0")] #[doc(no_inline)] pub use ops::{Drop, Fn, FnMut, FnOnce}; -// Reexported functions +// Re-exported functions #[stable(feature = "rust1", since = "1.0.0")] #[doc(no_inline)] pub use mem::drop; -// Reexported types and traits +// Re-exported types and traits #[stable(feature = "rust1", since = "1.0.0")] #[doc(no_inline)] pub use boxed::Box; #[stable(feature = "rust1", since = "1.0.0")] |