Auto merge of #67828 - JohnTitor:rollup-qmswkkl, r=JohnTitor

Rollup of 10 pull requests

Successful merges:

 - #67450 (Allow for setting a ThinLTO import limit during bootstrap)
 - #67595 (Suggest adding a lifetime constraint for opaque type)
 - #67636 (allow rustfmt key in [build] section)
 - #67736 (Less-than is asymmetric, not antisymmetric)
 - #67762 (Add missing links for insecure_time)
 - #67783 (Warn for bindings named same as variants when matching against a borrow)
 - #67796 (Ensure that we process projections during MIR inlining)
 - #67807 (Use drop instead of the toilet closure `|_| ()`)
 - #67816 (Clean up err codes)
 - #67825 (Minor: change take() docs grammar to match other docs)

Failed merges:

r? @ghost

2 files changed, 7 insertions, 4 deletions

diff --git a/src/librustc_error_codes/error_codes/E0130.md b/src/librustc_error_codes/error_codes/E0130.md
index 5273f3ad14f..539049edb33 100644
--- a/src/librustc_error_codes/error_codes/E0130.md
+++ b/src/librustc_error_codes/error_codes/E0130.md
@@ -1,4 +1,4 @@
-You declared a pattern as an argument in a foreign function declaration.
+A pattern was declared as an argument in a foreign function declaration.
 
 Erroneous code example:
 
@@ -9,7 +9,7 @@ extern {
 }
 ```
 
-Please replace the pattern argument with a regular one. Example:
+To fix this error, replace the pattern argument with a regular one. Example:
 
 ```
 struct SomeStruct {
diff --git a/src/librustc_error_codes/error_codes/E0131.md b/src/librustc_error_codes/error_codes/E0131.md
index a70a02925b0..ed798d4f881 100644
--- a/src/librustc_error_codes/error_codes/E0131.md
+++ b/src/librustc_error_codes/error_codes/E0131.md
@@ -1,8 +1,11 @@
-It is not possible to define `main` with generic parameters.
-When `main` is present, it must take no arguments and return `()`.
+The `main` function was defined with generic parameters.
+
 Erroneous code example:
 
 ```compile_fail,E0131
 fn main<T>() { // error: main function is not allowed to have generic parameters
 }
 ```
+
+It is not possible to define the `main` function with generic parameters.
+It must not take any arguments.