diff options
| author | bors <bors@rust-lang.org> | 2020-04-22 03:50:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-22 03:50:02 +0000 |
| commit | 2dc5b602eee35d70e8e6e506a7ea07b6c7e0197d (patch) | |
| tree | 43279f0eee2bf88591559449b56f87b217873337 /src/libcore/str/pattern.rs | |
| parent | 70f4f320b02cfd511c78389a6db1628285277410 (diff) | |
| parent | 66eaead0e2088e5bad6e5c24287a5f061aab4844 (diff) | |
| download | rust-2dc5b602eee35d70e8e6e506a7ea07b6c7e0197d.tar.gz rust-2dc5b602eee35d70e8e6e506a7ea07b6c7e0197d.zip | |
Auto merge of #71410 - JohnTitor:rollup-vh6dut5, r=JohnTitor
Rollup of 7 pull requests Successful merges: - #70998 (Suggest `-> impl Trait` and `-> Box<dyn Trait>` on fn that doesn't return) - #71236 (Remove unused rustc_serialize::hex module) - #71366 (Use assoc int consts3) - #71372 (Fix #! (shebang) stripping account space issue) - #71384 (Fix stage0.txt version number comment) - #71390 (Fix incorrect description of E0690) - #71399 (Clean up E0554 explanation) Failed merges: r? @ghost
Diffstat (limited to 'src/libcore/str/pattern.rs')
| -rw-r--r-- | src/libcore/str/pattern.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libcore/str/pattern.rs b/src/libcore/str/pattern.rs index 2377536c156..1a2b612b2f9 100644 --- a/src/libcore/str/pattern.rs +++ b/src/libcore/str/pattern.rs @@ -46,7 +46,6 @@ use crate::cmp; use crate::fmt; use crate::slice::memchr; -use crate::usize; // Pattern |