Skip to content

Commit 3e3c552

Browse files
borsbors
committed
Auto merge of #76019 - pietroalbini:rollup-1tkgdnd, r=pietroalbini
Rollup of 12 pull requests Successful merges: - #75330 (Improve rendering of crate features via doc(cfg)) - #75927 (Use intra-doc links in `core::macros`) - #75941 (Clean up E0761 explanation) - #75943 (Fix potential UB in align_offset doc examples) - #75946 (Error use explicit intra-doc link and fix text) - #75955 (Use intra-doc links in `core::future::future` and `core::num::dec2flt`) - #75967 (Fix typo in `std::hint::black_box` docs) - #75972 (Fix ICE due to carriage return w/ multibyte char) - #75989 (Rename rustdoc/test -> rustdoc/doctest) - #75996 (fix wording in release notes) - #75998 (Add InstrProfilingPlatformFuchsia.c to profiler_builtins) - #76000 (Adds --bless support to test/run-make-fulldeps) Failed merges: r? @ghost
2 parents 41aaa90 + 0106ad4 commit 3e3c552

File tree

24 files changed

+220
-85
lines changed

24 files changed

+220
-85
lines changed

‎RELEASES.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Compatibility Notes
5151
-------------------
5252
- [The target configuration option `abi_blacklist` has been renamed
5353
to `unsupported_abis`.][74150] The old name will still continue to work.
54-
- [Rustc will now warn if you have a C-like enum that implements `Drop`.][72331]
54+
- [Rustc will now warn if you cast a C-like enum that implements `Drop`.][72331]
5555
This was previously accepted but will become a hard error in a future release.
5656
- [Rustc will fail to compile if you have a struct with
5757
`#[repr(i128)]` or `#[repr(u128)]`.][74109] This representation is currently only

‎library/core/src/future/future.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use crate::task::{Context, Poll};
2323
/// When using a future, you generally won't call `poll` directly, but instead
2424
/// `.await` the value.
2525
///
26-
/// [`Waker`]: ../task/struct.Waker.html
26+
/// [`Waker`]: crate::task::Waker
2727
#[doc(spotlight)]
2828
#[must_use = "futures do nothing unless you `.await` or poll them"]
2929
#[stable(feature = "futures_api", since = "1.36.0")]
@@ -91,11 +91,9 @@ pub trait Future {
9191
/// (memory corruption, incorrect use of `unsafe` functions, or the like),
9292
/// regardless of the future's state.
9393
///
94-
/// [`Poll::Pending`]: ../task/enum.Poll.html#variant.Pending
95-
/// [`Poll::Ready(val)`]: ../task/enum.Poll.html#variant.Ready
96-
/// [`Context`]: ../task/struct.Context.html
97-
/// [`Waker`]: ../task/struct.Waker.html
98-
/// [`Waker::wake`]: ../task/struct.Waker.html#method.wake
94+
/// [`Poll::Ready(val)`]: Poll::Ready
95+
/// [`Waker`]: crate::task::Waker
96+
/// [`Waker::wake`]: crate::task::Waker::wake
9997
#[lang = "poll"]
10098
#[stable(feature = "futures_api", since = "1.36.0")]
10199
fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output>;

‎library/core/src/hint.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ pub fn spin_loop() {
101101
/// [`std::convert::identity`]: https://doc.rust-lang.org/core/convert/fn.identity.html
102102
///
103103
/// Unlike [`std::convert::identity`], a Rust compiler is encouraged to assume that `black_box` can
104-
/// use `x` in any possible valid way that Rust code is allowed to without introducing undefined
104+
/// use `dummy` in any possible valid way that Rust code is allowed to without introducing undefined
105105
/// behavior in the calling code. This property makes `black_box` useful for writing code in which
106106
/// certain optimizations are not desired, such as benchmarks.
107107
///

‎library/core/src/macros/mod.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -333,16 +333,16 @@ macro_rules! r#try {
333333
/// This macro accepts a format string, a list of arguments, and a 'writer'. Arguments will be
334334
/// formatted according to the specified format string and the result will be passed to the writer.
335335
/// The writer may be any value with a `write_fmt` method; generally this comes from an
336-
/// implementation of either the [`std::fmt::Write`] or the [`std::io::Write`] trait. The macro
337-
/// returns whatever the `write_fmt` method returns; commonly a [`std::fmt::Result`], or an
336+
/// implementation of either the [`fmt::Write`] or the [`io::Write`] trait. The macro
337+
/// returns whatever the `write_fmt` method returns; commonly a [`fmt::Result`], or an
338338
/// [`io::Result`].
339339
///
340340
/// See [`std::fmt`] for more information on the format string syntax.
341341
///
342342
/// [`std::fmt`]: crate::fmt
343-
/// [`std::fmt::Write`]: crate::fmt::Write
344-
/// [`std::io::Write`]: ../std/io/trait.Write.html
345-
/// [`std::fmt::Result`]: crate::fmt::Result
343+
/// [`fmt::Write`]: crate::fmt::Write
344+
/// [`io::Write`]: ../std/io/trait.Write.html
345+
/// [`fmt::Result`]: crate::fmt::Result
346346
/// [`io::Result`]: ../std/io/type.Result.html
347347
///
348348
/// # Examples

‎library/core/src/macros/panic.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ to the caller of the program. `panic!` should be used when a program reaches
55
an unrecoverable state.
66

77
This macro is the perfect way to assert conditions in example code and in
8-
tests. `panic!` is closely tied with the `unwrap` method of both [`Option`]
9-
and [`Result`][runwrap] enums. Both implementations call `panic!` when they are set
10-
to None or Err variants.
8+
tests. `panic!` is closely tied with the `unwrap` method of both
9+
[`Option`][ounwrap] and [`Result`][runwrap] enums. Both implementations call
10+
`panic!` when they are set to [`None`] or [`Err`] variants.
1111

1212
This macro is used to inject panic into a Rust thread, causing the thread to
13-
panic entirely. Each thread's panic can be reaped as the `Box<Any>` type,
13+
panic entirely. Each thread's panic can be reaped as the [`Box`]`<`[`Any`]`>` type,
1414
and the single-argument form of the `panic!` macro will be the value which
1515
is transmitted.
1616

@@ -24,11 +24,11 @@ The multi-argument form of this macro panics with a string and has the
2424

2525
See also the macro [`compile_error!`], for raising errors during compilation.
2626

27-
[runwrap]: ../std/result/enum.Result.html#method.unwrap
28-
[`Option`]: ../std/option/enum.Option.html#method.unwrap
29-
[`Result`]: ../std/result/enum.Result.html
27+
[ounwrap]: Option::unwrap
28+
[runwrap]: Result::unwrap
29+
[`Box`]: ../std/boxed/struct.Box.html
30+
[`Any`]: crate::any::Any
3031
[`format!`]: ../std/macro.format.html
31-
[`compile_error!`]: ../std/macro.compile_error.html
3232
[book]: ../book/ch09-00-error-handling.html
3333

3434
# Current implementation

‎library/core/src/num/dec2flt/mod.rs

-4
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,6 @@ from_str_float_impl!(f64);
166166
///
167167
/// This error is used as the error type for the [`FromStr`] implementation
168168
/// for [`f32`] and [`f64`].
169-
///
170-
/// [`FromStr`]: ../str/trait.FromStr.html
171-
/// [`f32`]: ../../std/primitive.f32.html
172-
/// [`f64`]: ../../std/primitive.f64.html
173169
#[derive(Debug, Clone, PartialEq, Eq)]
174170
#[stable(feature = "rust1", since = "1.0.0")]
175171
pub struct ParseFloatError {

‎library/core/src/ptr/const_ptr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ impl<T: ?Sized> *const T {
836836
/// # use std::mem::align_of;
837837
/// # unsafe {
838838
/// let x = [5u8, 6u8, 7u8, 8u8, 9u8];
839-
/// let ptr = &x[n] as *const u8;
839+
/// let ptr = x.as_ptr().add(n) as *const u8;
840840
/// let offset = ptr.align_offset(align_of::<u16>());
841841
/// if offset < x.len() - n - 1 {
842842
/// let u16_ptr = ptr.add(offset) as *const u16;

‎library/core/src/ptr/mut_ptr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,7 @@ impl<T: ?Sized> *mut T {
10941094
/// # use std::mem::align_of;
10951095
/// # unsafe {
10961096
/// let x = [5u8, 6u8, 7u8, 8u8, 9u8];
1097-
/// let ptr = &x[n] as *const u8;
1097+
/// let ptr = x.as_ptr().add(n) as *const u8;
10981098
/// let offset = ptr.align_offset(align_of::<u16>());
10991099
/// if offset < x.len() - n - 1 {
11001100
/// let u16_ptr = ptr.add(offset) as *const u16;

‎library/profiler_builtins/build.rs

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ fn main() {
2020
"InstrProfilingMergeFile.c",
2121
"InstrProfilingNameVar.c",
2222
"InstrProfilingPlatformDarwin.c",
23+
"InstrProfilingPlatformFuchsia.c",
2324
"InstrProfilingPlatformLinux.c",
2425
"InstrProfilingPlatformOther.c",
2526
"InstrProfilingPlatformWindows.c",

‎library/std/src/error.rs

+7-10
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,14 @@ use crate::string;
3333
/// themselves through the [`Display`] and [`Debug`] traits, and may provide
3434
/// cause chain information:
3535
///
36-
/// The [`source`] method is generally used when errors cross "abstraction
37-
/// boundaries". If one module must report an error that is caused by an error
38-
/// from a lower-level module, it can allow access to that error via the
39-
/// [`source`] method. This makes it possible for the high-level module to
40-
/// provide its own errors while also revealing some of the implementation for
41-
/// debugging via [`source`] chains.
36+
/// [`Error::source()`] is generally used when errors cross
37+
/// "abstraction boundaries". If one module must report an error that is caused
38+
/// by an error from a lower-level module, it can allow accessing that error
39+
/// via [`Error::source()`]. This makes it possible for the high-level
40+
/// module to provide its own errors while also revealing some of the
41+
/// implementation for debugging via `source` chains.
4242
///
4343
/// [`Result<T, E>`]: Result
44-
/// [`source`]: Error::source
4544
#[stable(feature = "rust1", since = "1.0.0")]
4645
pub trait Error: Debug + Display {
4746
/// The lower-level source of this error, if any.
@@ -636,7 +635,7 @@ impl dyn Error {
636635
}
637636

638637
/// Returns an iterator starting with the current error and continuing with
639-
/// recursively calling [`source`].
638+
/// recursively calling [`Error::source`].
640639
///
641640
/// If you want to omit the current error and only use its sources,
642641
/// use `skip(1)`.
@@ -686,8 +685,6 @@ impl dyn Error {
686685
/// assert!(iter.next().is_none());
687686
/// assert!(iter.next().is_none());
688687
/// ```
689-
///
690-
/// [`source`]: Error::source
691688
#[unstable(feature = "error_iter", issue = "58520")]
692689
#[inline]
693690
pub fn chain(&self) -> Chain<'_> {

‎src/librustc_error_codes/error_codes/E0761.md

+3-7
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,20 @@ Multiple candidate files were found for an out-of-line module.
22

33
Erroneous code example:
44

5-
```rust
5+
```ignore (multiple source files required for compile_fail)
66
// file: ambiguous_module/mod.rs
77
88
fn foo() {}
9-
```
109
11-
```rust
1210
// file: ambiguous_module.rs
1311
1412
fn foo() {}
15-
```
1613
17-
```ignore (multiple source files required for compile_fail)
14+
// file: lib.rs
15+
1816
mod ambiguous_module; // error: file for module `ambiguous_module`
1917
// found at both ambiguous_module.rs and
2018
// ambiguous_module.rs/mod.rs
21-
22-
fn main() {}
2319
```
2420

2521
Please remove this ambiguity by deleting/renaming one of the candidate files.

‎src/librustc_parse_format/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,7 @@ fn find_skips_from_snippet(
760760
(' ' | '\n' | '\t', _) if eat_ws => {
761761
skips.push(pos);
762762
}
763-
('\\', Some((next_pos, 'n' | 't' | '0' | '\\' | '\'' | '\"'))) => {
763+
('\\', Some((next_pos, 'n' | 't' | 'r' | '0' | '\\' | '\'' | '\"'))) => {
764764
skips.push(*next_pos);
765765
let _ = s.next();
766766
}

0 commit comments

Comments
 (0)