Skip to content

Commit 0e5a162

Browse files
RalfJungRalfJung
authored
Merge pull request rust-lang#4349 from rust-lang/rustup-2025-05-25
Automatic Rustup
2 parents 8a79110 + f25ec48 commit 0e5a162

File tree

290 files changed

+3997
-2426
lines changed

Some content is hidden

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

290 files changed

+3997
-2426
lines changed

‎.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,8 @@ jobs:
234234
fi
235235
exit ${STATUS}
236236
env:
237-
AWS_ACCESS_KEY_ID: ${{ env.CACHES_AWS_ACCESS_KEY_ID }}
238-
AWS_SECRET_ACCESS_KEY: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}
237+
AWS_ACCESS_KEY_ID: ${{ (github.repository == 'rust-lang/rust' && secrets.CACHES_AWS_ACCESS_KEY_ID) || env.CACHES_AWS_ACCESS_KEY_ID }}
238+
AWS_SECRET_ACCESS_KEY: ${{ (github.repository == 'rust-lang/rust' && secrets.CACHES_AWS_SECRET_ACCESS_KEY) || secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}
239239

240240
- name: create github artifacts
241241
run: src/ci/scripts/create-doc-artifacts.sh
@@ -257,8 +257,8 @@ jobs:
257257
- name: upload artifacts to S3
258258
run: src/ci/scripts/upload-artifacts.sh
259259
env:
260-
AWS_ACCESS_KEY_ID: ${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}
261-
AWS_SECRET_ACCESS_KEY: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}
260+
AWS_ACCESS_KEY_ID: ${{ (github.repository == 'rust-lang/rust' && secrets.ARTIFACTS_AWS_ACCESS_KEY_ID) || env.ARTIFACTS_AWS_ACCESS_KEY_ID }}
261+
AWS_SECRET_ACCESS_KEY: ${{ (github.repository == 'rust-lang/rust' && secrets.ARTIFACTS_AWS_SECRET_ACCESS_KEY) || secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}
262262
# Adding a condition on DEPLOY=1 or DEPLOY_ALT=1 is not needed as all deploy
263263
# builders *should* have the AWS credentials available. Still, explicitly
264264
# adding the condition is helpful as this way CI will not silently skip

‎CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ and we appreciate all of them.
55

66
The best way to get started is by asking for help in the [#new
77
members](https://rust-lang.zulipchat.com/#narrow/stream/122652-new-members)
8-
Zulip stream. We have lots of docs below of how to get started on your own, but
8+
Zulip stream. We have a lot of documentation below on how to get started on your own, but
99
the Zulip stream is the best place to *ask* for help.
1010

1111
Documentation for contributing to the compiler or tooling is located in the [Guide to Rustc
@@ -14,7 +14,7 @@ standard library in the [Standard library developers Guide][std-dev-guide], comm
1414

1515
## Making changes to subtrees and submodules
1616

17-
For submodules, changes need to be made against the repository corresponding the
17+
For submodules, changes need to be made against the repository corresponding to the
1818
submodule, and not the main `rust-lang/rust` repository.
1919

2020
For subtrees, prefer sending a PR against the subtree's repository if it does
@@ -25,15 +25,15 @@ rustc-dev-guide change that does not accompany a compiler change).
2525

2626
The [rustc-dev-guide] is meant to help document how rustc –the Rust compiler– works,
2727
as well as to help new contributors get involved in rustc development. It is recommended
28-
to read and understand the [rustc-dev-guide] before making a contribution. This guide
28+
that you read and understand the [rustc-dev-guide] before making a contribution. This guide
2929
talks about the different bots in the Rust ecosystem, the Rust development tools,
3030
bootstrapping, the compiler architecture, source code representation, and more.
3131

3232
## [Getting help](https://rustc-dev-guide.rust-lang.org/getting-started.html#asking-questions)
3333

3434
There are many ways you can get help when you're stuck. Rust has many platforms for this:
3535
[internals], [rust-zulip], and [rust-discord]. It is recommended to ask for help on
36-
the [rust-zulip], but any of these platforms are a great way to seek help and even
36+
the [rust-zulip], but any of these platforms are great ways to seek help and even
3737
find a mentor! You can learn more about asking questions and getting help in the
3838
[Asking Questions](https://rustc-dev-guide.rust-lang.org/getting-started.html#asking-questions) chapter of the [rustc-dev-guide].
3939

‎Cargo.lock

Lines changed: 47 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,20 @@ version = "0.13.1"
183183
source = "registry+https://github.com/rust-lang/crates.io-index"
184184
checksum = "5d4744ed2eef2645831b441d8f5459689ade2ab27c854488fbab1fbe94fce1a7"
185185
dependencies = [
186-
"askama_derive",
186+
"askama_derive 0.13.1",
187+
"itoa",
188+
"percent-encoding",
189+
"serde",
190+
"serde_json",
191+
]
192+
193+
[[package]]
194+
name = "askama"
195+
version = "0.14.0"
196+
source = "registry+https://github.com/rust-lang/crates.io-index"
197+
checksum = "f75363874b771be265f4ffe307ca705ef6f3baa19011c149da8674a87f1b75c4"
198+
dependencies = [
199+
"askama_derive 0.14.0",
187200
"itoa",
188201
"percent-encoding",
189202
"serde",
@@ -196,7 +209,24 @@ version = "0.13.1"
196209
source = "registry+https://github.com/rust-lang/crates.io-index"
197210
checksum = "d661e0f57be36a5c14c48f78d09011e67e0cb618f269cca9f2fd8d15b68c46ac"
198211
dependencies = [
199-
"askama_parser",
212+
"askama_parser 0.13.0",
213+
"basic-toml",
214+
"memchr",
215+
"proc-macro2",
216+
"quote",
217+
"rustc-hash 2.1.1",
218+
"serde",
219+
"serde_derive",
220+
"syn 2.0.101",
221+
]
222+
223+
[[package]]
224+
name = "askama_derive"
225+
version = "0.14.0"
226+
source = "registry+https://github.com/rust-lang/crates.io-index"
227+
checksum = "129397200fe83088e8a68407a8e2b1f826cf0086b21ccdb866a722c8bcd3a94f"
228+
dependencies = [
229+
"askama_parser 0.14.0",
200230
"basic-toml",
201231
"memchr",
202232
"proc-macro2",
@@ -219,6 +249,18 @@ dependencies = [
219249
"winnow 0.7.10",
220250
]
221251

252+
[[package]]
253+
name = "askama_parser"
254+
version = "0.14.0"
255+
source = "registry+https://github.com/rust-lang/crates.io-index"
256+
checksum = "d6ab5630b3d5eaf232620167977f95eb51f3432fc76852328774afbd242d4358"
257+
dependencies = [
258+
"memchr",
259+
"serde",
260+
"serde_derive",
261+
"winnow 0.7.10",
262+
]
263+
222264
[[package]]
223265
name = "autocfg"
224266
version = "1.4.0"
@@ -540,7 +582,7 @@ name = "clippy"
540582
version = "0.1.89"
541583
dependencies = [
542584
"anstream",
543-
"askama",
585+
"askama 0.13.1",
544586
"cargo_metadata 0.18.1",
545587
"clippy_config",
546588
"clippy_lints",
@@ -1389,7 +1431,7 @@ name = "generate-copyright"
13891431
version = "0.1.0"
13901432
dependencies = [
13911433
"anyhow",
1392-
"askama",
1434+
"askama 0.14.0",
13931435
"cargo_metadata 0.18.1",
13941436
"serde",
13951437
"serde_json",
@@ -4622,7 +4664,7 @@ name = "rustdoc"
46224664
version = "0.0.0"
46234665
dependencies = [
46244666
"arrayvec",
4625-
"askama",
4667+
"askama 0.14.0",
46264668
"base64",
46274669
"expect-test",
46284670
"indexmap",

‎compiler/rustc_ast_lowering/src/format.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use rustc_ast::*;
66
use rustc_data_structures::fx::FxIndexMap;
77
use rustc_hir as hir;
88
use rustc_session::config::FmtDebug;
9-
use rustc_span::{Ident, Span, Symbol, kw, sym};
9+
use rustc_span::{Ident, Span, Symbol, sym};
1010

1111
use super::LoweringContext;
1212

@@ -418,7 +418,7 @@ fn expand_format_args<'hir>(
418418
&FormatArgsPiece::Placeholder(_) => {
419419
// Inject empty string before placeholders when not already preceded by a literal piece.
420420
if i == 0 || matches!(fmt.template[i - 1], FormatArgsPiece::Placeholder(_)) {
421-
Some(ctx.expr_str(fmt.span, kw::Empty))
421+
Some(ctx.expr_str(fmt.span, sym::empty))
422422
} else {
423423
None
424424
}

‎compiler/rustc_borrowck/src/type_check/free_region_relations.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,8 @@ impl UniversalRegionRelations<'_> {
131131
assert!(self.universal_regions.is_universal_region(fr0));
132132

133133
let mut external_parents = vec![];
134-
let mut queue = vec![fr0];
134+
135+
let mut queue = vec![relation.minimal_scc_representative(fr0)];
135136

136137
// Keep expanding `fr` into its parents until we reach
137138
// non-local regions.

‎compiler/rustc_codegen_gcc/src/consts.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ impl<'gcc, 'tcx> StaticCodegenMethods for CodegenCx<'gcc, 'tcx> {
154154
// TODO(antoyo): set link section.
155155
}
156156

157-
if attrs.flags.contains(CodegenFnAttrFlags::USED)
157+
if attrs.flags.contains(CodegenFnAttrFlags::USED_COMPILER)
158158
|| attrs.flags.contains(CodegenFnAttrFlags::USED_LINKER)
159159
{
160160
self.add_used_global(global.to_rvalue());

‎compiler/rustc_codegen_llvm/src/consts.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ impl<'ll> CodegenCx<'ll, '_> {
527527

528528
base::set_variable_sanitizer_attrs(g, attrs);
529529

530-
if attrs.flags.contains(CodegenFnAttrFlags::USED) {
530+
if attrs.flags.contains(CodegenFnAttrFlags::USED_COMPILER) {
531531
// `USED` and `USED_LINKER` can't be used together.
532532
assert!(!attrs.flags.contains(CodegenFnAttrFlags::USED_LINKER));
533533

@@ -551,7 +551,7 @@ impl<'ll> CodegenCx<'ll, '_> {
551551
}
552552
if attrs.flags.contains(CodegenFnAttrFlags::USED_LINKER) {
553553
// `USED` and `USED_LINKER` can't be used together.
554-
assert!(!attrs.flags.contains(CodegenFnAttrFlags::USED));
554+
assert!(!attrs.flags.contains(CodegenFnAttrFlags::USED_COMPILER));
555555

556556
self.add_used_global(g);
557557
}

‎compiler/rustc_codegen_ssa/messages.ftl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
codegen_ssa_L4Bender_exporting_symbols_unimplemented = exporting symbols not implemented yet for L4Bender
22
3+
codegen_ssa_aarch64_softfloat_neon = enabling the `neon` target feature on the current target is unsound due to ABI issues
4+
35
codegen_ssa_add_native_library = failed to add native library {$library_path}: {$error}
46
57
codegen_ssa_aix_strip_not_used = using host's `strip` binary to cross-compile to AIX which is not guaranteed to work

‎compiler/rustc_codegen_ssa/src/back/symbol_export.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ fn reachable_non_generics_provider(tcx: TyCtxt<'_>, _: LocalCrate) -> DefIdMap<S
128128
} else {
129129
SymbolExportKind::Text
130130
},
131-
used: codegen_attrs.flags.contains(CodegenFnAttrFlags::USED)
131+
used: codegen_attrs.flags.contains(CodegenFnAttrFlags::USED_COMPILER)
132132
|| codegen_attrs.flags.contains(CodegenFnAttrFlags::USED_LINKER)
133133
|| used,
134134
};

‎compiler/rustc_codegen_ssa/src/codegen_attrs.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
189189
)
190190
.emit();
191191
}
192-
codegen_fn_attrs.flags |= CodegenFnAttrFlags::USED;
192+
codegen_fn_attrs.flags |= CodegenFnAttrFlags::USED_COMPILER;
193193
}
194194
Some(_) => {
195195
tcx.dcx().emit_err(errors::ExpectedUsedSymbol { span: attr.span() });
@@ -220,7 +220,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
220220
|| tcx.sess.target.is_like_windows
221221
|| tcx.sess.target.is_like_wasm);
222222
codegen_fn_attrs.flags |= if is_like_elf {
223-
CodegenFnAttrFlags::USED
223+
CodegenFnAttrFlags::USED_COMPILER
224224
} else {
225225
CodegenFnAttrFlags::USED_LINKER
226226
};
@@ -299,6 +299,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
299299
}
300300
from_target_feature_attr(
301301
tcx,
302+
did,
302303
attr,
303304
rust_target_features,
304305
&mut codegen_fn_attrs.target_features,

0 commit comments

Comments
 (0)