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

Commit 3d0e6be

Browse files
borsbors
committed
Auto merge of rust-lang#119190 - matthiaskrgr:rollup-jvl8vkj, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - rust-lang#118729 (Add release notes for 1.75.0) - rust-lang#119124 (don't build `rust-analyzer-proc-macro-srv` on def config ) - rust-lang#119154 (Simple modification of `non_lifetime_binders`'s diagnostic information to adapt to type binders) - rust-lang#119176 (Fix name error in aarch64_apple_watchos tier 3 target) - rust-lang#119182 (Update sysinfo version to 0.30.0) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 767453e + 6516e59 commit 3d0e6be

24 files changed

+252
-53
lines changed

‎RELEASES.md

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,128 @@
1+
Version 1.75.0 (2023-12-28)
2+
==========================
3+
4+
<a id="1.75.0-Language"></a>
5+
6+
Language
7+
--------
8+
9+
- [Stabilize `async fn` and return-position `impl Trait` in traits.](https://github.com/rust-lang/rust/pull/115822/)
10+
- [Allow function pointer signatures containing `&mut T` in `const` contexts.](https://github.com/rust-lang/rust/pull/116015/)
11+
- [Match `usize`/`isize` exhaustively with half-open ranges.](https://github.com/rust-lang/rust/pull/116692/)
12+
- [Guarantee that `char` has the same size and alignment as `u32`.](https://github.com/rust-lang/rust/pull/116894/)
13+
- [Document that the null pointer has the 0 address.](https://github.com/rust-lang/rust/pull/116988/)
14+
- [Allow partially moved values in `match`.](https://github.com/rust-lang/rust/pull/103208/)
15+
- [Add notes about non-compliant FP behavior on 32bit x86 targets.](https://github.com/rust-lang/rust/pull/113053/)
16+
- [Stabilize ratified RISC-V target features.](https://github.com/rust-lang/rust/pull/116485/)
17+
18+
<a id="1.75.0-Compiler"></a>
19+
20+
Compiler
21+
--------
22+
23+
- [Rework negative coherence to properly consider impls that only partly overlap.](https://github.com/rust-lang/rust/pull/112875/)
24+
- [Bump `COINDUCTIVE_OVERLAP_IN_COHERENCE` to deny, and warn in dependencies.](https://github.com/rust-lang/rust/pull/116493/)
25+
- [Consider alias bounds when computing liveness in NLL.](https://github.com/rust-lang/rust/pull/116733/)
26+
- [Add the V (vector) extension to the `riscv64-linux-android` target spec.](https://github.com/rust-lang/rust/pull/116618/)
27+
- [Automatically enable cross-crate inlining for small functions](https://github.com/rust-lang/rust/pull/116505)
28+
- Add several new tier 3 targets:
29+
- [`csky-unknown-linux-gnuabiv2hf`](https://github.com/rust-lang/rust/pull/117049/)
30+
- [`i586-unknown-netbsd`](https://github.com/rust-lang/rust/pull/117170/)
31+
- [`mipsel-unknown-netbsd`](https://github.com/rust-lang/rust/pull/117356/)
32+
33+
Refer to Rust's [platform support page][platform-support-doc]
34+
for more information on Rust's tiered platform support.
35+
36+
<a id="1.75.0-Libraries"></a>
37+
38+
Libraries
39+
---------
40+
41+
- [Override `Waker::clone_from` to avoid cloning `Waker`s unnecessarily.](https://github.com/rust-lang/rust/pull/96979/)
42+
- [Implement `BufRead` for `VecDeque<u8>`.](https://github.com/rust-lang/rust/pull/110604/)
43+
- [Implement `FusedIterator` for `DecodeUtf16` when the inner iterator does.](https://github.com/rust-lang/rust/pull/110729/)
44+
- [Implement `Not, Bit{And,Or}{,Assign}` for IP addresses.](https://github.com/rust-lang/rust/pull/113747/)
45+
- [Implement `Default` for `ExitCode`.](https://github.com/rust-lang/rust/pull/114589/)
46+
- [Guarantee representation of None in NPO](https://github.com/rust-lang/rust/pull/115333/)
47+
- [Document when atomic loads are guaranteed read-only.](https://github.com/rust-lang/rust/pull/115577/)
48+
- [Broaden the consequences of recursive TLS initialization.](https://github.com/rust-lang/rust/pull/116172/)
49+
- [Windows: Support sub-millisecond sleep.](https://github.com/rust-lang/rust/pull/116461/)
50+
- [Fix generic bound of `str::SplitInclusive`'s `DoubleEndedIterator` impl](https://github.com/rust-lang/rust/pull/100806/)
51+
- [Fix exit status / wait status on non-Unix `cfg(unix)` platforms.](https://github.com/rust-lang/rust/pull/115108/)
52+
53+
<a id="1.75.0-Stabilized-APIs"></a>
54+
55+
Stabilized APIs
56+
---------------
57+
58+
- [`Atomic*::from_ptr`](https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicUsize.html#method.from_ptr)
59+
- [`FileTimes`](https://doc.rust-lang.org/stable/std/fs/struct.FileTimes.html)
60+
- [`FileTimesExt`](https://doc.rust-lang.org/stable/std/os/windows/fs/trait.FileTimesExt.html)
61+
- [`File::set_modified`](https://doc.rust-lang.org/stable/std/fs/struct.File.html#method.set_modified)
62+
- [`File::set_times`](https://doc.rust-lang.org/stable/std/fs/struct.File.html#method.set_times)
63+
- [`IpAddr::to_canonical`](https://doc.rust-lang.org/stable/core/net/enum.IpAddr.html#method.to_canonical)
64+
- [`Ipv6Addr::to_canonical`](https://doc.rust-lang.org/stable/core/net/struct.Ipv6Addr.html#method.to_canonical)
65+
- [`Option::as_slice`](https://doc.rust-lang.org/stable/core/option/enum.Option.html#method.as_slice)
66+
- [`Option::as_mut_slice`](https://doc.rust-lang.org/stable/core/option/enum.Option.html#method.as_mut_slice)
67+
- [`pointer::byte_add`](https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.byte_add)
68+
- [`pointer::byte_offset`](https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.byte_offset)
69+
- [`pointer::byte_offset_from`](https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.byte_offset_from)
70+
- [`pointer::byte_sub`](https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.byte_sub)
71+
- [`pointer::wrapping_byte_add`](https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.wrapping_byte_add)
72+
- [`pointer::wrapping_byte_offset`](https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.wrapping_byte_offset)
73+
- [`pointer::wrapping_byte_sub`](https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.wrapping_byte_sub)
74+
75+
These APIs are now stable in const contexts:
76+
77+
- [`Ipv6Addr::to_ipv4_mapped`](https://doc.rust-lang.org/stable/core/net/struct.Ipv6Addr.html#method.to_ipv4_mapped)
78+
- [`MaybeUninit::assume_init_read`](https://doc.rust-lang.org/stable/core/mem/union.MaybeUninit.html#method.assume_init_read)
79+
- [`MaybeUninit::zeroed`](https://doc.rust-lang.org/stable/core/mem/union.MaybeUninit.html#method.zeroed)
80+
- [`mem::discriminant`](https://doc.rust-lang.org/stable/core/mem/fn.discriminant.html)
81+
- [`mem::zeroed`](https://doc.rust-lang.org/stable/core/mem/fn.zeroed.html)
82+
83+
<a id="1.75.0-Cargo"></a>
84+
85+
Cargo
86+
-----
87+
88+
- [Add new packages to `[workspace.members]` automatically.](https://github.com/rust-lang/cargo/pull/12779/)
89+
- [Allow version-less `Cargo.toml` manifests.](https://github.com/rust-lang/cargo/pull/12786/)
90+
- [Make browser links out of HTML file paths.](https://github.com/rust-lang/cargo/pull/12889)
91+
92+
<a id="1.75.0-Rustdoc"></a>
93+
94+
Rustdoc
95+
-------
96+
97+
- [Accept less invalid Rust in rustdoc.](https://github.com/rust-lang/rust/pull/117450/)
98+
- [Document lack of object safety on affected traits.](https://github.com/rust-lang/rust/pull/113241/)
99+
- [Hide `#[repr(transparent)]` if it isn't part of the public ABI.](https://github.com/rust-lang/rust/pull/115439/)
100+
- [Show enum discriminant if it is a C-like variant.](https://github.com/rust-lang/rust/pull/116142/)
101+
102+
<a id="1.75.0-Compatibility-Notes"></a>
103+
104+
Compatibility Notes
105+
-------------------
106+
107+
- [FreeBSD targets now require at least version 12.](https://github.com/rust-lang/rust/pull/114521/)
108+
- [Formally demote tier 2 MIPS targets to tier 3.](https://github.com/rust-lang/rust/pull/115238/)
109+
- [Make misalignment a hard error in `const` contexts.](https://github.com/rust-lang/rust/pull/115524/)
110+
- [Fix detecting references to packed unsized fields.](https://github.com/rust-lang/rust/pull/115583/)
111+
- [Remove support for compiler plugins.](https://github.com/rust-lang/rust/pull/116412/)
112+
113+
<a id="1.75.0-Internal-Changes"></a>
114+
115+
Internal Changes
116+
----------------
117+
118+
These changes do not affect any public interfaces of Rust, but they represent
119+
significant improvements to the performance or internals of rustc and related
120+
tools.
121+
122+
- [Optimize `librustc_driver.so` with BOLT.](https://github.com/rust-lang/rust/pull/116352/)
123+
- [Enable parallel rustc front end in dev and nightly builds.](https://github.com/rust-lang/rust/pull/117435/)
124+
- [Distribute `rustc-codegen-cranelift` as rustup component on the nightly channel.](https://github.com/rust-lang/rust/pull/81746/)
125+
1126
Version 1.74.1 (2023-12-07)
2127
===========================
3128

‎compiler/rustc_ast_passes/messages.ftl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@ ast_passes_fn_without_body =
117117
free function without a body
118118
.suggestion = provide a definition for the function
119119
120+
ast_passes_forbidden_bound =
121+
bounds cannot be used in this context
122+
120123
ast_passes_forbidden_default =
121124
`default` is only allowed on items in trait impls
122125
.label = `default` because of this
123126
124-
ast_passes_forbidden_lifetime_bound =
125-
lifetime bounds cannot be used in this context
126-
127127
ast_passes_forbidden_non_lifetime_param =
128128
only lifetime parameters can be used in this context
129129

‎compiler/rustc_ast_passes/src/errors.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ pub struct TraitFnConst {
5252
}
5353

5454
#[derive(Diagnostic)]
55-
#[diag(ast_passes_forbidden_lifetime_bound)]
56-
pub struct ForbiddenLifetimeBound {
55+
#[diag(ast_passes_forbidden_bound)]
56+
pub struct ForbiddenBound {
5757
#[primary_span]
5858
pub spans: Vec<Span>,
5959
}

‎compiler/rustc_ast_passes/src/feature_gate.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ impl<'a> PostExpansionVisitor<'a> {
152152
}
153153

154154
fn check_late_bound_lifetime_defs(&self, params: &[ast::GenericParam]) {
155-
// Check only lifetime parameters are present and that the lifetime
156-
// parameters that are present have no bounds.
155+
// Check only lifetime parameters are present and that the
156+
// generic parameters that are present have no bounds.
157157
let non_lt_param_spans = params.iter().filter_map(|param| match param.kind {
158158
ast::GenericParamKind::Lifetime { .. } => None,
159159
_ => Some(param.ident.span),
@@ -164,10 +164,11 @@ impl<'a> PostExpansionVisitor<'a> {
164164
non_lt_param_spans,
165165
crate::fluent_generated::ast_passes_forbidden_non_lifetime_param
166166
);
167+
167168
for param in params {
168169
if !param.bounds.is_empty() {
169170
let spans: Vec<_> = param.bounds.iter().map(|b| b.span()).collect();
170-
self.sess.emit_err(errors::ForbiddenLifetimeBound { spans });
171+
self.sess.emit_err(errors::ForbiddenBound { spans });
171172
}
172173
}
173174
}

‎compiler/rustc_target/src/spec/targets/aarch64_apple_watchos.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::spec::{Target, TargetOptions};
44
pub fn target() -> Target {
55
let base = opts("watchos", Arch::Arm64);
66
Target {
7-
llvm_target: "aarch-apple-watchos".into(),
7+
llvm_target: "aarch64-apple-watchos".into(),
88
pointer_width: 64,
99
data_layout: "e-m:o-i64:64-i128:128-n32:64-S128".into(),
1010
arch: "aarch64".into(),

‎config.example.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@
323323
# "rustdoc",
324324
# "rustfmt",
325325
# "rust-analyzer",
326+
# "rust-analyzer-proc-macro-srv",
326327
# "analysis",
327328
# "src",
328329
# "rust-demangler", # if profiler = true

‎src/bootstrap/Cargo.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -428,9 +428,9 @@ dependencies = [
428428

429429
[[package]]
430430
name = "once_cell"
431-
version = "1.12.0"
431+
version = "1.19.0"
432432
source = "registry+https://github.com/rust-lang/crates.io-index"
433-
checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"
433+
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
434434

435435
[[package]]
436436
name = "opener"
@@ -620,17 +620,17 @@ dependencies = [
620620

621621
[[package]]
622622
name = "sysinfo"
623-
version = "0.26.7"
623+
version = "0.30.0"
624624
source = "registry+https://github.com/rust-lang/crates.io-index"
625-
checksum = "c375d5fd899e32847b8566e10598d6e9f1d9b55ec6de3cdf9e7da4bdc51371bc"
625+
checksum = "c68492e7268037de59ae153d7efb79546cf94a18a9548235420d3d8d2436b4b1"
626626
dependencies = [
627627
"cfg-if",
628628
"core-foundation-sys",
629629
"libc",
630630
"ntapi",
631631
"once_cell",
632632
"rayon",
633-
"winapi",
633+
"windows",
634634
]
635635

636636
[[package]]

‎src/bootstrap/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ walkdir = "2"
5959
xz2 = "0.1"
6060

6161
# Dependencies needed by the build-metrics feature
62-
sysinfo = { version = "0.26.0", optional = true }
62+
sysinfo = { version = "0.30.0", optional = true }
6363

6464
# Solaris doesn't support flock() and thus fd-lock is not option now
6565
[target.'cfg(not(target_os = "solaris"))'.dependencies]

‎src/bootstrap/src/core/build_steps/tool.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -671,11 +671,14 @@ impl Step for RustAnalyzerProcMacroSrv {
671671
// Allow building `rust-analyzer-proc-macro-srv` both as part of the `rust-analyzer` and as a stand-alone tool.
672672
run.path("src/tools/rust-analyzer")
673673
.path("src/tools/rust-analyzer/crates/proc-macro-srv-cli")
674-
.default_condition(builder.config.tools.as_ref().map_or(true, |tools| {
675-
tools
676-
.iter()
677-
.any(|tool| tool == "rust-analyzer" || tool == "rust-analyzer-proc-macro-srv")
678-
}))
674+
.default_condition(
675+
builder.config.extended
676+
&& builder.config.tools.as_ref().map_or(true, |tools| {
677+
tools.iter().any(|tool| {
678+
tool == "rust-analyzer" || tool == "rust-analyzer-proc-macro-srv"
679+
})
680+
}),
681+
)
679682
}
680683

681684
fn make_run(run: RunConfig<'_>) {

‎src/bootstrap/src/core/builder.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,18 @@ impl PathSet {
289289
}
290290
}
291291

292+
const PATH_REMAP: &[(&str, &str)] = &[("rust-analyzer-proc-macro-srv", "proc-macro-srv-cli")];
293+
294+
fn remap_paths(paths: &mut Vec<&Path>) {
295+
for path in paths.iter_mut() {
296+
for &(search, replace) in PATH_REMAP {
297+
if path.to_str() == Some(search) {
298+
*path = Path::new(replace)
299+
}
300+
}
301+
}
302+
}
303+
292304
impl StepDescription {
293305
fn from<S: Step>(kind: Kind) -> StepDescription {
294306
StepDescription {
@@ -361,6 +373,8 @@ impl StepDescription {
361373
let mut paths: Vec<_> =
362374
paths.into_iter().map(|p| p.strip_prefix(".").unwrap_or(p)).collect();
363375

376+
remap_paths(&mut paths);
377+
364378
// Handle all test suite paths.
365379
// (This is separate from the loop below to avoid having to handle multiple paths in `is_suite_path` somehow.)
366380
paths.retain(|path| {

‎src/bootstrap/src/utils/change_tracker.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,9 @@ pub const CONFIG_CHANGE_HISTORY: &[ChangeInfo] = &[
9696
severity: ChangeSeverity::Info,
9797
summary: "Removed rust.run_dsymutil and dist.gpg_password_file config options, as they were unused.",
9898
},
99+
ChangeInfo {
100+
change_id: 119124,
101+
severity: ChangeSeverity::Warning,
102+
summary: "rust-analyzer-proc-macro-srv is no longer enabled by default. To build it, you must either enable it in the configuration or explicitly invoke it with x.py.",
103+
},
99104
];

‎src/bootstrap/src/utils/metrics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use std::cell::RefCell;
1515
use std::fs::File;
1616
use std::io::BufWriter;
1717
use std::time::{Duration, Instant, SystemTime};
18-
use sysinfo::{CpuExt, System, SystemExt};
18+
use sysinfo::System;
1919

2020
// Update this number whenever a breaking change is made to the build metrics.
2121
//

‎tests/rustdoc-ui/bounded-hr-lifetime.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
pub fn hrlt<'b, 'c>()
55
where
66
for<'a: 'b + 'c> &'a (): std::fmt::Debug,
7-
//~^ ERROR lifetime bounds cannot be used in this context
7+
//~^ ERROR bounds cannot be used in this context
88
{
99
}

‎tests/rustdoc-ui/bounded-hr-lifetime.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error: lifetime bounds cannot be used in this context
1+
error: bounds cannot be used in this context
22
--> $DIR/bounded-hr-lifetime.rs:6:13
33
|
44
LL | for<'a: 'b + 'c> &'a (): std::fmt::Debug,

‎tests/ui/bounds-lifetime.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
type A = for<'b, 'a: 'b> fn(); //~ ERROR lifetime bounds cannot be used in this context
2-
type B = for<'b, 'a: 'b,> fn(); //~ ERROR lifetime bounds cannot be used in this context
3-
type C = for<'b, 'a: 'b +> fn(); //~ ERROR lifetime bounds cannot be used in this context
1+
type A = for<'b, 'a: 'b> fn(); //~ ERROR bounds cannot be used in this context
2+
type B = for<'b, 'a: 'b,> fn(); //~ ERROR bounds cannot be used in this context
3+
type C = for<'b, 'a: 'b +> fn(); //~ ERROR bounds cannot be used in this context
44
type D = for<'a, T> fn(); //~ ERROR only lifetime parameters can be used in this context
55
type E = dyn for<T, U> Fn(); //~ ERROR only lifetime parameters can be used in this context
66

‎tests/ui/bounds-lifetime.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
error: lifetime bounds cannot be used in this context
1+
error: bounds cannot be used in this context
22
--> $DIR/bounds-lifetime.rs:1:22
33
|
44
LL | type A = for<'b, 'a: 'b> fn();
55
| ^^
66

7-
error: lifetime bounds cannot be used in this context
7+
error: bounds cannot be used in this context
88
--> $DIR/bounds-lifetime.rs:2:22
99
|
1010
LL | type B = for<'b, 'a: 'b,> fn();
1111
| ^^
1212

13-
error: lifetime bounds cannot be used in this context
13+
error: bounds cannot be used in this context
1414
--> $DIR/bounds-lifetime.rs:3:22
1515
|
1616
LL | type C = for<'b, 'a: 'b +> fn();

‎tests/ui/closures/binder/bounds-on-closure-type-binders.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// check-fail
2+
3+
#![allow(incomplete_features)]
4+
#![feature(non_lifetime_binders)]
5+
#![feature(closure_lifetime_binder)]
6+
7+
trait Trait {}
8+
9+
fn main() {
10+
// Regression test for issue #119067
11+
let _ = for<T: Trait> || -> () {};
12+
//~^ ERROR bounds cannot be used in this context
13+
//~| ERROR late-bound type parameter not allowed on closures
14+
}

‎tests/ui/closures/binder/bounds-on-closure-type-binders.stderr

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
error: bounds cannot be used in this context
2+
--> $DIR/bounds-on-closure-type-binders.rs:11:20
3+
|
4+
LL | let _ = for<T: Trait> || -> () {};
5+
| ^^^^^
6+
7+
error: late-bound type parameter not allowed on closures
8+
--> $DIR/bounds-on-closure-type-binders.rs:11:17
9+
|
10+
LL | let _ = for<T: Trait> || -> () {};
11+
| ^
12+
13+
error: aborting due to 2 previous errors
14+

0 commit comments

Comments
 (0)