about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-09-05 14:53:33 +0000
committerbors <bors@rust-lang.org>2021-09-05 14:53:33 +0000
commitdf7e63b381ef57585d2a449130d42af38918cb3a (patch)
treeba949077844471443c24b0c5be417c6beef183b4
parente5ae3f5491e6b2d780e118f4bf0d397701fe8138 (diff)
parent169aea615c921878cb31e182850b27952bb882cd (diff)
downloadrust-df7e63b381ef57585d2a449130d42af38918cb3a.tar.gz
rust-df7e63b381ef57585d2a449130d42af38918cb3a.zip
Auto merge of #7627 - xFrednet:0000-updating-issue-templates-again, r=llogiq
Updating issue templates again for rustbot

It turns out that our current issue template can sometimes trigger a rustbot error message, as can be seen in [#7626](https://github.com/rust-lang/rust-clippy/issues/7626). I originally tested this in #7599, but it's apparently a bit inconsistent. This PR adds backticks to the commands, as correctly suggested by `@mikerite` in the comments. (Thank you!)

``@rustbot` label +S-blocked`

---

Now I also pushed a tiny link fix as well. :upside_down_face:

---

changelog: none
-rw-r--r--.github/ISSUE_TEMPLATE/blank_issue.md5
-rw-r--r--.github/ISSUE_TEMPLATE/bug_report.md5
-rw-r--r--.github/ISSUE_TEMPLATE/false_positive.md5
-rw-r--r--doc/adding_lints.md2
4 files changed, 10 insertions, 7 deletions
diff --git a/.github/ISSUE_TEMPLATE/blank_issue.md b/.github/ISSUE_TEMPLATE/blank_issue.md
index 5d7dfa36f37..2891d5e5da1 100644
--- a/.github/ISSUE_TEMPLATE/blank_issue.md
+++ b/.github/ISSUE_TEMPLATE/blank_issue.md
@@ -5,9 +5,10 @@ about: Create a blank issue.
 
 
 <!--
-Additional labels can be added to this issue by including the following command:
+Additional labels can be added to this issue by including the following command
+(without the space after the @ symbol):
 
-@rustbot label +<label>
+`@rustbot label +<label>`
 
 Common labels for this issue type are:
 * C-an-interesting-project
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 41e6abea1c6..87c18cdee66 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -33,9 +33,10 @@ LLVM version: 10.0
 ```
 
 <!--
-Additional labels can be added to this issue by including the following command:
+Additional labels can be added to this issue by including the following command
+(without the space after the @ symbol):
 
-@rustbot label +<label>
+`@rustbot label +<label>`
 
 Common labels for this issue type are:
 * `I-suggestion-causes-error`
diff --git a/.github/ISSUE_TEMPLATE/false_positive.md b/.github/ISSUE_TEMPLATE/false_positive.md
index edf9e04e3b1..4170b9ff2db 100644
--- a/.github/ISSUE_TEMPLATE/false_positive.md
+++ b/.github/ISSUE_TEMPLATE/false_positive.md
@@ -34,9 +34,10 @@ LLVM version: 10.0
 ```
 
 <!--
-Additional labels can be added to this issue by including the following command:
+Additional labels can be added to this issue by including the following command
+(without the space after the @ symbol):
 
-@rustbot label +<label>
+`@rustbot label +<label>`
 
 Common labels for this issue type are:
 * I-suggestion-causes-error
diff --git a/doc/adding_lints.md b/doc/adding_lints.md
index 392b70ee3a9..004eb28b446 100644
--- a/doc/adding_lints.md
+++ b/doc/adding_lints.md
@@ -556,7 +556,7 @@ directory. Adding a configuration to a lint can be useful for thresholds or to c
 behavior that can be seen as a false positive for some users. Adding a configuration is done
 in the following steps:
 
-1. Adding a new configuration entry to [clippy_utils::conf](/clippy_utils/src/conf.rs)
+1. Adding a new configuration entry to [clippy_lints::utils::conf](/clippy_lints/src/utils/conf.rs)
     like this:
     ```rust
     /// Lint: LINT_NAME.