Skip to content

Commit 47c3158

Browse files
committed
Auto merge of rust-lang#72995 - Dylan-DPC:rollup-7gsyb8x, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - rust-lang#72946 (remove outdated fixme) - rust-lang#72971 (Hexagon libstd: fix typo for c_ulonglong) - rust-lang#72986 (Add more assert to Vec with_capacity docs) - rust-lang#72987 (Add myself to mailmap) - rust-lang#72990 (Fix missing word in RELEASES.md) Failed merges: r? @ghost
2 parents 3d5d0f8 + e6b5d88 commit 47c3158

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

.mailmap

+4
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,10 @@ Kang Seonghoon <[email protected]> <[email protected]>
153153
154154
Kevin Butler <[email protected]>
155155
Kyeongwoon Lee <[email protected]>
156+
157+
158+
159+
156160
Laurențiu Nicola <[email protected]>
157161
Lee Jeffery <[email protected]> Lee Jeffery <[email protected]>
158162
Lee Wondong <[email protected]>

RELEASES.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Compatibility Notes
100100
- [Removed the `-C no_integrated_as` flag from rustc.][70345]
101101
- [The `file_name` property in JSON output of macro errors now points the actual
102102
source file rather than the previous format of `<NAME macros>`.][70969]
103-
**Note:** this may not point a file that actually exists on the user's system.
103+
**Note:** this may not point to a file that actually exists on the user's system.
104104
- [The minimum required external LLVM version has been bumped to LLVM 8.][71147]
105105
- [`mem::{zeroed, uninitialised}` will now panic when used with types that do
106106
not allow zero initialization such as `NonZeroU8`.][66059] This was

src/liballoc/vec.rs

+3
Original file line numberDiff line numberDiff line change
@@ -343,15 +343,18 @@ impl<T> Vec<T> {
343343
///
344344
/// // The vector contains no items, even though it has capacity for more
345345
/// assert_eq!(vec.len(), 0);
346+
/// assert_eq!(vec.capacity(), 10);
346347
///
347348
/// // These are all done without reallocating...
348349
/// for i in 0..10 {
349350
/// vec.push(i);
350351
/// }
352+
/// assert_eq!(vec.len(), 10);
351353
/// assert_eq!(vec.capacity(), 10);
352354
///
353355
/// // ...but this may make the vector reallocate
354356
/// vec.push(11);
357+
/// assert_eq!(vec.len(), 11);
355358
/// assert!(vec.capacity() >= 11);
356359
/// ```
357360
#[inline]

src/librustc_trait_selection/opaque_types.rs

-3
Original file line numberDiff line numberDiff line change
@@ -1253,9 +1253,6 @@ pub fn may_define_opaque_type(
12531253
///
12541254
/// Requires that trait definitions have been processed so that we can
12551255
/// elaborate predicates and walk supertraits.
1256-
//
1257-
// FIXME: callers may only have a `&[Predicate]`, not a `Vec`, so that's
1258-
// what this code should accept.
12591256
crate fn required_region_bounds(
12601257
tcx: TyCtxt<'tcx>,
12611258
erased_self_ty: Ty<'tcx>,

src/libstd/os/linux/raw.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ mod arch {
170170

171171
#[cfg(target_arch = "hexagon")]
172172
mod arch {
173-
use crate::os::raw::{c_int, c_long, c_longlong, culonglong};
173+
use crate::os::raw::{c_int, c_long, c_longlong, c_ulonglong};
174174

175175
#[stable(feature = "raw_ext", since = "1.1.0")]
176176
pub type blkcnt_t = c_longlong;

0 commit comments

Comments
 (0)