@@ -11,20 +11,20 @@ extern crate syntax;
1111extern crate rustc_plugin;
1212
1313use syntax:: ast;
14- use syntax:: ast:: { ItemKind , StmtKind , Stmt , TyKind } ;
14+ use syntax:: ast:: { Ident , ItemKind , StmtKind , Stmt , TyKind } ;
1515use syntax:: codemap;
16- use syntax:: parse:: token;
1716use syntax:: ext:: base:: { ExtCtxt , MultiModifier , Annotatable } ;
1817use syntax:: ext:: build:: AstBuilder ;
1918use syntax:: ptr:: P ;
19+ use syntax:: symbol:: Symbol ;
2020
2121use rustc_plugin:: Registry ;
2222
2323/// For the `#[quickcheck]` attribute. Do not use.
2424#[ plugin_registrar]
2525#[ doc( hidden) ]
2626pub fn plugin_registrar ( reg : & mut Registry ) {
27- reg. register_syntax_extension ( token :: intern ( "quickcheck" ) ,
27+ reg. register_syntax_extension ( Symbol :: intern ( "quickcheck" ) ,
2828 MultiModifier ( Box :: new ( expand_meta_quickcheck) ) ) ;
2929}
3030
@@ -83,7 +83,7 @@ fn wrap_item(cx: &mut ExtCtxt,
8383 // Copy original function without attributes
8484 let prop = P ( ast:: Item { attrs : Vec :: new ( ) , ..item. clone ( ) } ) ;
8585 // ::quickcheck::quickcheck
86- let check_ident = token :: str_to_ident ( "quickcheck" ) ;
86+ let check_ident = Ident :: from_str ( "quickcheck" ) ;
8787 let check_path = vec ! ( check_ident, check_ident) ;
8888 // Wrap original function in new outer function,
8989 // calling ::quickcheck::quickcheck()
@@ -104,7 +104,7 @@ fn wrap_item(cx: &mut ExtCtxt,
104104 let mut attrs = item. attrs . clone ( ) ;
105105 // Add #[test] attribute
106106 attrs. push ( cx. attribute (
107- span, cx. meta_word ( span, token :: intern_and_get_ident ( "test" ) ) ) ) ;
107+ span, cx. meta_word ( span, Symbol :: intern ( "test" ) ) ) ) ;
108108 // Attach the attributes to the outer function
109109 Annotatable :: Item ( P ( ast:: Item { attrs : attrs, ..( * test) . clone ( ) } ) )
110110}
0 commit comments