about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-01-05 17:31:32 +0000
committerbors <bors@rust-lang.org>2020-01-05 17:31:32 +0000
commitbc1571cc3cfef07251f7df52b95525aa16797ca2 (patch)
tree5f3fb5773cad1973ec174a5e1436076bd5fa87ee /src/libsyntax
parentb69f6e65c081f9a628ef5db83ba77e3861e60e60 (diff)
parentb9160fb56ced49c6087acb782c3260fab3936be9 (diff)
downloadrust-bc1571cc3cfef07251f7df52b95525aa16797ca2.tar.gz
rust-bc1571cc3cfef07251f7df52b95525aa16797ca2.zip
Auto merge of #67903 - Dylan-DPC:rollup-k9djyrf, r=Dylan-DPC
Rollup of 5 pull requests

Successful merges:

 - #67818 (rustdoc: Avoid panic when parsing codeblocks for playground links)
 - #67845 (Also remove const-hack for abs)
 - #67879 (Remove negative number check from float sqrt)
 - #67881 (Add backticks to various diagnostics)
 - #67882 (remove bespoke flock bindings)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/feature_gate/check.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/feature_gate/check.rs b/src/libsyntax/feature_gate/check.rs
index 50712058874..0e94a722777 100644
--- a/src/libsyntax/feature_gate/check.rs
+++ b/src/libsyntax/feature_gate/check.rs
@@ -387,8 +387,8 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
                         &self,
                         start,
                         i.span,
-                        "a `#[start]` function is an experimental \
-                                       feature whose signature may change \
+                        "`#[start]` functions are experimental \
+                                       and their signature may change \
                                        over time"
                     );
                 }