Auto merge of #72995 - Dylan-DPC:rollup-7gsyb8x, r=Dylan-DPC

Rollup of 5 pull requests

Successful merges:

 - #72946 (remove outdated fixme)
 - #72971 (Hexagon libstd: fix typo for c_ulonglong)
 - #72986 (Add more assert to Vec with_capacity docs)
 - #72987 (Add myself to mailmap)
 - #72990 (Fix missing word in RELEASES.md)

Failed merges:

r? @ghost

5 files changed, 9 insertions, 5 deletions

diff --git a/.mailmap b/.mailmap
index 7f640d40bb7..9639c117496 100644
--- a/.mailmap
+++ b/.mailmap
@@ -153,6 +153,10 @@ Kang Seonghoon <kang.seonghoon@mearie.org> <public+git@mearie.org>
 Keegan McAllister <mcallister.keegan@gmail.com> <kmcallister@mozilla.com>
 Kevin Butler <haqkrs@gmail.com>
 Kyeongwoon Lee <kyeongwoon.lee@samsung.com>
+Kyle J Strand <batmanaod@gmail.com> <BatmanAoD@users.noreply.github.com>
+Kyle J Strand <batmanaod@gmail.com> <kyle.j.strand@gmail.com>
+Kyle J Strand <batmanaod@gmail.com> <kyle.strand@pieinsurance.com>
+Kyle J Strand <batmanaod@gmail.com> <kyle.strand@rms.com>
 Laurențiu Nicola <lnicola@dend.ro>
 Lee Jeffery <leejeffery@gmail.com> Lee Jeffery <lee@leejeffery.co.uk>
 Lee Wondong <wdlee91@gmail.com>
diff --git a/RELEASES.md b/RELEASES.md
index fc9628bb365..8d6535b20c2 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -100,7 +100,7 @@ Compatibility Notes
 - [Removed the `-C no_integrated_as` flag from rustc.][70345]
 - [The `file_name` property in JSON output of macro errors now points the actual
   source file rather than the previous format of `<NAME macros>`.][70969]
-  **Note:** this may not point a file that actually exists on the user's system.
+  **Note:** this may not point to a file that actually exists on the user's system.
 - [The minimum required external LLVM version has been bumped to LLVM 8.][71147]
 - [`mem::{zeroed, uninitialised}` will now panic when used with types that do
   not allow zero initialization such as `NonZeroU8`.][66059] This was
diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs
index 22d43468771..ffae3b5c789 100644
--- a/src/liballoc/vec.rs
+++ b/src/liballoc/vec.rs
@@ -343,15 +343,18 @@ impl<T> Vec<T> {
     ///
     /// // The vector contains no items, even though it has capacity for more
     /// assert_eq!(vec.len(), 0);
+    /// assert_eq!(vec.capacity(), 10);
     ///
     /// // These are all done without reallocating...
     /// for i in 0..10 {
     ///     vec.push(i);
     /// }
+    /// assert_eq!(vec.len(), 10);
     /// assert_eq!(vec.capacity(), 10);
     ///
     /// // ...but this may make the vector reallocate
     /// vec.push(11);
+    /// assert_eq!(vec.len(), 11);
     /// assert!(vec.capacity() >= 11);
     /// ```
     #[inline]
diff --git a/src/librustc_trait_selection/opaque_types.rs b/src/librustc_trait_selection/opaque_types.rs
index f78a6207a3a..19caf64c63f 100644
--- a/src/librustc_trait_selection/opaque_types.rs
+++ b/src/librustc_trait_selection/opaque_types.rs
@@ -1253,9 +1253,6 @@ pub fn may_define_opaque_type(
 ///
 /// Requires that trait definitions have been processed so that we can
 /// elaborate predicates and walk supertraits.
-//
-// FIXME: callers may only have a `&[Predicate]`, not a `Vec`, so that's
-// what this code should accept.
 crate fn required_region_bounds(
     tcx: TyCtxt<'tcx>,
     erased_self_ty: Ty<'tcx>,
diff --git a/src/libstd/os/linux/raw.rs b/src/libstd/os/linux/raw.rs
index 0caec97bb7b..eb8589eb58f 100644
--- a/src/libstd/os/linux/raw.rs
+++ b/src/libstd/os/linux/raw.rs
@@ -170,7 +170,7 @@ mod arch {
 
 #[cfg(target_arch = "hexagon")]
 mod arch {
-    use crate::os::raw::{c_int, c_long, c_longlong, culonglong};
+    use crate::os::raw::{c_int, c_long, c_longlong, c_ulonglong};
 
     #[stable(feature = "raw_ext", since = "1.1.0")]
     pub type blkcnt_t = c_longlong;