Skip to content

Commit 399fa2f

Browse files
borsbors
committed
Auto merge of #123194 - matthiaskrgr:rollup-vhdc8hw, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - #123176 (Normalize the result of `Fields::ty_with_args`) - #123186 (copy any file from stage0/lib to stage0-sysroot/lib) - #123187 (Forward port 1.77.1 release notes) - #123188 (compiler: fix few unused_peekable and needless_pass_by_ref_mut clippy lints) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 685927a + 8d820c0 commit 399fa2f

File tree

45 files changed

+224
-125
lines changed

Some content is hidden

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

45 files changed

+224
-125
lines changed

‎RELEASES.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
Version 1.77.1 (2024-03-28)
2+
===========================
3+
4+
<a id="1.77.1"></a>
5+
6+
- [Revert stripping debuginfo by default for Windows](https://github.com/rust-lang/cargo/pull/13654)
7+
This fixes a regression in 1.77 by reverting to the previous default.
8+
Platforms other than Windows are not affected.
9+
- Internal: [Fix heading anchor rendering in doc pages](https://github.com/rust-lang/rust/pull/122693)
10+
111
Version 1.77.0 (2024-03-21)
212
==========================
313

‎compiler/rustc_ast_passes/src/ast_validation.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1552,7 +1552,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
15521552
/// When encountering an equality constraint in a `where` clause, emit an error. If the code seems
15531553
/// like it's setting an associated type, provide an appropriate suggestion.
15541554
fn deny_equality_constraints(
1555-
this: &mut AstValidator<'_>,
1555+
this: &AstValidator<'_>,
15561556
predicate: &WhereEqPredicate,
15571557
generics: &Generics,
15581558
) {

‎compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
337337
}
338338

339339
fn suggest_ref_or_clone(
340-
&mut self,
340+
&self,
341341
mpi: MovePathIndex,
342342
move_span: Span,
343343
err: &mut Diag<'tcx>,
@@ -1125,7 +1125,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
11251125
}
11261126

11271127
pub(crate) fn report_use_while_mutably_borrowed(
1128-
&mut self,
1128+
&self,
11291129
location: Location,
11301130
(place, _span): (Place<'tcx>, Span),
11311131
borrow: &BorrowData<'tcx>,
@@ -1174,7 +1174,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
11741174
}
11751175

11761176
pub(crate) fn report_conflicting_borrow(
1177-
&mut self,
1177+
&self,
11781178
location: Location,
11791179
(place, span): (Place<'tcx>, Span),
11801180
gen_borrow_kind: BorrowKind,
@@ -2463,7 +2463,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
24632463
}
24642464

24652465
fn report_local_value_does_not_live_long_enough(
2466-
&mut self,
2466+
&self,
24672467
location: Location,
24682468
name: &str,
24692469
borrow: &BorrowData<'tcx>,
@@ -2642,7 +2642,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
26422642
}
26432643

26442644
fn report_thread_local_value_does_not_live_long_enough(
2645-
&mut self,
2645+
&self,
26462646
drop_span: Span,
26472647
borrow_span: Span,
26482648
) -> Diag<'tcx> {
@@ -2663,7 +2663,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
26632663

26642664
#[instrument(level = "debug", skip(self))]
26652665
fn report_temporary_value_does_not_live_long_enough(
2666-
&mut self,
2666+
&self,
26672667
location: Location,
26682668
borrow: &BorrowData<'tcx>,
26692669
drop_span: Span,
@@ -2921,7 +2921,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
29212921

29222922
#[instrument(level = "debug", skip(self))]
29232923
fn report_escaping_closure_capture(
2924-
&mut self,
2924+
&self,
29252925
use_span: UseSpans<'tcx>,
29262926
var_span: Span,
29272927
fr_name: &RegionName,
@@ -3031,7 +3031,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
30313031
}
30323032

30333033
fn report_escaping_data(
3034-
&mut self,
3034+
&self,
30353035
borrow_span: Span,
30363036
name: &Option<String>,
30373037
upvar_span: Span,
@@ -3065,7 +3065,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
30653065
}
30663066

30673067
fn get_moved_indexes(
3068-
&mut self,
3068+
&self,
30693069
location: Location,
30703070
mpi: MovePathIndex,
30713071
) -> (Vec<MoveSite>, Vec<Location>) {
@@ -3854,7 +3854,7 @@ enum AnnotatedBorrowFnSignature<'tcx> {
38543854
impl<'tcx> AnnotatedBorrowFnSignature<'tcx> {
38553855
/// Annotate the provided diagnostic with information about borrow from the fn signature that
38563856
/// helps explain.
3857-
pub(crate) fn emit(&self, cx: &mut MirBorrowckCtxt<'_, 'tcx>, diag: &mut Diag<'_>) -> String {
3857+
pub(crate) fn emit(&self, cx: &MirBorrowckCtxt<'_, 'tcx>, diag: &mut Diag<'_>) -> String {
38583858
match self {
38593859
&AnnotatedBorrowFnSignature::Closure { argument_ty, argument_span } => {
38603860
diag.span_label(

‎compiler/rustc_borrowck/src/type_check/liveness/polonius.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ pub(super) fn populate_access_facts<'a, 'tcx>(
8787
body: &Body<'tcx>,
8888
location_table: &LocationTable,
8989
move_data: &MoveData<'tcx>,
90+
//FIXME: this is not mutated, but expected to be modified as
91+
// out param, bug?
9092
dropped_at: &mut Vec<(Local, Location)>,
9193
) {
9294
debug!("populate_access_facts()");

‎compiler/rustc_borrowck/src/type_check/liveness/trace.rs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ impl<'me, 'typeck, 'flow, 'tcx> LivenessResults<'me, 'typeck, 'flow, 'tcx> {
200200
for local in boring_locals {
201201
let local_ty = self.cx.body.local_decls[local].ty;
202202
let drop_data = self.cx.drop_data.entry(local_ty).or_insert_with({
203-
let typeck = &mut self.cx.typeck;
203+
let typeck = &self.cx.typeck;
204204
move || LivenessContext::compute_drop_data(typeck, local_ty)
205205
});
206206

@@ -542,7 +542,7 @@ impl<'tcx> LivenessContext<'_, '_, '_, 'tcx> {
542542
);
543543

544544
let drop_data = self.drop_data.entry(dropped_ty).or_insert_with({
545-
let typeck = &mut self.typeck;
545+
let typeck = &self.typeck;
546546
move || Self::compute_drop_data(typeck, dropped_ty)
547547
});
548548

@@ -597,10 +597,7 @@ impl<'tcx> LivenessContext<'_, '_, '_, 'tcx> {
597597
});
598598
}
599599

600-
fn compute_drop_data(
601-
typeck: &mut TypeChecker<'_, 'tcx>,
602-
dropped_ty: Ty<'tcx>,
603-
) -> DropData<'tcx> {
600+
fn compute_drop_data(typeck: &TypeChecker<'_, 'tcx>, dropped_ty: Ty<'tcx>) -> DropData<'tcx> {
604601
debug!("compute_drop_data(dropped_ty={:?})", dropped_ty,);
605602

606603
match typeck

‎compiler/rustc_builtin_macros/src/asm.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pub struct AsmArgs {
2929
}
3030

3131
fn parse_args<'a>(
32-
ecx: &mut ExtCtxt<'a>,
32+
ecx: &ExtCtxt<'a>,
3333
sp: Span,
3434
tts: TokenStream,
3535
is_global_asm: bool,
@@ -303,7 +303,7 @@ pub fn parse_asm_args<'a>(
303303
///
304304
/// This function must be called immediately after the option token is parsed.
305305
/// Otherwise, the suggestion will be incorrect.
306-
fn err_duplicate_option(p: &mut Parser<'_>, symbol: Symbol, span: Span) {
306+
fn err_duplicate_option(p: &Parser<'_>, symbol: Symbol, span: Span) {
307307
// Tool-only output
308308
let full_span = if p.token.kind == token::Comma { span.to(p.token.span) } else { span };
309309
p.psess.dcx.emit_err(errors::AsmOptAlreadyprovided { span, symbol, full_span });
@@ -315,7 +315,7 @@ fn err_duplicate_option(p: &mut Parser<'_>, symbol: Symbol, span: Span) {
315315
/// This function must be called immediately after the option token is parsed.
316316
/// Otherwise, the error will not point to the correct spot.
317317
fn try_set_option<'a>(
318-
p: &mut Parser<'a>,
318+
p: &Parser<'a>,
319319
args: &mut AsmArgs,
320320
symbol: Symbol,
321321
option: ast::InlineAsmOptions,

‎compiler/rustc_builtin_macros/src/assert.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ fn expr_if_not(
111111
cx.expr_if(span, cx.expr(span, ExprKind::Unary(UnOp::Not, cond)), then, els)
112112
}
113113

114-
fn parse_assert<'a>(cx: &mut ExtCtxt<'a>, sp: Span, stream: TokenStream) -> PResult<'a, Assert> {
114+
fn parse_assert<'a>(cx: &ExtCtxt<'a>, sp: Span, stream: TokenStream) -> PResult<'a, Assert> {
115115
let mut parser = cx.new_parser_from_tts(stream);
116116

117117
if parser.token == token::Eof {

‎compiler/rustc_builtin_macros/src/cfg.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pub fn expand_cfg(
3535
})
3636
}
3737

38-
fn parse_cfg<'a>(cx: &mut ExtCtxt<'a>, span: Span, tts: TokenStream) -> PResult<'a, ast::MetaItem> {
38+
fn parse_cfg<'a>(cx: &ExtCtxt<'a>, span: Span, tts: TokenStream) -> PResult<'a, ast::MetaItem> {
3939
let mut p = cx.new_parser_from_tts(tts);
4040

4141
if p.token == token::Eof {

‎compiler/rustc_builtin_macros/src/cfg_accessible.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use rustc_span::Span;
1010

1111
pub(crate) struct Expander;
1212

13-
fn validate_input<'a>(ecx: &mut ExtCtxt<'_>, mi: &'a ast::MetaItem) -> Option<&'a ast::Path> {
13+
fn validate_input<'a>(ecx: &ExtCtxt<'_>, mi: &'a ast::MetaItem) -> Option<&'a ast::Path> {
1414
use errors::CfgAccessibleInvalid::*;
1515
match mi.meta_item_list() {
1616
None => {}

‎compiler/rustc_builtin_macros/src/concat_bytes.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::errors;
88

99
/// Emits errors for literal expressions that are invalid inside and outside of an array.
1010
fn invalid_type_err(
11-
cx: &mut ExtCtxt<'_>,
11+
cx: &ExtCtxt<'_>,
1212
token_lit: token::Lit,
1313
span: Span,
1414
is_nested: bool,
@@ -65,7 +65,7 @@ fn invalid_type_err(
6565
/// Otherwise, returns `None`, and either pushes the `expr`'s span to `missing_literals` or
6666
/// updates `guar` accordingly.
6767
fn handle_array_element(
68-
cx: &mut ExtCtxt<'_>,
68+
cx: &ExtCtxt<'_>,
6969
guar: &mut Option<ErrorGuaranteed>,
7070
missing_literals: &mut Vec<rustc_span::Span>,
7171
expr: &P<rustc_ast::Expr>,

0 commit comments

Comments
 (0)