diff options
| author | bors <bors@rust-lang.org> | 2020-04-07 13:43:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-07 13:43:30 +0000 |
| commit | 42abbd8878d3b67238f3611b0587c704ba94f39c (patch) | |
| tree | f993f7af10bd88484c767278196a488c6ee5bebf /src/libserialize/json.rs | |
| parent | 39b62533c7f9d0581a6ea9b9fc2cc51f21c3b5b0 (diff) | |
| parent | 89d661f15d8249f8e808b75b1129ce28e0889ba0 (diff) | |
| download | rust-42abbd8878d3b67238f3611b0587c704ba94f39c.tar.gz rust-42abbd8878d3b67238f3611b0587c704ba94f39c.zip | |
Auto merge of #70884 - Dylan-DPC:rollup-r3raqdf, r=jonas-schievink
Rollup of 5 pull requests Successful merges: - #70201 (Small tweaks in ToOwned::clone_into) - #70762 (Miri leak check: memory reachable through globals is not leaked) - #70846 (Keep codegen units unmerged when building compiler builtins) - #70854 (Use assoc int submodules) - #70857 (Don't import integer and float modules, use assoc consts 2) Failed merges: r? @ghost
Diffstat (limited to 'src/libserialize/json.rs')
| -rw-r--r-- | src/libserialize/json.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index 1f9d43cb930..cacc28b6e60 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -198,7 +198,7 @@ use std::num::FpCategory as Fp; use std::ops::Index; use std::str::FromStr; use std::string; -use std::{char, f64, fmt, str}; +use std::{char, fmt, str}; use crate::Encodable; |