From f3eab4b12462204bef262c8752d02bd8fd8ee904 Mon Sep 17 00:00:00 2001
From: Bastian Kauschke <bastian_kauschke@hotmail.de>
Date: Wed, 3 Jun 2020 15:59:10 +0200
Subject: [PATCH 1/5] remove outdated fixme

---
 src/librustc_trait_selection/opaque_types.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/librustc_trait_selection/opaque_types.rs b/src/librustc_trait_selection/opaque_types.rs
index f78a6207a3ab5..19caf64c63f1e 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>,

From d0ee0dc9de343aad61ea6272c91f0c99a738052f Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@quicinc.com>
Date: Wed, 3 Jun 2020 22:36:28 -0500
Subject: [PATCH 2/5] Hexagon libstd: fix typo for c_ulonglong

---
 src/libstd/os/linux/raw.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libstd/os/linux/raw.rs b/src/libstd/os/linux/raw.rs
index 0caec97bb7b90..eb8589eb58f47 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;

From 29ab6b73e17af465bd9d25a6b59124f62c19f9f6 Mon Sep 17 00:00:00 2001
From: Ivan Tham <pickfire@riseup.net>
Date: Fri, 5 Jun 2020 01:11:01 +0800
Subject: [PATCH 3/5] Add more assert to Vec with_capacity docs

Show assertion on len too to show them how adding new items will affect both the
length and capacity, before and after.
---
 src/liballoc/vec.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs
index 22d43468771b4..ffae3b5c7894f 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]

From ea2984ae692d1ab41fd19c275b54bd8f39e5e4f2 Mon Sep 17 00:00:00 2001
From: Kyle Strand <kyle.strand@pieinsurance.com>
Date: Thu, 4 Jun 2020 11:43:29 -0600
Subject: [PATCH 4/5] Add Kyle Strand to mailmap

---
 .mailmap | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.mailmap b/.mailmap
index 7f640d40bb785..9639c1174964c 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>

From 61c2774436f4550fa90e1fe225d55bf5dcf6ed1c Mon Sep 17 00:00:00 2001
From: Wesley Wiser <wwiser@gmail.com>
Date: Thu, 4 Jun 2020 14:36:23 -0400
Subject: [PATCH 5/5] Fix missing word in RELEASES.md

---
 RELEASES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASES.md b/RELEASES.md
index fc9628bb365b4..8d6535b20c2eb 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