Skip to content

Commit 89a0783

Browse files
borsbors
committed
Auto merge of rust-lang#98375 - JohnTitor:rollup-e5c6rgo, r=JohnTitor
Rollup of 10 pull requests Successful merges: - rust-lang#95446 (update CPU usage script) - rust-lang#96768 (Use futex based thread parker on Fuchsia.) - rust-lang#97454 (Add release notes for 1.62) - rust-lang#97516 (clarify how Rust atomics correspond to C++ atomics) - rust-lang#97818 (Point at return expression for RPIT-related error) - rust-lang#97895 (Simplify `likely!` and `unlikely!` macro) - rust-lang#98005 (Add some tests for impossible bounds) - rust-lang#98226 (Document unstable `--extern` options) - rust-lang#98356 (Add missing period) - rust-lang#98363 (remove use of &Alloc in btree tests) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 3d829a0 + db64923 commit 89a0783

File tree

35 files changed

+489
-66
lines changed

35 files changed

+489
-66
lines changed

Diff for: ‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ by running it with the `--help` flag or reading the [rustc dev guide][rustcguide
8383
If you plan to use `x.py install` to create an installation, it is recommended
8484
that you set the `prefix` value in the `[install]` section to a directory.
8585

86-
Create install directory if you are not installing in default directory
86+
Create install directory if you are not installing in default directory.
8787

8888
4. Build and install:
8989

Diff for: ‎RELEASES.md

+125
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,128 @@
1+
Version 1.62.0 (2022-06-30)
2+
==========================
3+
4+
Language
5+
--------
6+
7+
- [Stabilize `#[derive(Default)]` on enums with a `#[default]` variant][94457]
8+
- [Stop validating some checks in dead code after functions with uninhabited return types][93313]
9+
- [Fix constants not getting dropped if part of a diverging expression][94775]
10+
- [Support unit struct/enum variant in destructuring assignment][95380]
11+
- [Remove mutable_borrow_reservation_conflict lint and allow the code pattern][96268]
12+
13+
Compiler
14+
--------
15+
16+
- [linker: Stop using whole-archive on dependencies of dylibs][96436]
17+
- [Make `unaligned_references` lint deny-by-default][95372]
18+
This lint is also a future compatibility lint, and is expected to eventually
19+
become a hard error.
20+
- [Only add codegen backend to dep info if -Zbinary-dep-depinfo is used][93969]
21+
- [Reject `#[thread_local]` attribute on non-static items][95006]
22+
- [Add tier 3 `aarch64-pc-windows-gnullvm` and `x86_64-pc-windows-gnullvm` targets\*][94872]
23+
- [Implement a lint to warn about unused macro rules][96150]
24+
- [Promote `x86_64-unknown-none` target to Tier 2\*][95705]
25+
26+
\* Refer to Rust's [platform support page][platform-support-doc] for more
27+
information on Rust's tiered platform support.
28+
29+
Libraries
30+
---------
31+
32+
- [Move `CStr` to libcore, and `CString` to liballoc][94079]
33+
- [Windows: Use a pipe relay for chaining pipes][95841]
34+
- [Replace Linux Mutex and Condvar with futex based ones.][95035]
35+
- [Replace RwLock by a futex based one on Linux][95801]
36+
- [std: directly use pthread in UNIX parker implementation][96393]
37+
38+
Stabilized APIs
39+
---------------
40+
41+
- [`bool::then_some`]
42+
- [`f32::total_cmp`]
43+
- [`f64::total_cmp`]
44+
- [`Stdin::lines`]
45+
- [`windows::CommandExt::raw_arg`]
46+
- [`impl<T: Default> Default for AssertUnwindSafe<T>`]
47+
- [`From<Rc<str>> for Rc<[u8]>`][rc-u8-from-str]
48+
- [`From<Arc<str>> for Arc<[u8]>`][arc-u8-from-str]
49+
- [`FusedIterator for EncodeWide`]
50+
- [RDM intrinsics on aarch64][stdarch/1285]
51+
52+
Clippy
53+
------
54+
55+
- [Create clippy lint against unexpectedly late drop for temporaries in match scrutinee expressions][94206]
56+
57+
Cargo
58+
-----
59+
60+
- Added the `cargo add` command for adding dependencies to `Cargo.toml` from
61+
the command-line.
62+
[docs](https://doc.rust-lang.org/nightly/cargo/commands/cargo-add.html)
63+
- Package ID specs now support `name@version` syntax in addition to the
64+
previous `name:version` to align with the behavior in `cargo add` and other
65+
tools. `cargo install` and `cargo yank` also now support this syntax so the
66+
version does not need to passed as a separate flag.
67+
- The `git` and `registry` directories in Cargo's home directory (usually
68+
`~/.cargo`) are now marked as cache directories so that they are not
69+
included in backups or content indexing (on Windows).
70+
- Added automatic `@` argfile support, which will use "response files" if the
71+
command-line to `rustc` exceeds the operating system's limit.
72+
73+
Compatibility Notes
74+
-------------------
75+
76+
- `cargo test` now passes `--target` to `rustdoc` if the specified target is
77+
the same as the host target.
78+
[#10594](https://github.com/rust-lang/cargo/pull/10594)
79+
- [rustdoc: Remove .woff font files][96279]
80+
- [Enforce Copy bounds for repeat elements while considering lifetimes][95819]
81+
82+
Internal Changes
83+
----------------
84+
85+
- [Unify ReentrantMutex implementations across all platforms][96042]
86+
87+
These changes provide no direct user facing benefits, but represent significant
88+
improvements to the internals and overall performance of rustc
89+
and related tools.
90+
91+
[93313]: https://github.com/rust-lang/rust/pull/93313/
92+
[93969]: https://github.com/rust-lang/rust/pull/93969/
93+
[94079]: https://github.com/rust-lang/rust/pull/94079/
94+
[94206]: https://github.com/rust-lang/rust/pull/94206/
95+
[94457]: https://github.com/rust-lang/rust/pull/94457/
96+
[94775]: https://github.com/rust-lang/rust/pull/94775/
97+
[94872]: https://github.com/rust-lang/rust/pull/94872/
98+
[95006]: https://github.com/rust-lang/rust/pull/95006/
99+
[95035]: https://github.com/rust-lang/rust/pull/95035/
100+
[95372]: https://github.com/rust-lang/rust/pull/95372/
101+
[95380]: https://github.com/rust-lang/rust/pull/95380/
102+
[95431]: https://github.com/rust-lang/rust/pull/95431/
103+
[95705]: https://github.com/rust-lang/rust/pull/95705/
104+
[95801]: https://github.com/rust-lang/rust/pull/95801/
105+
[95819]: https://github.com/rust-lang/rust/pull/95819/
106+
[95841]: https://github.com/rust-lang/rust/pull/95841/
107+
[96042]: https://github.com/rust-lang/rust/pull/96042/
108+
[96150]: https://github.com/rust-lang/rust/pull/96150/
109+
[96268]: https://github.com/rust-lang/rust/pull/96268/
110+
[96279]: https://github.com/rust-lang/rust/pull/96279/
111+
[96393]: https://github.com/rust-lang/rust/pull/96393/
112+
[96436]: https://github.com/rust-lang/rust/pull/96436/
113+
[96557]: https://github.com/rust-lang/rust/pull/96557/
114+
115+
[`bool::then_some`]: https://doc.rust-lang.org/stable/std/primitive.bool.html#method.then_some
116+
[`f32::total_cmp`]: https://doc.rust-lang.org/stable/std/primitive.f32.html#method.total_cmp
117+
[`f64::total_cmp`]: https://doc.rust-lang.org/stable/std/primitive.f64.html#method.total_cmp
118+
[`Stdin::lines`]: https://doc.rust-lang.org/stable/std/io/struct.Stdin.html#method.lines
119+
[`impl<T: Default> Default for AssertUnwindSafe<T>`]: https://doc.rust-lang.org/stable/std/panic/struct.AssertUnwindSafe.html#impl-Default
120+
[rc-u8-from-str]: https://doc.rust-lang.org/stable/std/rc/struct.Rc.html#impl-From%3CRc%3Cstr%3E%3E
121+
[arc-u8-from-str]: https://doc.rust-lang.org/stable/std/sync/struct.Arc.html#impl-From%3CArc%3Cstr%3E%3E
122+
[stdarch/1285]: https://github.com/rust-lang/stdarch/pull/1285
123+
[`windows::CommandExt::raw_arg`]: https://doc.rust-lang.org/stable/std/os/windows/process/trait.CommandExt.html#tymethod.raw_arg
124+
[`FusedIterator for EncodeWide`]: https://doc.rust-lang.org/stable/std/os/windows/ffi/struct.EncodeWide.html#impl-FusedIterator
125+
1126
Version 1.61.0 (2022-05-19)
2127
==========================
3128

Diff for: ‎compiler/rustc_data_structures/src/lib.rs

-21
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#![feature(associated_type_bounds)]
1212
#![feature(auto_traits)]
1313
#![feature(control_flow_enum)]
14-
#![feature(core_intrinsics)]
1514
#![feature(extend_one)]
1615
#![feature(let_else)]
1716
#![feature(hash_raw_entry)]
@@ -44,26 +43,6 @@ pub fn cold_path<F: FnOnce() -> R, R>(f: F) -> R {
4443
f()
4544
}
4645

47-
#[macro_export]
48-
macro_rules! likely {
49-
($e:expr) => {
50-
match $e {
51-
#[allow(unused_unsafe)]
52-
e => unsafe { std::intrinsics::likely(e) },
53-
}
54-
};
55-
}
56-
57-
#[macro_export]
58-
macro_rules! unlikely {
59-
($e:expr) => {
60-
match $e {
61-
#[allow(unused_unsafe)]
62-
e => unsafe { std::intrinsics::unlikely(e) },
63-
}
64-
};
65-
}
66-
6746
pub mod base_n;
6847
pub mod binary_search_util;
6948
pub mod captures;

Diff for: ‎compiler/rustc_data_structures/src/profiling.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ impl SelfProfilerRef {
195195
F: for<'a> FnOnce(&'a SelfProfiler) -> TimingGuard<'a>,
196196
{
197197
#[inline(never)]
198+
#[cold]
198199
fn cold_call<F>(profiler_ref: &SelfProfilerRef, f: F) -> TimingGuard<'_>
199200
where
200201
F: for<'a> FnOnce(&'a SelfProfiler) -> TimingGuard<'a>,
@@ -203,7 +204,7 @@ impl SelfProfilerRef {
203204
f(&**profiler)
204205
}
205206

206-
if unlikely!(self.event_filter_mask.contains(event_filter)) {
207+
if self.event_filter_mask.contains(event_filter) {
207208
cold_call(self, f)
208209
} else {
209210
TimingGuard::none()

Diff for: ‎compiler/rustc_infer/src/infer/opaque_types.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use hir::{HirId, OpaqueTyOrigin};
55
use rustc_data_structures::sync::Lrc;
66
use rustc_data_structures::vec_map::VecMap;
77
use rustc_hir as hir;
8-
use rustc_middle::traits::ObligationCause;
8+
use rustc_middle::traits::{ObligationCause, ObligationCauseCode};
99
use rustc_middle::ty::fold::BottomUpFolder;
1010
use rustc_middle::ty::subst::{GenericArgKind, Subst};
1111
use rustc_middle::ty::{
@@ -46,6 +46,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
4646
value: T,
4747
body_id: HirId,
4848
span: Span,
49+
code: ObligationCauseCode<'tcx>,
4950
param_env: ty::ParamEnv<'tcx>,
5051
) -> InferOk<'tcx, T> {
5152
if !value.has_opaque_types() {
@@ -68,10 +69,13 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
6869
) =>
6970
{
7071
let span = if span.is_dummy() { self.tcx.def_span(def_id) } else { span };
71-
let cause = ObligationCause::misc(span, body_id);
72+
let cause = ObligationCause::new(span, body_id, code.clone());
73+
// FIXME(compiler-errors): We probably should add a new TypeVariableOriginKind
74+
// for opaque types, and then use that kind to fix the spans for type errors
75+
// that we see later on.
7276
let ty_var = self.next_ty_var(TypeVariableOrigin {
7377
kind: TypeVariableOriginKind::TypeInference,
74-
span: cause.span,
78+
span,
7579
});
7680
obligations.extend(
7781
self.handle_opaque_type(ty, ty_var, true, &cause, param_env)

Diff for: ‎compiler/rustc_middle/src/traits/mod.rs

+3
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,9 @@ pub enum ObligationCauseCode<'tcx> {
387387
/// Return type of this function
388388
ReturnType,
389389

390+
/// Opaque return type of this function
391+
OpaqueReturnType(Option<(Ty<'tcx>, Span)>),
392+
390393
/// Block implicit return
391394
BlockTailExpression(hir::HirId),
392395

Diff for: ‎compiler/rustc_middle/src/ty/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@ pub type PolyTraitPredicate<'tcx> = ty::Binder<'tcx, TraitPredicate<'tcx>>;
804804

805805
impl<'tcx> TraitPredicate<'tcx> {
806806
pub fn remap_constness(&mut self, tcx: TyCtxt<'tcx>, param_env: &mut ParamEnv<'tcx>) {
807-
if unlikely!(Some(self.trait_ref.def_id) == tcx.lang_items().drop_trait()) {
807+
if std::intrinsics::unlikely(Some(self.trait_ref.def_id) == tcx.lang_items().drop_trait()) {
808808
// remap without changing constness of this predicate.
809809
// this is because `T: ~const Drop` has a different meaning to `T: Drop`
810810
// FIXME(fee1-dead): remove this logic after beta bump

Diff for: ‎compiler/rustc_query_system/src/dep_graph/graph.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ impl<K: DepKind> DepGraph<K> {
750750
dep_node
751751
);
752752

753-
if unlikely!(!side_effects.is_empty()) {
753+
if !side_effects.is_empty() {
754754
self.emit_side_effects(tcx, data, dep_node_index, side_effects);
755755
}
756756

Diff for: ‎compiler/rustc_query_system/src/query/plumbing.rs

+9-7
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ where
316316
OnHit: FnOnce(&C::Stored) -> R,
317317
{
318318
cache.lookup(&key, |value, index| {
319-
if unlikely!(tcx.profiler().enabled()) {
319+
if std::intrinsics::unlikely(tcx.profiler().enabled()) {
320320
tcx.profiler().query_cache_hit(index.into());
321321
}
322322
tcx.dep_graph().read_index(index);
@@ -354,7 +354,7 @@ where
354354
.lookup(&key, |value, index| (value.clone(), index))
355355
.unwrap_or_else(|_| panic!("value must be in cache after waiting"));
356356

357-
if unlikely!(tcx.dep_context().profiler().enabled()) {
357+
if std::intrinsics::unlikely(tcx.dep_context().profiler().enabled()) {
358358
tcx.dep_context().profiler().query_cache_hit(index.into());
359359
}
360360
query_blocked_prof_timer.finish_with_query_invocation_id(index.into());
@@ -422,7 +422,7 @@ where
422422
let diagnostics = diagnostics.into_inner();
423423
let side_effects = QuerySideEffects { diagnostics };
424424

425-
if unlikely!(!side_effects.is_empty()) {
425+
if std::intrinsics::unlikely(!side_effects.is_empty()) {
426426
if query.anon {
427427
tcx.store_side_effects_for_anon_node(dep_node_index, side_effects);
428428
} else {
@@ -466,7 +466,9 @@ where
466466
prof_timer.finish_with_query_invocation_id(dep_node_index.into());
467467

468468
if let Some(result) = result {
469-
if unlikely!(tcx.dep_context().sess().opts.debugging_opts.query_dep_graph) {
469+
if std::intrinsics::unlikely(
470+
tcx.dep_context().sess().opts.debugging_opts.query_dep_graph,
471+
) {
470472
dep_graph.mark_debug_loaded_from_disk(*dep_node)
471473
}
472474

@@ -483,8 +485,8 @@ where
483485
// currently afford to verify every hash. This subset should still
484486
// give us some coverage of potential bugs though.
485487
let try_verify = prev_fingerprint.as_value().1 % 32 == 0;
486-
if unlikely!(
487-
try_verify || tcx.dep_context().sess().opts.debugging_opts.incremental_verify_ich
488+
if std::intrinsics::unlikely(
489+
try_verify || tcx.dep_context().sess().opts.debugging_opts.incremental_verify_ich,
488490
) {
489491
incremental_verify_ich(*tcx.dep_context(), &result, dep_node, query);
490492
}
@@ -723,7 +725,7 @@ where
723725
// Ensure that only one of them runs the query.
724726
let cache = Q::query_cache(tcx);
725727
let cached = cache.lookup(&key, |_, index| {
726-
if unlikely!(tcx.dep_context().profiler().enabled()) {
728+
if std::intrinsics::unlikely(tcx.dep_context().profiler().enabled()) {
727729
tcx.dep_context().profiler().query_cache_hit(index.into());
728730
}
729731
});

Diff for: ‎compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs

+9
Original file line numberDiff line numberDiff line change
@@ -2661,6 +2661,15 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
26612661
err.help("add `#![feature(trivial_bounds)]` to the crate attributes to enable");
26622662
}
26632663
}
2664+
ObligationCauseCode::OpaqueReturnType(expr_info) => {
2665+
if let Some((expr_ty, expr_span)) = expr_info {
2666+
let expr_ty = self.resolve_vars_if_possible(expr_ty);
2667+
err.span_label(
2668+
expr_span,
2669+
format!("return type was inferred to be `{expr_ty}` here"),
2670+
);
2671+
}
2672+
}
26642673
}
26652674
}
26662675

Diff for: ‎compiler/rustc_trait_selection/src/traits/project.rs

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ use rustc_hir::def::DefKind;
2828
use rustc_hir::def_id::DefId;
2929
use rustc_hir::lang_items::LangItem;
3030
use rustc_infer::infer::resolve::OpportunisticRegionResolver;
31+
use rustc_infer::traits::ObligationCauseCode;
3132
use rustc_middle::traits::select::OverflowError;
3233
use rustc_middle::ty::fold::{MaxUniverse, TypeFoldable, TypeFolder, TypeSuperFoldable};
3334
use rustc_middle::ty::subst::Subst;
@@ -261,6 +262,7 @@ fn project_and_unify_type<'cx, 'tcx>(
261262
actual,
262263
obligation.cause.body_id,
263264
obligation.cause.span,
265+
ObligationCauseCode::MiscObligation,
264266
obligation.param_env,
265267
);
266268
obligations.extend(new);

Diff for: ‎compiler/rustc_typeck/src/check/check.rs

+5
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,13 @@ pub(super) fn check_fn<'a, 'tcx>(
101101
declared_ret_ty,
102102
body.value.hir_id,
103103
DUMMY_SP,
104+
traits::ObligationCauseCode::OpaqueReturnType(None),
104105
param_env,
105106
));
107+
// If we replaced declared_ret_ty with infer vars, then we must be infering
108+
// an opaque type, so set a flag so we can improve diagnostics.
109+
fcx.return_type_has_opaque = ret_ty != declared_ret_ty;
110+
106111
fcx.ret_coercion = Some(RefCell::new(CoerceMany::new(ret_ty)));
107112
fcx.ret_type_span = Some(decl.output.span());
108113

Diff for: ‎compiler/rustc_typeck/src/check/closure.rs

+8-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use rustc_hir::lang_items::LangItem;
1010
use rustc_infer::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
1111
use rustc_infer::infer::LateBoundRegionConversionTime;
1212
use rustc_infer::infer::{InferOk, InferResult};
13+
use rustc_infer::traits::ObligationCauseCode;
1314
use rustc_middle::ty::fold::TypeFoldable;
1415
use rustc_middle::ty::subst::InternalSubsts;
1516
use rustc_middle::ty::{self, Ty};
@@ -645,8 +646,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
645646
}
646647

647648
fn hide_parent_opaque_types(&self, ty: Ty<'tcx>, span: Span, body_id: hir::HirId) -> Ty<'tcx> {
648-
let InferOk { value, obligations } =
649-
self.replace_opaque_types_with_inference_vars(ty, body_id, span, self.param_env);
649+
let InferOk { value, obligations } = self.replace_opaque_types_with_inference_vars(
650+
ty,
651+
body_id,
652+
span,
653+
ObligationCauseCode::MiscObligation,
654+
self.param_env,
655+
);
650656
self.register_predicates(obligations);
651657
value
652658
}

0 commit comments

Comments
 (0)