Skip to content

Commit 23e9239

Browse files
author
bors-servo
authored
Auto merge of #232 - servo:spring, r=nox
Spring cleaning Yes, October is in autumn. This is overdue since the spring of a couple years ago.
2 parents e31cec3 + 8bedc3e commit 23e9239

File tree

13 files changed

+366
-513
lines changed

13 files changed

+366
-513
lines changed

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ description = "A string interning library for Rust, developed as part of the Ser
66
license = "MIT / Apache-2.0"
77
repository = "https://github.com/servo/string-cache"
88
documentation = "https://docs.rs/string_cache/"
9+
edition = "2018"
910

1011
# Do not `exclude` ./string-cache-codegen because we want to include
1112
# ./string-cache-codegen/shared.rs, and `include` is a pain to use

examples/simple.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
extern crate string_cache;
1+
22

33
use string_cache::DefaultAtom;
44

integration-tests/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ version = "0.0.1"
44
authors = [ "The Servo Project Developers" ]
55
build = "build.rs"
66
publish = false
7+
edition = "2018"
78

89
[lib]
910
doctest = false

integration-tests/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
extern crate string_cache_codegen;
1+
use string_cache_codegen;
22

33
use std::env;
44
use std::path::Path;

integration-tests/src/lib.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,11 @@
1212
#![allow(non_upper_case_globals)]
1313
#![cfg_attr(feature = "unstable", feature(test))]
1414

15-
extern crate string_cache;
16-
17-
#[cfg(feature = "unstable")]
18-
extern crate rand;
1915
#[cfg(feature = "unstable")]
2016
extern crate test;
2117

2218
use std::thread;
23-
use string_cache::atom::StaticAtomSet;
19+
use string_cache::StaticAtomSet;
2420

2521
include!(concat!(env!("OUT_DIR"), "/test_atom.rs"));
2622
pub type Atom = TestAtom;

0 commit comments

Comments
 (0)