about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2018-06-13 21:17:15 +0200
committerGuillaume Gomez <guillaume1.gomez@gmail.com>2018-06-13 23:30:34 +0200
commitd2a4e429591432d2f64ddccd7bcd9f09b3f6755d (patch)
treeb45c9c69765b90857c59b925e619a5d3e1ce68b6
parente6c7868fb289c3f34a24a9498e5d010ca0f48fa6 (diff)
downloadrust-d2a4e429591432d2f64ddccd7bcd9f09b3f6755d.tar.gz
rust-d2a4e429591432d2f64ddccd7bcd9f09b3f6755d.zip
Rename intra-doc lint
-rw-r--r--src/librustc/lint/builtin.rs4
-rw-r--r--src/librustdoc/clean/mod.rs6
-rw-r--r--src/librustdoc/core.rs2
-rw-r--r--src/test/rustdoc-ui/deny-intra-link-resolution-failure.rs2
-rw-r--r--src/test/rustdoc-ui/deny-intra-link-resolution-failure.stderr4
-rw-r--r--src/test/rustdoc-ui/intra-links-warning.stderr2
6 files changed, 10 insertions, 10 deletions
diff --git a/src/librustc/lint/builtin.rs b/src/librustc/lint/builtin.rs
index e2acd77a3b6..7d4a18c2a57 100644
--- a/src/librustc/lint/builtin.rs
+++ b/src/librustc/lint/builtin.rs
@@ -299,7 +299,7 @@ declare_lint! {
 }
 
 declare_lint! {
-    pub INTRA_LINK_RESOLUTION_FAILURE,
+    pub INTRA_DOC_LINK_RESOLUTION_FAILURE,
     Warn,
     "warn about documentation intra links resolution failure"
 }
@@ -357,7 +357,7 @@ impl LintPass for HardwiredLints {
             UNSTABLE_NAME_COLLISIONS,
             DUPLICATE_ASSOCIATED_TYPE_BINDINGS,
             DUPLICATE_MACRO_EXPORTS,
-            INTRA_LINK_RESOLUTION_FAILURE,
+            INTRA_DOC_LINK_RESOLUTION_FAILURE,
         )
     }
 }
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs
index 9905c69b38d..4bdb1822450 100644
--- a/src/librustdoc/clean/mod.rs
+++ b/src/librustdoc/clean/mod.rs
@@ -1284,13 +1284,13 @@ fn resolution_failure(
                 link_range.end + code_dox_len,
             );
 
-            diag = cx.tcx.struct_span_lint_node(lint::builtin::INTRA_LINK_RESOLUTION_FAILURE,
+            diag = cx.tcx.struct_span_lint_node(lint::builtin::INTRA_DOC_LINK_RESOLUTION_FAILURE,
                                                 NodeId::new(0),
                                                 sp,
                                                 &msg);
             diag.span_label(sp, "cannot be resolved, ignoring");
         } else {
-            diag = cx.tcx.struct_span_lint_node(lint::builtin::INTRA_LINK_RESOLUTION_FAILURE,
+            diag = cx.tcx.struct_span_lint_node(lint::builtin::INTRA_DOC_LINK_RESOLUTION_FAILURE,
                                                 NodeId::new(0),
                                                 sp,
                                                 &msg);
@@ -1310,7 +1310,7 @@ fn resolution_failure(
         }
         diag
     } else {
-        cx.tcx.struct_span_lint_node(lint::builtin::INTRA_LINK_RESOLUTION_FAILURE,
+        cx.tcx.struct_span_lint_node(lint::builtin::INTRA_DOC_LINK_RESOLUTION_FAILURE,
                                      NodeId::new(0),
                                      sp,
                                      &msg)
diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs
index f46d3d834ae..89923653125 100644
--- a/src/librustdoc/core.rs
+++ b/src/librustdoc/core.rs
@@ -187,7 +187,7 @@ pub fn run_core(search_paths: SearchPaths,
         _ => None
     };
 
-    let intra_link_resolution_failure_name = lint::builtin::INTRA_LINK_RESOLUTION_FAILURE.name;
+    let intra_link_resolution_failure_name = lint::builtin::INTRA_DOC_LINK_RESOLUTION_FAILURE.name;
     let warnings_lint_name = lint::builtin::WARNINGS.name;
     let lints = lint::builtin::HardwiredLints.get_lints()
                     .iter()
diff --git a/src/test/rustdoc-ui/deny-intra-link-resolution-failure.rs b/src/test/rustdoc-ui/deny-intra-link-resolution-failure.rs
index f816621c16f..85d19c83547 100644
--- a/src/test/rustdoc-ui/deny-intra-link-resolution-failure.rs
+++ b/src/test/rustdoc-ui/deny-intra-link-resolution-failure.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![deny(intra_link_resolution_failure)]
+#![deny(intra_doc_link_resolution_failure)]
 
 /// [v2] //~ ERROR
 pub fn foo() {}
diff --git a/src/test/rustdoc-ui/deny-intra-link-resolution-failure.stderr b/src/test/rustdoc-ui/deny-intra-link-resolution-failure.stderr
index 78526b3087a..66ee48ed4c9 100644
--- a/src/test/rustdoc-ui/deny-intra-link-resolution-failure.stderr
+++ b/src/test/rustdoc-ui/deny-intra-link-resolution-failure.stderr
@@ -7,7 +7,7 @@ error: `[v2]` cannot be resolved, ignoring it...
 note: lint level defined here
   --> $DIR/deny-intra-link-resolution-failure.rs:11:9
    |
-11 | #![deny(intra_link_resolution_failure)]
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+11 | #![deny(intra_doc_link_resolution_failure)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = help: to escape `[` and `]` characters, just add '/' before them like `/[` or `/]`
 
diff --git a/src/test/rustdoc-ui/intra-links-warning.stderr b/src/test/rustdoc-ui/intra-links-warning.stderr
index 6e47114af70..2a51e94b1f5 100644
--- a/src/test/rustdoc-ui/intra-links-warning.stderr
+++ b/src/test/rustdoc-ui/intra-links-warning.stderr
@@ -4,7 +4,7 @@ warning: `[Foo::baz]` cannot be resolved, ignoring it...
 13 |        //! Test with [Foo::baz], [Bar::foo], ...
    |                       ^^^^^^^^ cannot be resolved, ignoring
    |
-   = note: #[warn(intra_link_resolution_failure)] on by default
+   = note: #[warn(intra_doc_link_resolution_failure)] on by default
    = help: to escape `[` and `]` characters, just add '/' before them like `/[` or `/]`
 
 warning: `[Bar::foo]` cannot be resolved, ignoring it...