Skip to content

Commit 308c07b

Browse files
authored
Rollup merge of rust-lang#58318 - taiki-e:libserialize-2018, r=Centril
libserialize => 2018 Transitions `libserialize` to Rust 2018; cc rust-lang#58099 This includes a commit from rust-lang#58252 (thanks @h-michael!) r? @Centril
2 parents d943453 + 06b6304 commit 308c07b

File tree

9 files changed

+1607
-1609
lines changed

9 files changed

+1607
-1609
lines changed

src/libserialize/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
authors = ["The Rust Project Developers"]
33
name = "serialize"
44
version = "0.0.0"
5+
edition = "2018"
56

67
[lib]
78
name = "serialize"

src/libserialize/collection_impls.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use std::hash::{Hash, BuildHasher};
44

5-
use {Decodable, Encodable, Decoder, Encoder};
5+
use crate::{Decodable, Encodable, Decoder, Encoder};
66
use std::collections::{LinkedList, VecDeque, BTreeMap, BTreeSet, HashMap, HashSet};
77
use std::rc::Rc;
88
use std::sync::Arc;

src/libserialize/hex.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ pub enum FromHexError {
6060
}
6161

6262
impl fmt::Display for FromHexError {
63-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
63+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
6464
match *self {
6565
InvalidHexCharacter(ch, idx) =>
6666
write!(f, "Invalid character '{}' at position {}", ch, idx),
@@ -145,8 +145,8 @@ impl FromHex for str {
145145
#[cfg(test)]
146146
mod tests {
147147
extern crate test;
148-
use self::test::Bencher;
149-
use hex::{FromHex, ToHex};
148+
use test::Bencher;
149+
use crate::hex::{FromHex, ToHex};
150150

151151
#[test]
152152
pub fn test_to_hex() {

0 commit comments

Comments
 (0)