Skip to content

Commit 316a391

Browse files
borsbors
committed
Auto merge of rust-lang#60104 - Centril:rollup-7vmae1a, r=Centril
Rollup of 16 pull requests Successful merges: - rust-lang#59915 (Implement event filtering for self-profiler.) - rust-lang#59933 (Make clear that format padding doesn't work for Debug) - rust-lang#60023 (implement specialized nth_back() for Bytes, Fuse and Enumerate) - rust-lang#60032 (Remove unwanted z-index change) - rust-lang#60041 (Simplify the returning of a Result a bit) - rust-lang#60045 (Suggest appropriate path when calling associated item on bare types) - rust-lang#60052 (Correct unused parameter diagnostic) - rust-lang#60056 (Update rustfmt to 1.2.1) - rust-lang#60060 (whitelist RTM x86 target cpu feature) - rust-lang#60061 (Change suggestion of field when not in self context) - rust-lang#60064 (Point at try `?` on errors affecting the err match arm of the desugared code) - rust-lang#60078 (Use more realistic example for thread builder) - rust-lang#60080 (Fix small errors in docs for `rchunks_exact` and `rchunks_exact_mut`.) - rust-lang#60082 (Update miri) - rust-lang#60097 (Use -mergefunc-use-aliases for any LLVM >= 8) - rust-lang#60098 (libcore: deny `elided_lifetimes_in_paths`) Failed merges: r? @ghost
2 parents e928e94 + 3ad9fcc commit 316a391

File tree

91 files changed

+670
-403
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+670
-403
lines changed

‎Cargo.lock

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@ dependencies = [
3636
"url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
3737
]
3838

39+
[[package]]
40+
name = "annotate-snippets"
41+
version = "0.5.0"
42+
source = "registry+https://github.com/rust-lang/crates.io-index"
43+
dependencies = [
44+
"ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
45+
]
46+
3947
[[package]]
4048
name = "ansi_term"
4149
version = "0.11.0"
@@ -2246,7 +2254,7 @@ dependencies = [
22462254
"rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
22472255
"rustc-workspace-hack 1.0.0",
22482256
"rustc_tools_util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
2249-
"rustfmt-nightly 1.2.0",
2257+
"rustfmt-nightly 1.2.1",
22502258
"serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
22512259
"serde_derive 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)",
22522260
"serde_ignored 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3038,8 +3046,9 @@ dependencies = [
30383046

30393047
[[package]]
30403048
name = "rustfmt-nightly"
3041-
version = "1.2.0"
3049+
version = "1.2.1"
30423050
dependencies = [
3051+
"annotate-snippets 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
30433052
"atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
30443053
"bytecount 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
30453054
"cargo_metadata 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3049,6 +3058,7 @@ dependencies = [
30493058
"env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
30503059
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
30513060
"getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
3061+
"ignore 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
30523062
"itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
30533063
"lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
30543064
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3061,7 +3071,7 @@ dependencies = [
30613071
"serde_derive 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)",
30623072
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
30633073
"term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
3064-
"toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
3074+
"toml 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
30653075
"unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
30663076
"unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
30673077
"unicode_categories 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3987,6 +3997,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
39873997
"checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c"
39883998
"checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e"
39893999
"checksum ammonia 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd4c682378117e4186a492b2252b9537990e1617f44aed9788b9a1149de45477"
4000+
"checksum annotate-snippets 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e8bcdcd5b291ce85a78f2b9d082a8de9676c12b1840d386d67bc5eea6f9d2b4e"
39904001
"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
39914002
"checksum arc-swap 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1025aeae2b664ca0ea726a89d574fe8f4e77dd712d443236ad1de00379450cf6"
39924003
"checksum argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392"

‎src/liballoc/fmt.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -343,9 +343,10 @@
343343
//! * `^` - the argument is center-aligned in `width` columns
344344
//! * `>` - the argument is right-aligned in `width` columns
345345
//!
346-
//! Note that alignment may not be implemented by some types. A good way
347-
//! to ensure padding is applied is to format your input, then use this
348-
//! resulting string to pad your output.
346+
//! Note that alignment may not be implemented by some types. In particular, it
347+
//! is not generally implemented for the `Debug` trait. A good way to ensure
348+
//! padding is applied is to format your input, then use this resulting string
349+
//! to pad your output.
349350
//!
350351
//! ## Sign/`#`/`0`
351352
//!

‎src/libcore/alloc.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ pub struct LayoutErr {
338338
// (we need this for downstream impl of trait Error)
339339
#[stable(feature = "alloc_layout", since = "1.28.0")]
340340
impl fmt::Display for LayoutErr {
341-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
341+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
342342
f.write_str("invalid parameters to Layout::from_size_align")
343343
}
344344
}
@@ -354,7 +354,7 @@ pub struct AllocErr;
354354
// (we need this for downstream impl of trait Error)
355355
#[unstable(feature = "allocator_api", issue = "32838")]
356356
impl fmt::Display for AllocErr {
357-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
357+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
358358
f.write_str("memory allocation failed")
359359
}
360360
}
@@ -376,7 +376,7 @@ impl CannotReallocInPlace {
376376
// (we need this for downstream impl of trait Error)
377377
#[unstable(feature = "allocator_api", issue = "32838")]
378378
impl fmt::Display for CannotReallocInPlace {
379-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
379+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
380380
write!(f, "{}", self.description())
381381
}
382382
}

‎src/libcore/any.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ impl<T: 'static + ?Sized > Any for T {
107107

108108
#[stable(feature = "rust1", since = "1.0.0")]
109109
impl fmt::Debug for dyn Any {
110-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
110+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
111111
f.pad("Any")
112112
}
113113
}
@@ -117,14 +117,14 @@ impl fmt::Debug for dyn Any {
117117
// dispatch works with upcasting.
118118
#[stable(feature = "rust1", since = "1.0.0")]
119119
impl fmt::Debug for dyn Any + Send {
120-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
120+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
121121
f.pad("Any")
122122
}
123123
}
124124

125125
#[stable(feature = "any_send_sync_methods", since = "1.28.0")]
126126
impl fmt::Debug for dyn Any + Send + Sync {
127-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
127+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
128128
f.pad("Any")
129129
}
130130
}

‎src/libcore/array.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ pub struct TryFromSliceError(());
5555

5656
impl fmt::Display for TryFromSliceError {
5757
#[inline]
58-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
58+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
5959
fmt::Display::fmt(self.__description(), f)
6060
}
6161
}
@@ -184,7 +184,7 @@ macro_rules! array_impls {
184184

185185
#[stable(feature = "rust1", since = "1.0.0")]
186186
impl<T: fmt::Debug> fmt::Debug for [T; $N] {
187-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
187+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
188188
fmt::Debug::fmt(&&self[..], f)
189189
}
190190
}

‎src/libcore/ascii.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ impl FusedIterator for EscapeDefault {}
131131

132132
#[stable(feature = "std_debug", since = "1.16.0")]
133133
impl fmt::Debug for EscapeDefault {
134-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
134+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
135135
f.pad("EscapeDefault { .. }")
136136
}
137137
}

‎src/libcore/cell.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -577,14 +577,14 @@ pub struct BorrowError {
577577

578578
#[stable(feature = "try_borrow", since = "1.13.0")]
579579
impl Debug for BorrowError {
580-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
580+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
581581
f.debug_struct("BorrowError").finish()
582582
}
583583
}
584584

585585
#[stable(feature = "try_borrow", since = "1.13.0")]
586586
impl Display for BorrowError {
587-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
587+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
588588
Display::fmt("already mutably borrowed", f)
589589
}
590590
}
@@ -597,14 +597,14 @@ pub struct BorrowMutError {
597597

598598
#[stable(feature = "try_borrow", since = "1.13.0")]
599599
impl Debug for BorrowMutError {
600-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
600+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
601601
f.debug_struct("BorrowMutError").finish()
602602
}
603603
}
604604

605605
#[stable(feature = "try_borrow", since = "1.13.0")]
606606
impl Display for BorrowMutError {
607-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
607+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
608608
Display::fmt("already borrowed", f)
609609
}
610610
}
@@ -788,7 +788,7 @@ impl<T: ?Sized> RefCell<T> {
788788
/// ```
789789
#[stable(feature = "rust1", since = "1.0.0")]
790790
#[inline]
791-
pub fn borrow(&self) -> Ref<T> {
791+
pub fn borrow(&self) -> Ref<'_, T> {
792792
self.try_borrow().expect("already mutably borrowed")
793793
}
794794

@@ -819,7 +819,7 @@ impl<T: ?Sized> RefCell<T> {
819819
/// ```
820820
#[stable(feature = "try_borrow", since = "1.13.0")]
821821
#[inline]
822-
pub fn try_borrow(&self) -> Result<Ref<T>, BorrowError> {
822+
pub fn try_borrow(&self) -> Result<Ref<'_, T>, BorrowError> {
823823
match BorrowRef::new(&self.borrow) {
824824
Some(b) => Ok(Ref {
825825
value: unsafe { &*self.value.get() },
@@ -869,7 +869,7 @@ impl<T: ?Sized> RefCell<T> {
869869
/// ```
870870
#[stable(feature = "rust1", since = "1.0.0")]
871871
#[inline]
872-
pub fn borrow_mut(&self) -> RefMut<T> {
872+
pub fn borrow_mut(&self) -> RefMut<'_, T> {
873873
self.try_borrow_mut().expect("already borrowed")
874874
}
875875

@@ -897,7 +897,7 @@ impl<T: ?Sized> RefCell<T> {
897897
/// ```
898898
#[stable(feature = "try_borrow", since = "1.13.0")]
899899
#[inline]
900-
pub fn try_borrow_mut(&self) -> Result<RefMut<T>, BorrowMutError> {
900+
pub fn try_borrow_mut(&self) -> Result<RefMut<'_, T>, BorrowMutError> {
901901
match BorrowRefMut::new(&self.borrow) {
902902
Some(b) => Ok(RefMut {
903903
value: unsafe { &mut *self.value.get() },
@@ -1245,7 +1245,7 @@ impl<'b, T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<Ref<'b, U>> for Ref<'b,
12451245

12461246
#[stable(feature = "std_guard_impls", since = "1.20.0")]
12471247
impl<T: ?Sized + fmt::Display> fmt::Display for Ref<'_, T> {
1248-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
1248+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
12491249
self.value.fmt(f)
12501250
}
12511251
}
@@ -1402,7 +1402,7 @@ impl<'b, T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<RefMut<'b, U>> for RefM
14021402

14031403
#[stable(feature = "std_guard_impls", since = "1.20.0")]
14041404
impl<T: ?Sized + fmt::Display> fmt::Display for RefMut<'_, T> {
1405-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
1405+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
14061406
self.value.fmt(f)
14071407
}
14081408
}

‎src/libcore/char/convert.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ enum CharErrorKind {
193193

194194
#[stable(feature = "char_from_str", since = "1.20.0")]
195195
impl fmt::Display for ParseCharError {
196-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
196+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
197197
self.__description().fmt(f)
198198
}
199199
}
@@ -240,7 +240,7 @@ pub struct CharTryFromError(());
240240

241241
#[stable(feature = "try_from", since = "1.34.0")]
242242
impl fmt::Display for CharTryFromError {
243-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
243+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
244244
"converted integer out of range for `char`".fmt(f)
245245
}
246246
}
@@ -316,4 +316,3 @@ pub fn from_digit(num: u32, radix: u32) -> Option<char> {
316316
None
317317
}
318318
}
319-

‎src/libcore/char/decode.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ impl DecodeUtf16Error {
128128

129129
#[stable(feature = "decode_utf16", since = "1.9.0")]
130130
impl fmt::Display for DecodeUtf16Error {
131-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
131+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
132132
write!(f, "unpaired surrogate found: {:x}", self.code)
133133
}
134134
}

‎src/libcore/char/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ impl FusedIterator for EscapeUnicode {}
220220

221221
#[stable(feature = "char_struct_display", since = "1.16.0")]
222222
impl fmt::Display for EscapeUnicode {
223-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
223+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
224224
for c in self.clone() {
225225
f.write_char(c)?;
226226
}
@@ -333,7 +333,7 @@ impl FusedIterator for EscapeDefault {}
333333

334334
#[stable(feature = "char_struct_display", since = "1.16.0")]
335335
impl fmt::Display for EscapeDefault {
336-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
336+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
337337
for c in self.clone() {
338338
f.write_char(c)?;
339339
}
@@ -367,7 +367,7 @@ impl FusedIterator for EscapeDebug {}
367367

368368
#[stable(feature = "char_escape_debug", since = "1.20.0")]
369369
impl fmt::Display for EscapeDebug {
370-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
370+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
371371
fmt::Display::fmt(&self.0, f)
372372
}
373373
}
@@ -482,7 +482,7 @@ impl Iterator for CaseMappingIter {
482482
}
483483

484484
impl fmt::Display for CaseMappingIter {
485-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
485+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
486486
match *self {
487487
CaseMappingIter::Three(a, b, c) => {
488488
f.write_char(a)?;
@@ -503,14 +503,14 @@ impl fmt::Display for CaseMappingIter {
503503

504504
#[stable(feature = "char_struct_display", since = "1.16.0")]
505505
impl fmt::Display for ToLowercase {
506-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
506+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
507507
fmt::Display::fmt(&self.0, f)
508508
}
509509
}
510510

511511
#[stable(feature = "char_struct_display", since = "1.16.0")]
512512
impl fmt::Display for ToUppercase {
513-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
513+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
514514
fmt::Display::fmt(&self.0, f)
515515
}
516516
}

0 commit comments

Comments
 (0)