diff options
| author | bors <bors@rust-lang.org> | 2018-07-01 20:48:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-07-01 20:48:57 +0000 |
| commit | a7a60dc7f8e9a53feb70ee7aa05485345a045afb (patch) | |
| tree | 4544c96d74d2f5aa88c3397bf768360f7667c234 /src/libstd/alloc.rs | |
| parent | a2be769fd50403a07c45677f8f285491c8e90d74 (diff) | |
| parent | 3e95491be7600bfad69f3830cdf35663ee49f2fd (diff) | |
| download | rust-a7a60dc7f8e9a53feb70ee7aa05485345a045afb.tar.gz rust-a7a60dc7f8e9a53feb70ee7aa05485345a045afb.zip | |
Auto merge of #51969 - pietroalbini:rollup, r=pietroalbini
Rollup of 7 pull requests Successful merges: - #51511 (Stabilize Iterator::flatten in 1.29, fixes #48213.) - #51853 (Fix some doc links) - #51890 (Fix inconsequential typo in GlobalAlloc doc example) - #51920 (use literal span for concrete type suggestion) - #51921 (improve the error message when `#[panic_implementation]` is missing) - #51922 (rename the llvm-tools component to llvm-tools-preview and tweak its image) - #51961 (Fix typo in /src/librustc_resolve/lib.rs) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/alloc.rs')
| -rw-r--r-- | src/libstd/alloc.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/alloc.rs b/src/libstd/alloc.rs index f28e91e19b7..f6cecbea11f 100644 --- a/src/libstd/alloc.rs +++ b/src/libstd/alloc.rs @@ -61,7 +61,7 @@ //! ```rust,ignore (demonstrates crates.io usage) //! extern crate jemallocator; //! -//! use jemallacator::Jemalloc; +//! use jemallocator::Jemalloc; //! //! #[global_allocator] //! static GLOBAL: Jemalloc = Jemalloc; |