about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-04-29 10:48:11 +0000
committerbors <bors@rust-lang.org>2020-04-29 10:48:11 +0000
commite91aebc1a3835b9b420da0c021e211175a724b8d (patch)
tree92f29b71794612e46796b405356fb963bf945e60 /src/libcore
parentd9312a8db30b9eb345baf7ebaba6d92061d49096 (diff)
parent878e92872d6398a0b15aaf855567a6ae4c6231a8 (diff)
Auto merge of #71664 - Dylan-DPC:rollup-eng60x9, r=Dylan-DPC
Rollup of 5 pull requests

Successful merges:

 - #71217 (Suggest `;` or assignment to drop borrows in tail exprs)
 - #71286 (Add regression test for #69654)
 - #71296 (Change wording on read_vectored docs)
 - #71654 (Update link to unstable book for llvm_asm macro)
 - #71657 (Add #24949 assoc constant static recursion test)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/macros/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/macros/mod.rs b/src/libcore/macros/mod.rs
index 85d848f54fb..18d5eaa9648 100644
--- a/src/libcore/macros/mod.rs
+++ b/src/libcore/macros/mod.rs
@@ -1316,7 +1316,7 @@ pub(crate) mod builtin {
     ///
     /// Read the [unstable book] for the usage.
     ///
-    /// [unstable book]: ../unstable-book/library-features/asm.html
+    /// [unstable book]: ../unstable-book/library-features/llvm-asm.html
     #[unstable(
         feature = "llvm_asm",
         issue = "70173",