File tree Expand file tree Collapse file tree 2 files changed +5
-4
lines changed Expand file tree Collapse file tree 2 files changed +5
-4
lines changed Original file line number Diff line number Diff line change 9
9
10
10
extern crate string_cache;
11
11
12
- use string_cache:: Atom ;
12
+ use string_cache:: DefaultAtom ;
13
13
use string_cache:: event;
14
14
15
15
use std:: io;
@@ -21,7 +21,7 @@ fn main() {
21
21
io:: stdin ( ) . read_to_string ( & mut stdin) . unwrap ( ) ;
22
22
let mut atoms = vec ! [ ] ;
23
23
for word in stdin. split ( |c : char | c. is_whitespace ( ) ) {
24
- atoms. push ( Atom :: from ( word) ) ;
24
+ atoms. push ( DefaultAtom :: from ( word) ) ;
25
25
}
26
26
27
27
let log = event:: LOG . lock ( ) . unwrap ( ) ;
Original file line number Diff line number Diff line change @@ -16,10 +16,11 @@ extern crate phf_shared;
16
16
#[ allow( dead_code) ]
17
17
mod shared;
18
18
19
- use string_cache:: Atom ;
19
+ use string_cache:: DefaultAtom ;
20
20
21
21
use std:: { env, cmp} ;
22
22
use std:: collections:: hash_map:: { HashMap , Entry } ;
23
+ use std:: marker:: PhantomData ;
23
24
use std:: path:: Path ;
24
25
25
26
#[ derive( RustcDecodable , Debug ) ]
@@ -88,7 +89,7 @@ fn main() {
88
89
89
90
// FIXME: We really shouldn't be allowed to do this. It's a memory-safety
90
91
// hazard; the field is only public for the atom!() macro.
91
- _ => Atom { unsafe_data : ev. id } . to_string ( ) ,
92
+ _ => DefaultAtom { unsafe_data : ev. id , phantom : PhantomData } . to_string ( ) ,
92
93
} ;
93
94
94
95
match summary. entry ( string) {
You can’t perform that action at this time.
0 commit comments