@@ -40,7 +40,7 @@ extern crate rustc_target;
4040extern crate syntax_pos;
4141
4242use rustc:: lint;
43- use rustc:: lint:: builtin:: { BARE_TRAIT_OBJECT , ABSOLUTE_PATH_STARTING_WITH_MODULE } ;
43+ use rustc:: lint:: builtin:: { BARE_TRAIT_OBJECTS , ABSOLUTE_PATHS_NOT_STARTING_WITH_CRATE } ;
4444use rustc:: session;
4545use rustc:: util;
4646
@@ -172,14 +172,14 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) {
172172 UNUSED_ATTRIBUTES ,
173173 UNUSED_MACROS ,
174174 UNUSED_ALLOCATION ,
175- UNUSED_DOC_COMMENT ,
175+ UNUSED_DOC_COMMENTS ,
176176 UNUSED_EXTERN_CRATES ,
177177 UNUSED_FEATURES ,
178178 UNUSED_PARENS ) ;
179179
180180 add_lint_group ! ( sess,
181181 "rust_2018_migration" ,
182- BARE_TRAIT_OBJECT ,
182+ BARE_TRAIT_OBJECTS ,
183183 UNREACHABLE_PUB ) ;
184184
185185 // Guidelines for creating a future incompatibility lint:
@@ -273,20 +273,25 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) {
273273 edition: Some ( Edition :: Edition2018 ) ,
274274 } ,
275275 FutureIncompatibleInfo {
276- id: LintId :: of( UNSTABLE_NAME_COLLISION ) ,
276+ id: LintId :: of( UNSTABLE_NAME_COLLISIONS ) ,
277277 reference: "issue #48919 <https://github.com/rust-lang/rust/issues/48919>" ,
278278 edition: None ,
279279 // Note: this item represents future incompatibility of all unstable functions in the
280280 // standard library, and thus should never be removed or changed to an error.
281281 } ,
282282 FutureIncompatibleInfo {
283- id: LintId :: of( ABSOLUTE_PATH_STARTING_WITH_MODULE ) ,
283+ id: LintId :: of( ABSOLUTE_PATHS_NOT_STARTING_WITH_CRATE ) ,
284284 reference: "issue TBD" ,
285285 edition: Some ( Edition :: Edition2018 ) ,
286286 } ,
287287 ] ) ;
288288
289289 // Register renamed and removed lints
290+ store. register_renamed ( "single_use_lifetime" , "single_use_lifetimes" ) ;
291+ store. register_renamed ( "elided_lifetime_in_path" , "elided_lifetimes_in_paths" ) ;
292+ store. register_renamed ( "bare_trait_object" , "bare_trait_objects" ) ;
293+ store. register_renamed ( "unstable_name_collision" , "unstable_name_collisions" ) ;
294+ store. register_renamed ( "unused_doc_comment" , "unused_doc_comments" ) ;
290295 store. register_renamed ( "unknown_features" , "unused_features" ) ;
291296 store. register_removed ( "unsigned_negation" , "replaced by negate_unsigned feature gate" ) ;
292297 store. register_removed ( "negate_unsigned" , "cast a signed value instead" ) ;
0 commit comments