Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 5bfeee5

Browse files
committed
Auto merge of rust-lang#77172 - jonas-schievink:rollup-a041rou, r=jonas-schievink
Rollup of 15 pull requests Successful merges: - rust-lang#75438 (Use adaptive SVG favicon for rustdoc like other rust sites) - rust-lang#76304 (Make delegation methods of `std::net::IpAddr` unstably const) - rust-lang#76724 (Allow a unique name to be assigned to dataflow graphviz output) - rust-lang#76978 (Documented From impls in std/sync/mpsc/mod.rs) - rust-lang#77044 (Liballoc bench vec use mem take not replace) - rust-lang#77050 (Typo fix: "satsify" -> "satisfy") - rust-lang#77074 (add array::from_ref) - rust-lang#77078 (Don't use an if guard to check equality with a constant) - rust-lang#77079 (Use `Self` in docs when possible) - rust-lang#77081 (Merge two almost identical match arms) - rust-lang#77121 (Updated html_root_url for compiler crates) - rust-lang#77136 (Suggest `const_mut_refs`, not `const_fn` for mutable references in `const fn`) - rust-lang#77160 (Suggest `const_fn_transmute`, not `const_fn`) - rust-lang#77164 (Remove workaround for deref issue that no longer exists.) - rust-lang#77165 (Followup to rust-lang#76673) Failed merges: r? `@ghost`
2 parents 9b5c98f + 8515efb commit 5bfeee5

File tree

76 files changed

+365
-214
lines changed

Some content is hidden

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

76 files changed

+365
-214
lines changed

compiler/rustc_apfloat/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
//!
3131
//! This API is completely unstable and subject to change.
3232
33-
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
33+
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
3434
#![no_std]
3535
#![forbid(unsafe_code)]
3636
#![feature(nll)]

compiler/rustc_arena/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//! This crate implements several kinds of arena.
99
1010
#![doc(
11-
html_root_url = "https://doc.rust-lang.org/nightly/",
11+
html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/",
1212
test(no_crate_inject, attr(deny(warnings)))
1313
)]
1414
#![feature(dropck_eyepatch)]

compiler/rustc_ast/src/lib.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
//!
55
//! This API is completely unstable and subject to change.
66
7-
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/", test(attr(deny(warnings))))]
7+
#![doc(
8+
html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/",
9+
test(attr(deny(warnings)))
10+
)]
811
#![feature(box_syntax)]
912
#![feature(const_fn)] // For the `transmute` in `P::new`
1013
#![feature(const_fn_transmute)]

compiler/rustc_attr/src/builtin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ where
301301
.emit();
302302
};
303303
match issue.parse() {
304-
Ok(num) if num == 0 => {
304+
Ok(0) => {
305305
emit_diag(
306306
"`issue` must not be \"0\", \
307307
use \"none\" instead",

compiler/rustc_builtin_macros/src/format_foreign.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -518,8 +518,7 @@ pub mod printf {
518518
.and_then(|end| end.at_next_cp())
519519
.map(|end| (next.slice_between(end).unwrap(), end));
520520
let end = match end {
521-
Some(("32", end)) => end,
522-
Some(("64", end)) => end,
521+
Some(("32" | "64", end)) => end,
523522
_ => next,
524523
};
525524
state = Type;

compiler/rustc_builtin_macros/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! This crate contains implementations of built-in macros and other code generating facilities
22
//! injecting code into the crate before it is lowered to HIR.
33
4-
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
4+
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
55
#![feature(bool_to_option)]
66
#![feature(crate_visibility_modifier)]
77
#![feature(decl_macro)]

compiler/rustc_codegen_llvm/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//!
55
//! This API is completely unstable and subject to change.
66
7-
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
7+
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
88
#![feature(bool_to_option)]
99
#![feature(const_cstr_unchecked)]
1010
#![feature(crate_visibility_modifier)]

compiler/rustc_codegen_ssa/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
1+
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
22
#![feature(bool_to_option)]
33
#![feature(option_expect_none)]
44
#![feature(box_patterns)]

compiler/rustc_data_structures/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//!
77
//! This API is completely unstable and subject to change.
88
9-
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
9+
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
1010
#![allow(incomplete_features)]
1111
#![feature(array_windows)]
1212
#![feature(control_flow_enum)]

compiler/rustc_driver/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//!
55
//! This API is completely unstable and subject to change.
66
7-
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
7+
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
88
#![feature(nll)]
99
#![feature(once_cell)]
1010
#![recursion_limit = "256"]

0 commit comments

Comments
 (0)