diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-31 11:41:18 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-31 15:56:33 -0700 |
| commit | 30532884f83c4346f736dee5df03e812bde94ddc (patch) | |
| tree | 26e7ae049d0edb282e07f98b3a5eb9367e42f022 /src/libstd/ffi | |
| parent | 554946c81eeb4fcfceda782f6c5af394ab3fe8d3 (diff) | |
| download | rust-30532884f83c4346f736dee5df03e812bde94ddc.tar.gz rust-30532884f83c4346f736dee5df03e812bde94ddc.zip | |
Test fixes and rebase conflicts, round 2
Diffstat (limited to 'src/libstd/ffi')
| -rw-r--r-- | src/libstd/ffi/c_str.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs index 3322b2c52bf..42ea50bff77 100644 --- a/src/libstd/ffi/c_str.rs +++ b/src/libstd/ffi/c_str.rs @@ -10,7 +10,7 @@ #![unstable(feature = "std_misc")] -use convert::Into; +use convert::{Into, From}; use cmp::{PartialEq, Eq, PartialOrd, Ord, Ordering}; use error::Error; use fmt; |