diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1d1056de25c10..cd13ce35007b3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -315,6 +315,10 @@ jobs:
- name: x86_64-gnu-distcheck
os: ubuntu-20.04-8core-32gb
env: {}
+ - name: x86_64-gnu-llvm-18
+ env:
+ RUST_BACKTRACE: 1
+ os: ubuntu-20.04-8core-32gb
- name: x86_64-gnu-llvm-17
env:
RUST_BACKTRACE: 1
diff --git a/Cargo.lock b/Cargo.lock
index 218fa5a6842e0..1254421aa5842 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4133,7 +4133,6 @@ dependencies = [
"rustc_target",
"rustc_trait_selection",
"rustc_type_ir",
- "smallvec",
"tracing",
"unicode-security",
]
diff --git a/compiler/rustc_ast_ir/src/visit.rs b/compiler/rustc_ast_ir/src/visit.rs
index dec9f7a47d09d..f6d6bf3a3e309 100644
--- a/compiler/rustc_ast_ir/src/visit.rs
+++ b/compiler/rustc_ast_ir/src/visit.rs
@@ -14,7 +14,7 @@ impl VisitorResult for () {
type Residual = !;
#[cfg(not(feature = "nightly"))]
- type Residual = core::ops::Infallible;
+ type Residual = core::convert::Infallible;
fn output() -> Self {}
fn from_residual(_: Self::Residual) -> Self {}
diff --git a/compiler/rustc_const_eval/messages.ftl b/compiler/rustc_const_eval/messages.ftl
index 81c9e02e2ee80..f3af633b4e561 100644
--- a/compiler/rustc_const_eval/messages.ftl
+++ b/compiler/rustc_const_eval/messages.ftl
@@ -146,9 +146,6 @@ const_eval_intern_kind = {$kind ->
*[other] {""}
}
-const_eval_invalid_align =
- align has to be a power of 2
-
const_eval_invalid_align_details =
invalid align passed to `{$name}`: {$align} is {$err_kind ->
[not_power_of_two] not a power of 2
diff --git a/compiler/rustc_driver_impl/src/lib.rs b/compiler/rustc_driver_impl/src/lib.rs
index e06d1d245b23f..2802f44cda75d 100644
--- a/compiler/rustc_driver_impl/src/lib.rs
+++ b/compiler/rustc_driver_impl/src/lib.rs
@@ -676,6 +676,7 @@ fn list_metadata(early_dcx: &EarlyDiagCtxt, sess: &Session, metadata_loader: &dy
metadata_loader,
&mut v,
&sess.opts.unstable_opts.ls,
+ sess.cfg_version,
)
.unwrap();
safe_println!("{}", String::from_utf8(v).unwrap());
diff --git a/compiler/rustc_infer/messages.ftl b/compiler/rustc_infer/messages.ftl
index 2de87cbe631ac..e44a6ae3b3f2e 100644
--- a/compiler/rustc_infer/messages.ftl
+++ b/compiler/rustc_infer/messages.ftl
@@ -181,14 +181,6 @@ infer_more_targeted = {$has_param_name ->
infer_msl_introduces_static = introduces a `'static` lifetime requirement
infer_msl_unmet_req = because this has an unmet lifetime requirement
-infer_need_type_info_in_coroutine =
- type inside {$coroutine_kind ->
- [async_block] `async` block
- [async_closure] `async` closure
- [async_fn] `async fn` body
- *[coroutine] coroutine
- } must be known in this context
-
infer_nothing = {""}
diff --git a/compiler/rustc_interface/src/util.rs b/compiler/rustc_interface/src/util.rs
index 0d50200133cb2..23bd2dac57e3b 100644
--- a/compiler/rustc_interface/src/util.rs
+++ b/compiler/rustc_interface/src/util.rs
@@ -101,10 +101,11 @@ pub(crate) fn run_in_thread_pool_with_globals<F: FnOnce() -> R + Send, R: Send>(
threads: usize,
f: F,
) -> R {
- use rustc_data_structures::{jobserver, sync::FromDyn};
+ use rustc_data_structures::{defer, jobserver, sync::FromDyn};
use rustc_middle::ty::tls;
use rustc_query_impl::QueryCtxt;
- use rustc_query_system::query::{deadlock, QueryContext};
+ use rustc_query_system::query::{break_query_cycles, QueryContext};
+ use std::process;
let registry = sync::Registry::new(std::num::NonZero::new(threads).unwrap());
@@ -128,7 +129,19 @@ pub(crate) fn run_in_thread_pool_with_globals<F: FnOnce() -> R + Send, R: Send>(
let query_map =
FromDyn::from(tls::with(|tcx| QueryCtxt::new(tcx).collect_active_jobs()));
let registry = rayon_core::Registry::current();
- thread::spawn(move || deadlock(query_map.into_inner(), ®istry));
+ thread::Builder::new()
+ .name("rustc query cycle handler".to_string())
+ .spawn(move || {
+ let on_panic = defer(|| {
+ eprintln!("query cycle handler thread panicked, aborting process");
+ // We need to abort here as we failed to resolve the deadlock,
+ // otherwise the compiler could just hang,
+ process::abort();
+ });
+ break_query_cycles(query_map.into_inner(), ®istry);
+ on_panic.disable();
+ })
+ .unwrap();
});
if let Some(size) = get_stack_size() {
builder = builder.stack_size(size);
diff --git a/compiler/rustc_lint/Cargo.toml b/compiler/rustc_lint/Cargo.toml
index 2271321b8bf22..fa1133e7780ff 100644
--- a/compiler/rustc_lint/Cargo.toml
+++ b/compiler/rustc_lint/Cargo.toml
@@ -23,7 +23,6 @@ rustc_span = { path = "../rustc_span" }
rustc_target = { path = "../rustc_target" }
rustc_trait_selection = { path = "../rustc_trait_selection" }
rustc_type_ir = { path = "../rustc_type_ir" }
-smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
tracing = "0.1"
unicode-security = "0.1.0"
# tidy-alphabetical-end
diff --git a/compiler/rustc_lint/messages.ftl b/compiler/rustc_lint/messages.ftl
index 63e2fe47659db..8bf9d0b9d4aac 100644
--- a/compiler/rustc_lint/messages.ftl
+++ b/compiler/rustc_lint/messages.ftl
@@ -562,8 +562,6 @@ lint_suspicious_double_ref_clone =
lint_suspicious_double_ref_deref =
using `.deref()` on a double reference, which returns `{$ty}` instead of dereferencing the inner type
-lint_trivial_untranslatable_diag = diagnostic with static strings only
-
lint_ty_qualified = usage of qualified `ty::{$ty}`
.suggestion = try importing it and using it unqualified
diff --git a/compiler/rustc_lint/src/non_local_def.rs b/compiler/rustc_lint/src/non_local_def.rs
index a4fd5a7c45f97..7c4d92d3ce038 100644
--- a/compiler/rustc_lint/src/non_local_def.rs
+++ b/compiler/rustc_lint/src/non_local_def.rs
@@ -2,8 +2,6 @@ use rustc_hir::{def::DefKind, Body, Item, ItemKind, Node, Path, QPath, TyKind};
use rustc_span::def_id::{DefId, LOCAL_CRATE};
use rustc_span::{sym, symbol::kw, ExpnKind, MacroKind};
-use smallvec::{smallvec, SmallVec};
-
use crate::lints::{NonLocalDefinitionsCargoUpdateNote, NonLocalDefinitionsDiag};
use crate::{LateContext, LateLintPass, LintContext};
@@ -85,7 +83,7 @@ impl<'tcx> LateLintPass<'tcx> for NonLocalDefinitions {
if let Some(def_id) = oexpn.macro_def_id
&& let ExpnKind::Macro(macro_kind, macro_name) = oexpn.kind
&& def_id.krate != LOCAL_CRATE
- && std::env::var_os("CARGO").is_some()
+ && rustc_session::utils::was_invoked_from_cargo()
{
Some(NonLocalDefinitionsCargoUpdateNote {
macro_kind: macro_kind.descr(),
@@ -114,25 +112,25 @@ impl<'tcx> LateLintPass<'tcx> for NonLocalDefinitions {
// is using local items and so we don't lint on it.
// We also ignore anon-const in item by including the anon-const
- // parent as well; and since it's quite uncommon, we use smallvec
- // to avoid unnecessary heap allocations.
- let local_parents: SmallVec<[DefId; 1]> = if parent_def_kind == DefKind::Const
+ // parent as well.
+ let parent_parent = if parent_def_kind == DefKind::Const
&& parent_opt_item_name == Some(kw::Underscore)
{
- smallvec![parent, cx.tcx.parent(parent)]
+ Some(cx.tcx.parent(parent))
} else {
- smallvec![parent]
+ None
};
let self_ty_has_local_parent = match impl_.self_ty.kind {
TyKind::Path(QPath::Resolved(_, ty_path)) => {
- path_has_local_parent(ty_path, cx, &*local_parents)
+ path_has_local_parent(ty_path, cx, parent, parent_parent)
}
TyKind::TraitObject([principle_poly_trait_ref, ..], _, _) => {
path_has_local_parent(
principle_poly_trait_ref.trait_ref.path,
cx,
- &*local_parents,
+ parent,
+ parent_parent,
)
}
TyKind::TraitObject([], _, _)
@@ -154,7 +152,7 @@ impl<'tcx> LateLintPass<'tcx> for NonLocalDefinitions {
let of_trait_has_local_parent = impl_
.of_trait
- .map(|of_trait| path_has_local_parent(of_trait.path, cx, &*local_parents))
+ .map(|of_trait| path_has_local_parent(of_trait.path, cx, parent, parent_parent))
.unwrap_or(false);
// If none of them have a local parent (LOGICAL NOR) this means that
@@ -218,6 +216,16 @@ impl<'tcx> LateLintPass<'tcx> for NonLocalDefinitions {
/// std::convert::PartialEq<Foo<Bar>>
/// ^^^^^^^^^^^^^^^^^^^^^^^
/// ```
-fn path_has_local_parent(path: &Path<'_>, cx: &LateContext<'_>, local_parents: &[DefId]) -> bool {
- path.res.opt_def_id().is_some_and(|did| local_parents.contains(&cx.tcx.parent(did)))
+fn path_has_local_parent(
+ path: &Path<'_>,
+ cx: &LateContext<'_>,
+ impl_parent: DefId,
+ impl_parent_parent: Option<DefId>,
+) -> bool {
+ path.res.opt_def_id().is_some_and(|did| {
+ did.is_local() && {
+ let res_parent = cx.tcx.parent(did);
+ res_parent == impl_parent || Some(res_parent) == impl_parent_parent
+ }
+ })
}
diff --git a/compiler/rustc_metadata/src/locator.rs b/compiler/rustc_metadata/src/locator.rs
index dcccace12b00a..1e9d24d6c500a 100644
--- a/compiler/rustc_metadata/src/locator.rs
+++ b/compiler/rustc_metadata/src/locator.rs
@@ -243,7 +243,6 @@ use std::{cmp, fmt};
pub(crate) struct CrateLocator<'a> {
// Immutable per-session configuration.
only_needs_metadata: bool,
- sysroot: &'a Path,
metadata_loader: &'a dyn MetadataLoader,
cfg_version: &'static str,
@@ -319,7 +318,6 @@ impl<'a> CrateLocator<'a> {
CrateLocator {
only_needs_metadata,
- sysroot: &sess.sysroot,
metadata_loader,
cfg_version: sess.cfg_version,
crate_name,
@@ -569,31 +567,47 @@ impl<'a> CrateLocator<'a> {
debug!("skipping empty file");
continue;
}
- let (hash, metadata) =
- match get_metadata_section(self.target, flavor, &lib, self.metadata_loader) {
- Ok(blob) => {
- if let Some(h) = self.crate_matches(&blob, &lib) {
- (h, blob)
- } else {
- info!("metadata mismatch");
- continue;
- }
- }
- Err(MetadataError::LoadFailure(err)) => {
- info!("no metadata found: {}", err);
- // The file was present and created by the same compiler version, but we
- // couldn't load it for some reason. Give a hard error instead of silently
- // ignoring it, but only if we would have given an error anyway.
- self.crate_rejections
- .via_invalid
- .push(CrateMismatch { path: lib, got: err });
- continue;
- }
- Err(err @ MetadataError::NotPresent(_)) => {
- info!("no metadata found: {}", err);
+ let (hash, metadata) = match get_metadata_section(
+ self.target,
+ flavor,
+ &lib,
+ self.metadata_loader,
+ self.cfg_version,
+ ) {
+ Ok(blob) => {
+ if let Some(h) = self.crate_matches(&blob, &lib) {
+ (h, blob)
+ } else {
+ info!("metadata mismatch");
continue;
}
- };
+ }
+ Err(MetadataError::VersionMismatch { expected_version, found_version }) => {
+ // The file was present and created by the same compiler version, but we
+ // couldn't load it for some reason. Give a hard error instead of silently
+ // ignoring it, but only if we would have given an error anyway.
+ info!(
+ "Rejecting via version: expected {} got {}",
+ expected_version, found_version
+ );
+ self.crate_rejections
+ .via_version
+ .push(CrateMismatch { path: lib, got: found_version });
+ continue;
+ }
+ Err(MetadataError::LoadFailure(err)) => {
+ info!("no metadata found: {}", err);
+ // The file was present and created by the same compiler version, but we
+ // couldn't load it for some reason. Give a hard error instead of silently
+ // ignoring it, but only if we would have given an error anyway.
+ self.crate_rejections.via_invalid.push(CrateMismatch { path: lib, got: err });
+ continue;
+ }
+ Err(err @ MetadataError::NotPresent(_)) => {
+ info!("no metadata found: {}", err);
+ continue;
+ }
+ };
// If we see multiple hashes, emit an error about duplicate candidates.
if slot.as_ref().is_some_and(|s| s.0 != hash) {
if let Some(candidates) = err_data {
@@ -610,32 +624,6 @@ impl<'a> CrateLocator<'a> {
continue;
}
- // Ok so at this point we've determined that `(lib, kind)` above is
- // a candidate crate to load, and that `slot` is either none (this
- // is the first crate of its kind) or if some the previous path has
- // the exact same hash (e.g., it's the exact same crate).
- //
- // In principle these two candidate crates are exactly the same so
- // we can choose either of them to link. As a stupidly gross hack,
- // however, we favor crate in the sysroot.
- //
- // You can find more info in rust-lang/rust#39518 and various linked
- // issues, but the general gist is that during testing libstd the
- // compilers has two candidates to choose from: one in the sysroot
- // and one in the deps folder. These two crates are the exact same
- // crate but if the compiler chooses the one in the deps folder
- // it'll cause spurious errors on Windows.
- //
- // As a result, we favor the sysroot crate here. Note that the
- // candidates are all canonicalized, so we canonicalize the sysroot
- // as well.
- if let Some((prev, _)) = &ret {
- let sysroot = self.sysroot;
- let sysroot = try_canonicalize(sysroot).unwrap_or_else(|_| sysroot.to_path_buf());
- if prev.starts_with(&sysroot) {
- continue;
- }
- }
*slot = Some((hash, metadata, lib.clone()));
ret = Some((lib, kind));
}
@@ -648,16 +636,6 @@ impl<'a> CrateLocator<'a> {
}
fn crate_matches(&mut self, metadata: &MetadataBlob, libpath: &Path) -> Option<Svh> {
- let rustc_version = rustc_version(self.cfg_version);
- let found_version = metadata.get_rustc_version();
- if found_version != rustc_version {
- info!("Rejecting via version: expected {} got {}", rustc_version, found_version);
- self.crate_rejections
- .via_version
- .push(CrateMismatch { path: libpath.to_path_buf(), got: found_version });
- return None;
- }
-
let header = metadata.get_header();
if header.is_proc_macro_crate != self.is_proc_macro {
info!(
@@ -770,6 +748,7 @@ fn get_metadata_section<'p>(
flavor: CrateFlavor,
filename: &'p Path,
loader: &dyn MetadataLoader,
+ cfg_version: &'static str,
) -> Result<MetadataBlob, MetadataError<'p>> {
if !filename.exists() {
return Err(MetadataError::NotPresent(filename));
@@ -847,13 +826,18 @@ fn get_metadata_section<'p>(
}
};
let blob = MetadataBlob(raw_bytes);
- if blob.is_compatible() {
- Ok(blob)
- } else {
- Err(MetadataError::LoadFailure(format!(
+ match blob.check_compatibility(cfg_version) {
+ Ok(()) => Ok(blob),
+ Err(None) => Err(MetadataError::LoadFailure(format!(
"invalid metadata version found: {}",
filename.display()
- )))
+ ))),
+ Err(Some(found_version)) => {
+ return Err(MetadataError::VersionMismatch {
+ expected_version: rustc_version(cfg_version),
+ found_version,
+ });
+ }
}
}
@@ -864,9 +848,10 @@ pub fn list_file_metadata(
metadata_loader: &dyn MetadataLoader,
out: &mut dyn Write,
ls_kinds: &[String],
+ cfg_version: &'static str,
) -> IoResult<()> {
let flavor = get_flavor_from_path(path);
- match get_metadata_section(target, flavor, path, metadata_loader) {
+ match get_metadata_section(target, flavor, path, metadata_loader, cfg_version) {
Ok(metadata) => metadata.list_crate_metadata(out, ls_kinds),
Err(msg) => write!(out, "{msg}\n"),
}
@@ -932,6 +917,8 @@ enum MetadataError<'a> {
NotPresent(&'a Path),
/// The file was present and invalid.
LoadFailure(String),
+ /// The file was present, but compiled with a different rustc version.
+ VersionMismatch { expected_version: String, found_version: String },
}
impl fmt::Display for MetadataError<'_> {
@@ -941,6 +928,12 @@ impl fmt::Display for MetadataError<'_> {
f.write_str(&format!("no such file: '{}'", filename.display()))
}
MetadataError::LoadFailure(msg) => f.write_str(msg),
+ MetadataError::VersionMismatch { expected_version, found_version } => {
+ f.write_str(&format!(
+ "rustc version mismatch. expected {}, found {}",
+ expected_version, found_version,
+ ))
+ }
}
}
}
diff --git a/compiler/rustc_metadata/src/rmeta/decoder.rs b/compiler/rustc_metadata/src/rmeta/decoder.rs
index da384007c22c2..0467cf2969fc5 100644
--- a/compiler/rustc_metadata/src/rmeta/decoder.rs
+++ b/compiler/rustc_metadata/src/rmeta/decoder.rs
@@ -684,13 +684,25 @@ impl<'a, 'tcx, I: Idx, T> Decodable<DecodeContext<'a, 'tcx>> for LazyTable<I, T>
implement_ty_decoder!(DecodeContext<'a, 'tcx>);
impl MetadataBlob {
- pub(crate) fn is_compatible(&self) -> bool {
- self.blob().starts_with(METADATA_HEADER)
- }
+ pub(crate) fn check_compatibility(
+ &self,
+ cfg_version: &'static str,
+ ) -> Result<(), Option<String>> {
+ if !self.blob().starts_with(METADATA_HEADER) {
+ if self.blob().starts_with(b"rust") {
+ return Err(Some("<unknown rustc version>".to_owned()));
+ }
+ return Err(None);
+ }
- pub(crate) fn get_rustc_version(&self) -> String {
- LazyValue::<String>::from_position(NonZero::new(METADATA_HEADER.len() + 8).unwrap())
- .decode(self)
+ let found_version =
+ LazyValue::<String>::from_position(NonZero::new(METADATA_HEADER.len() + 8).unwrap())
+ .decode(self);
+ if rustc_version(cfg_version) != found_version {
+ return Err(Some(found_version));
+ }
+
+ Ok(())
}
fn root_pos(&self) -> NonZero<usize> {
diff --git a/compiler/rustc_parse/messages.ftl b/compiler/rustc_parse/messages.ftl
index 60cc138fd7bc2..a100e2d47bbbb 100644
--- a/compiler/rustc_parse/messages.ftl
+++ b/compiler/rustc_parse/messages.ftl
@@ -392,9 +392,6 @@ parse_invalid_identifier_with_leading_number = identifiers cannot start with a n
parse_invalid_interpolated_expression = invalid interpolated expression
-parse_invalid_literal_suffix = suffixes on {$kind} literals are invalid
- .label = invalid suffix `{$suffix}`
-
parse_invalid_literal_suffix_on_tuple_index = suffixes on a tuple index are invalid
.label = invalid suffix `{$suffix}`
.tuple_exception_line_1 = `{$suffix}` is *temporarily* accepted on tuple index fields as it was incorrectly accepted on stable for a few releases
@@ -609,7 +606,6 @@ parse_nonterminal_expected_item_keyword = expected an item keyword
parse_nonterminal_expected_lifetime = expected a lifetime, found `{$token}`
parse_nonterminal_expected_statement = expected a statement
-parse_not_supported = not supported
parse_note_edition_guide = for more on editions, read https://doc.rust-lang.org/edition-guide
diff --git a/compiler/rustc_parse/src/parser/diagnostics.rs b/compiler/rustc_parse/src/parser/diagnostics.rs
index 2f7ac7d3a12e5..de088b9364b26 100644
--- a/compiler/rustc_parse/src/parser/diagnostics.rs
+++ b/compiler/rustc_parse/src/parser/diagnostics.rs
@@ -667,7 +667,7 @@ impl<'a> Parser<'a> {
{
err.note("you may be trying to write a c-string literal");
err.note("c-string literals require Rust 2021 or later");
- HelpUseLatestEdition::new().add_to_diagnostic(&mut err);
+ err.subdiagnostic(self.dcx(), HelpUseLatestEdition::new());
}
// `pub` may be used for an item or `pub(crate)`
diff --git a/compiler/rustc_passes/messages.ftl b/compiler/rustc_passes/messages.ftl
index c223b8475288b..7fc523ffe0dea 100644
--- a/compiler/rustc_passes/messages.ftl
+++ b/compiler/rustc_passes/messages.ftl
@@ -302,9 +302,6 @@ passes_export_name =
attribute should be applied to a free function, impl method or static
.label = not a free function, impl method or static
-passes_expr_not_allowed_in_context =
- {$expr} is not allowed in a `{$context}`
-
passes_extern_main =
the `main` function cannot be declared in an `extern` block
@@ -405,8 +402,6 @@ passes_lang_item_on_incorrect_target =
`{$name}` language item must be applied to a {$expected_target}
.label = attribute should be applied to a {$expected_target}, not a {$actual_target}
-passes_layout =
- layout error: {$layout_error}
passes_layout_abi =
abi: {$abi}
passes_layout_align =
diff --git a/compiler/rustc_query_system/src/query/job.rs b/compiler/rustc_query_system/src/query/job.rs
index 1a54a2293573b..248a741af9079 100644
--- a/compiler/rustc_query_system/src/query/job.rs
+++ b/compiler/rustc_query_system/src/query/job.rs
@@ -17,10 +17,9 @@ use std::num::NonZero;
use {
parking_lot::{Condvar, Mutex},
rustc_data_structures::fx::FxHashSet,
- rustc_data_structures::{defer, jobserver},
+ rustc_data_structures::jobserver,
rustc_span::DUMMY_SP,
std::iter,
- std::process,
std::sync::Arc,
};
@@ -514,12 +513,7 @@ fn remove_cycle(
/// There may be multiple cycles involved in a deadlock, so this searches
/// all active queries for cycles before finally resuming all the waiters at once.
#[cfg(parallel_compiler)]
-pub fn deadlock(query_map: QueryMap, registry: &rayon_core::Registry) {
- let on_panic = defer(|| {
- eprintln!("deadlock handler panicked, aborting process");
- process::abort();
- });
-
+pub fn break_query_cycles(query_map: QueryMap, registry: &rayon_core::Registry) {
let mut wakelist = Vec::new();
let mut jobs: Vec<QueryJobId> = query_map.keys().cloned().collect();
@@ -539,19 +533,17 @@ pub fn deadlock(query_map: QueryMap, registry: &rayon_core::Registry) {
// X to Y due to Rayon waiting and a true dependency from Y to X. The algorithm here
// only considers the true dependency and won't detect a cycle.
if !found_cycle {
- if query_map.len() == 0 {
- panic!("deadlock detected without any query!")
- } else {
- panic!("deadlock detected! current query map:\n{:#?}", query_map);
- }
+ panic!(
+ "deadlock detected as we're unable to find a query cycle to break\n\
+ current query map:\n{:#?}",
+ query_map
+ );
}
// FIXME: Ensure this won't cause a deadlock before we return
for waiter in wakelist.into_iter() {
waiter.notify(registry);
}
-
- on_panic.disable();
}
#[inline(never)]
diff --git a/compiler/rustc_query_system/src/query/mod.rs b/compiler/rustc_query_system/src/query/mod.rs
index 0aefe553a3435..01b9d458f1e4f 100644
--- a/compiler/rustc_query_system/src/query/mod.rs
+++ b/compiler/rustc_query_system/src/query/mod.rs
@@ -3,7 +3,7 @@ pub use self::plumbing::*;
mod job;
#[cfg(parallel_compiler)]
-pub use self::job::deadlock;
+pub use self::job::break_query_cycles;
pub use self::job::{
print_query_stack, report_cycle, QueryInfo, QueryJob, QueryJobId, QueryJobInfo, QueryMap,
};
diff --git a/library/core/src/intrinsics.rs b/library/core/src/intrinsics.rs
index aff1c589e628a..9f4a1ed6870bb 100644
--- a/library/core/src/intrinsics.rs
+++ b/library/core/src/intrinsics.rs
@@ -3120,6 +3120,7 @@ pub(crate) const fn miri_promise_symbolic_alignment(ptr: *const (), align: usize
const fn compiletime(_ptr: *const (), _align: usize) {}
+ #[cfg_attr(not(bootstrap), allow(unused_unsafe))] // on bootstrap bump, remove unsafe block
// SAFETY: the extra behavior at runtime is for UB checks only.
unsafe {
const_eval_select((ptr, align), compiletime, runtime);
diff --git a/library/core/src/ptr/const_ptr.rs b/library/core/src/ptr/const_ptr.rs
index 0c69bf2aef9c1..90dbc798fcf18 100644
--- a/library/core/src/ptr/const_ptr.rs
+++ b/library/core/src/ptr/const_ptr.rs
@@ -1628,12 +1628,12 @@ impl<T: ?Sized> *const T {
#[inline]
const fn const_impl(ptr: *const (), align: usize) -> bool {
// We can't use the address of `self` in a `const fn`, so we use `align_offset` instead.
- // The cast to `()` is used to
- // 1. deal with fat pointers; and
- // 2. ensure that `align_offset` doesn't actually try to compute an offset.
ptr.align_offset(align) == 0
}
+ // The cast to `()` is used to
+ // 1. deal with fat pointers; and
+ // 2. ensure that `align_offset` (in `const_impl`) doesn't actually try to compute an offset.
#[cfg_attr(not(bootstrap), allow(unused_unsafe))] // on bootstrap bump, remove unsafe block
// SAFETY: The two versions are equivalent at runtime.
unsafe {
diff --git a/library/core/src/ptr/mut_ptr.rs b/library/core/src/ptr/mut_ptr.rs
index 5ce3b1f298cba..6a9033a144deb 100644
--- a/library/core/src/ptr/mut_ptr.rs
+++ b/library/core/src/ptr/mut_ptr.rs
@@ -1900,12 +1900,12 @@ impl<T: ?Sized> *mut T {
#[inline]
const fn const_impl(ptr: *mut (), align: usize) -> bool {
// We can't use the address of `self` in a `const fn`, so we use `align_offset` instead.
- // The cast to `()` is used to
- // 1. deal with fat pointers; and
- // 2. ensure that `align_offset` doesn't actually try to compute an offset.
ptr.align_offset(align) == 0
}
+ // The cast to `()` is used to
+ // 1. deal with fat pointers; and
+ // 2. ensure that `align_offset` (in `const_impl`) doesn't actually try to compute an offset.
#[cfg_attr(not(bootstrap), allow(unused_unsafe))] // on bootstrap bump, remove unsafe block
// SAFETY: The two versions are equivalent at runtime.
unsafe {
diff --git a/src/bootstrap/src/core/build_steps/check.rs b/src/bootstrap/src/core/build_steps/check.rs
index f6f4253a36435..a90139a070ac2 100644
--- a/src/bootstrap/src/core/build_steps/check.rs
+++ b/src/bootstrap/src/core/build_steps/check.rs
@@ -8,12 +8,10 @@ use crate::core::builder::{
self, crate_description, Alias, Builder, Kind, RunConfig, ShouldRun, Step,
};
use crate::core::config::TargetSelection;
-use crate::utils::cache::Interned;
-use crate::INTERNER;
use crate::{Compiler, Mode, Subcommand};
use std::path::{Path, PathBuf};
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct Std {
pub target: TargetSelection,
/// Whether to build only a subset of crates.
@@ -21,7 +19,7 @@ pub struct Std {
/// This shouldn't be used from other steps; see the comment on [`compile::Rustc`].
///
/// [`compile::Rustc`]: crate::core::build_steps::compile::Rustc
- crates: Interned<Vec<String>>,
+ crates: Vec<String>,
}
/// Returns args for the subcommand itself (not for cargo)
@@ -89,7 +87,7 @@ fn cargo_subcommand(kind: Kind) -> &'static str {
impl Std {
pub fn new(target: TargetSelection) -> Self {
- Self { target, crates: INTERNER.intern_list(vec![]) }
+ Self { target, crates: vec![] }
}
}
@@ -204,7 +202,7 @@ impl Step for Std {
}
}
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct Rustc {
pub target: TargetSelection,
/// Whether to build only a subset of crates.
@@ -212,7 +210,7 @@ pub struct Rustc {
/// This shouldn't be used from other steps; see the comment on [`compile::Rustc`].
///
/// [`compile::Rustc`]: crate::core::build_steps::compile::Rustc
- crates: Interned<Vec<String>>,
+ crates: Vec<String>,
}
impl Rustc {
@@ -222,7 +220,7 @@ impl Rustc {
.into_iter()
.map(|krate| krate.name.to_string())
.collect();
- Self { target, crates: INTERNER.intern_list(crates) }
+ Self { target, crates }
}
}
@@ -305,10 +303,10 @@ impl Step for Rustc {
}
}
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct CodegenBackend {
pub target: TargetSelection,
- pub backend: Interned<String>,
+ pub backend: &'static str,
}
impl Step for CodegenBackend {
@@ -321,14 +319,14 @@ impl Step for CodegenBackend {
}
fn make_run(run: RunConfig<'_>) {
- for &backend in &[INTERNER.intern_str("cranelift"), INTERNER.intern_str("gcc")] {
+ for &backend in &["cranelift", "gcc"] {
run.builder.ensure(CodegenBackend { target: run.target, backend });
}
}
fn run(self, builder: &Builder<'_>) {
// FIXME: remove once https://github.com/rust-lang/rust/issues/112393 is resolved
- if builder.build.config.vendor && &self.backend == "gcc" {
+ if builder.build.config.vendor && self.backend == "gcc" {
println!("Skipping checking of `rustc_codegen_gcc` with vendoring enabled.");
return;
}
@@ -552,7 +550,7 @@ fn codegen_backend_stamp(
builder: &Builder<'_>,
compiler: Compiler,
target: TargetSelection,
- backend: Interned<String>,
+ backend: &str,
) -> PathBuf {
builder
.cargo_out(compiler, Mode::Codegen, target)
diff --git a/src/bootstrap/src/core/build_steps/clean.rs b/src/bootstrap/src/core/build_steps/clean.rs
index 17ca92f25a928..9e103a350e654 100644
--- a/src/bootstrap/src/core/build_steps/clean.rs
+++ b/src/bootstrap/src/core/build_steps/clean.rs
@@ -10,7 +10,6 @@ use std::io::{self, ErrorKind};
use std::path::Path;
use crate::core::builder::{crate_description, Builder, RunConfig, ShouldRun, Step};
-use crate::utils::cache::Interned;
use crate::utils::helpers::t;
use crate::{Build, Compiler, Mode, Subcommand};
@@ -44,10 +43,10 @@ impl Step for CleanAll {
macro_rules! clean_crate_tree {
( $( $name:ident, $mode:path, $root_crate:literal);+ $(;)? ) => { $(
- #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+ #[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct $name {
compiler: Compiler,
- crates: Interned<Vec<String>>,
+ crates: Vec<String>,
}
impl Step for $name {
diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
index 4bf50e19c3fd0..6a2bff5970f36 100644
--- a/src/bootstrap/src/core/build_steps/compile.rs
+++ b/src/bootstrap/src/core/build_steps/compile.rs
@@ -27,7 +27,6 @@ use crate::core::builder::crate_description;
use crate::core::builder::Cargo;
use crate::core::builder::{Builder, Kind, PathSet, RunConfig, ShouldRun, Step, TaskPath};
use crate::core::config::{DebuginfoLevel, LlvmLibunwind, RustcLto, TargetSelection};
-use crate::utils::cache::{Interned, INTERNER};
use crate::utils::helpers::{
exe, get_clang_cl_resource_dir, is_debug_info, is_dylib, output, symlink_dir, t, up_to_date,
};
@@ -35,14 +34,14 @@ use crate::LLVM_TOOLS;
use crate::{CLang, Compiler, DependencyType, GitRepo, Mode};
use filetime::FileTime;
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub struct Std {
pub target: TargetSelection,
pub compiler: Compiler,
/// Whether to build only a subset of crates in the standard library.
///
/// This shouldn't be used from other steps; see the comment on [`Rustc`].
- crates: Interned<Vec<String>>,
+ crates: Vec<String>,
/// When using download-rustc, we need to use a new build of `std` for running unit tests of Std itself,
/// but we need to use the downloaded copy of std for linking to rustdoc. Allow this to be overriden by `builder.ensure` from other steps.
force_recompile: bool,
@@ -559,13 +558,13 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
cargo.rustdocflag("-Zcrate-attr=warn(rust_2018_idioms)");
}
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
struct StdLink {
pub compiler: Compiler,
pub target_compiler: Compiler,
pub target: TargetSelection,
/// Not actually used; only present to make sure the cache invalidation is correct.
- crates: Interned<Vec<String>>,
+ crates: Vec<String>,
/// See [`Std::force_recompile`].
force_recompile: bool,
}
@@ -612,7 +611,7 @@ impl Step for StdLink {
});
let libdir = sysroot.join(lib).join("rustlib").join(target.triple).join("lib");
let hostdir = sysroot.join(lib).join("rustlib").join(compiler.host.triple).join("lib");
- (INTERNER.intern_path(libdir), INTERNER.intern_path(hostdir))
+ (libdir, hostdir)
} else {
let libdir = builder.sysroot_libdir(target_compiler, target);
let hostdir = builder.sysroot_libdir(target_compiler, compiler.host);
@@ -818,7 +817,7 @@ fn cp_rustc_component_to_ci_sysroot(
}
}
-#[derive(Debug, PartialOrd, Ord, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, PartialOrd, Ord, Clone, PartialEq, Eq, Hash)]
pub struct Rustc {
pub target: TargetSelection,
pub compiler: Compiler,
@@ -827,7 +826,7 @@ pub struct Rustc {
/// This should only be requested by the user, not used within rustbuild itself.
/// Using it within rustbuild can lead to confusing situation where lints are replayed
/// in two different steps.
- crates: Interned<Vec<String>>,
+ crates: Vec<String>,
}
impl Rustc {
@@ -1220,13 +1219,13 @@ fn rustc_llvm_env(builder: &Builder<'_>, cargo: &mut Cargo, target: TargetSelect
}
}
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
struct RustcLink {
pub compiler: Compiler,
pub target_compiler: Compiler,
pub target: TargetSelection,
/// Not actually used; only present to make sure the cache invalidation is correct.
- crates: Interned<Vec<String>>,
+ crates: Vec<String>,
}
impl RustcLink {
@@ -1261,11 +1260,11 @@ impl Step for RustcLink {
}
}
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct CodegenBackend {
pub target: TargetSelection,
pub compiler: Compiler,
- pub backend: Interned<String>,
+ pub backend: String,
}
fn needs_codegen_config(run: &RunConfig<'_>) -> bool {
@@ -1284,7 +1283,7 @@ pub(crate) const CODEGEN_BACKEND_PREFIX: &str = "rustc_codegen_";
fn is_codegen_cfg_needed(path: &TaskPath, run: &RunConfig<'_>) -> bool {
if path.path.to_str().unwrap().contains(CODEGEN_BACKEND_PREFIX) {
let mut needs_codegen_backend_config = true;
- for &backend in run.builder.config.codegen_backends(run.target) {
+ for backend in run.builder.config.codegen_backends(run.target) {
if path
.path
.to_str()
@@ -1321,7 +1320,7 @@ impl Step for CodegenBackend {
return;
}
- for &backend in run.builder.config.codegen_backends(run.target) {
+ for backend in run.builder.config.codegen_backends(run.target) {
if backend == "llvm" {
continue; // Already built as part of rustc
}
@@ -1329,7 +1328,7 @@ impl Step for CodegenBackend {
run.builder.ensure(CodegenBackend {
target: run.target,
compiler: run.builder.compiler(run.builder.top_stage, run.build_triple()),
- backend,
+ backend: backend.clone(),
});
}
}
@@ -1394,7 +1393,7 @@ impl Step for CodegenBackend {
f.display()
);
}
- let stamp = codegen_backend_stamp(builder, compiler, target, backend);
+ let stamp = codegen_backend_stamp(builder, compiler, target, &backend);
let codegen_backend = codegen_backend.to_str().unwrap();
t!(fs::write(stamp, codegen_backend));
}
@@ -1433,7 +1432,7 @@ fn copy_codegen_backends_to_sysroot(
continue; // Already built as part of rustc
}
- let stamp = codegen_backend_stamp(builder, compiler, target, *backend);
+ let stamp = codegen_backend_stamp(builder, compiler, target, backend);
let dylib = t!(fs::read_to_string(&stamp));
let file = Path::new(&dylib);
let filename = file.file_name().unwrap().to_str().unwrap();
@@ -1470,7 +1469,7 @@ fn codegen_backend_stamp(
builder: &Builder<'_>,
compiler: Compiler,
target: TargetSelection,
- backend: Interned<String>,
+ backend: &str,
) -> PathBuf {
builder
.cargo_out(compiler, Mode::Codegen, target)
@@ -1508,7 +1507,7 @@ impl Sysroot {
}
impl Step for Sysroot {
- type Output = Interned<PathBuf>;
+ type Output = PathBuf;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
run.never()
@@ -1520,7 +1519,7 @@ impl Step for Sysroot {
/// That is, the sysroot for the stage0 compiler is not what the compiler
/// thinks it is by default, but it's the same as the default for stages
/// 1-3.
- fn run(self, builder: &Builder<'_>) -> Interned<PathBuf> {
+ fn run(self, builder: &Builder<'_>) -> PathBuf {
let compiler = self.compiler;
let host_dir = builder.out.join(compiler.host.triple);
@@ -1652,7 +1651,7 @@ impl Step for Sysroot {
);
}
- INTERNER.intern_path(sysroot)
+ sysroot
}
}
@@ -1735,7 +1734,7 @@ impl Step for Assemble {
// to not fail while linking the artifacts.
build_compiler.stage = actual_stage;
- for &backend in builder.config.codegen_backends(target_compiler.host) {
+ for backend in builder.config.codegen_backends(target_compiler.host) {
if backend == "llvm" {
continue; // Already built as part of rustc
}
@@ -1743,7 +1742,7 @@ impl Step for Assemble {
builder.ensure(CodegenBackend {
compiler: build_compiler,
target: target_compiler.host,
- backend,
+ backend: backend.clone(),
});
}
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
index 1090edc9c927e..613c58252d3bd 100644
--- a/src/bootstrap/src/core/build_steps/dist.rs
+++ b/src/bootstrap/src/core/build_steps/dist.rs
@@ -25,7 +25,6 @@ use crate::core::build_steps::llvm;
use crate::core::build_steps::tool::{self, Tool};
use crate::core::builder::{Builder, Kind, RunConfig, ShouldRun, Step};
use crate::core::config::TargetSelection;
-use crate::utils::cache::{Interned, INTERNER};
use crate::utils::channel;
use crate::utils::helpers::{exe, is_dylib, output, t, target_supports_cranelift_backend, timeit};
use crate::utils::tarball::{GeneratedTarball, OverlayKind, Tarball};
@@ -489,8 +488,7 @@ impl Step for Rustc {
}
// Debugger scripts
- builder
- .ensure(DebuggerScripts { sysroot: INTERNER.intern_path(image.to_owned()), host });
+ builder.ensure(DebuggerScripts { sysroot: image.to_owned(), host });
// Misc license info
let cp = |file: &str| {
@@ -504,9 +502,9 @@ impl Step for Rustc {
}
}
-#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
+#[derive(Debug, Clone, Hash, PartialEq, Eq)]
pub struct DebuggerScripts {
- pub sysroot: Interned<PathBuf>,
+ pub sysroot: PathBuf,
pub host: TargetSelection,
}
@@ -1264,10 +1262,10 @@ impl Step for Miri {
}
}
-#[derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)]
+#[derive(Debug, PartialOrd, Ord, Clone, Hash, PartialEq, Eq)]
pub struct CodegenBackend {
pub compiler: Compiler,
- pub backend: Interned<String>,
+ pub backend: String,
}
impl Step for CodegenBackend {
@@ -1280,14 +1278,14 @@ impl Step for CodegenBackend {
}
fn make_run(run: RunConfig<'_>) {
- for &backend in run.builder.config.codegen_backends(run.target) {
+ for backend in run.builder.config.codegen_backends(run.target) {
if backend == "llvm" {
continue; // Already built as part of rustc
}
run.builder.ensure(CodegenBackend {
compiler: run.builder.compiler(run.builder.top_stage, run.target),
- backend,
+ backend: backend.clone(),
});
}
}
@@ -1304,7 +1302,8 @@ impl Step for CodegenBackend {
return None;
}
- if !builder.config.codegen_backends(self.compiler.host).contains(&self.backend) {
+ if !builder.config.codegen_backends(self.compiler.host).contains(&self.backend.to_string())
+ {
return None;
}
@@ -1529,7 +1528,7 @@ impl Step for Extended {
add_component!("analysis" => Analysis { compiler, target });
add_component!("rustc-codegen-cranelift" => CodegenBackend {
compiler: builder.compiler(stage, target),
- backend: INTERNER.intern_str("cranelift"),
+ backend: "cranelift".to_string(),
});
let etc = builder.src.join("src/etc/installer");
diff --git a/src/bootstrap/src/core/build_steps/doc.rs b/src/bootstrap/src/core/build_steps/doc.rs
index c4235755ba865..c23cd9374a6ba 100644
--- a/src/bootstrap/src/core/build_steps/doc.rs
+++ b/src/bootstrap/src/core/build_steps/doc.rs
@@ -16,7 +16,6 @@ use crate::core::build_steps::tool::{self, prepare_tool_cargo, SourceType, Tool}
use crate::core::builder::{self, crate_description};
use crate::core::builder::{Alias, Builder, Compiler, Kind, RunConfig, ShouldRun, Step};
use crate::core::config::{Config, TargetSelection};
-use crate::utils::cache::{Interned, INTERNER};
use crate::utils::helpers::{dir_is_empty, symlink_dir, t, up_to_date};
use crate::Mode;
@@ -59,8 +58,8 @@ macro_rules! book {
)?
builder.ensure(RustbookSrc {
target: self.target,
- name: INTERNER.intern_str($book_name),
- src: INTERNER.intern_path(builder.src.join($path)),
+ name: $book_name.to_owned(),
+ src: builder.src.join($path),
parent: Some(self),
})
}
@@ -108,18 +107,18 @@ impl Step for UnstableBook {
builder.ensure(UnstableBookGen { target: self.target });
builder.ensure(RustbookSrc {
target: self.target,
- name: INTERNER.intern_str("unstable-book"),
- src: INTERNER.intern_path(builder.md_doc_out(self.target).join("unstable-book")),
+ name: "unstable-book".to_owned(),
+ src: builder.md_doc_out(self.target).join("unstable-book"),
parent: Some(self),
})
}
}
-#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
+#[derive(Debug, Clone, Hash, PartialEq, Eq)]
struct RustbookSrc<P: Step> {
target: TargetSelection,
- name: Interned<String>,
- src: Interned<PathBuf>,
+ name: String,
+ src: PathBuf,
parent: Option<P>,
}
@@ -141,7 +140,7 @@ impl<P: Step> Step for RustbookSrc<P> {
let out = builder.doc_out(target);
t!(fs::create_dir_all(&out));
- let out = out.join(name);
+ let out = out.join(&name);
let index = out.join("index.html");
let rustbook = builder.tool_exe(Tool::Rustbook);
let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook);
@@ -211,8 +210,8 @@ impl Step for TheBook {
// build book
builder.ensure(RustbookSrc {
target,
- name: INTERNER.intern_str("book"),
- src: INTERNER.intern_path(absolute_path.clone()),
+ name: "book".to_owned(),
+ src: absolute_path.clone(),
parent: Some(self),
});
@@ -220,8 +219,8 @@ impl Step for TheBook {
for edition in &["first-edition", "second-edition", "2018-edition"] {
builder.ensure(RustbookSrc {
target,
- name: INTERNER.intern_string(format!("book/{edition}")),
- src: INTERNER.intern_path(absolute_path.join(edition)),
+ name: format!("book/{edition}"),
+ src: absolute_path.join(edition),
// There should only be one book that is marked as the parent for each target, so
// treat the other editions as not having a parent.
parent: Option::<Self>::None,
@@ -526,12 +525,12 @@ impl Step for SharedAssets {
}
}
-#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Clone, Hash, PartialEq, Eq, PartialOrd, Ord)]
pub struct Std {
pub stage: u32,
pub target: TargetSelection,
pub format: DocumentationFormat,
- crates: Interned<Vec<String>>,
+ crates: Vec<String>,
}
impl Std {
@@ -546,7 +545,7 @@ impl Std {
.into_iter()
.map(|krate| krate.name.to_string())
.collect();
- Std { stage, target, format, crates: INTERNER.intern_list(crates) }
+ Std { stage, target, format, crates }
}
}
@@ -721,11 +720,11 @@ fn doc_std(
builder.cp_r(&out_dir, out);
}
-#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
+#[derive(Debug, Clone, Hash, PartialEq, Eq)]
pub struct Rustc {
pub stage: u32,
pub target: TargetSelection,
- crates: Interned<Vec<String>>,
+ crates: Vec<String>,
}
impl Rustc {
@@ -735,7 +734,7 @@ impl Rustc {
.into_iter()
.map(|krate| krate.name.to_string())
.collect();
- Self { stage, target, crates: INTERNER.intern_list(crates) }
+ Self { stage, target, crates }
}
}
@@ -1194,8 +1193,8 @@ impl Step for RustcBook {
// Run rustbook/mdbook to generate the HTML pages.
builder.ensure(RustbookSrc {
target: self.target,
- name: INTERNER.intern_str("rustc"),
- src: INTERNER.intern_path(out_base),
+ name: "rustc".to_owned(),
+ src: out_base,
parent: Some(self),
});
}
diff --git a/src/bootstrap/src/core/build_steps/install.rs b/src/bootstrap/src/core/build_steps/install.rs
index 6726671ddd9b3..41920fabaa974 100644
--- a/src/bootstrap/src/core/build_steps/install.rs
+++ b/src/bootstrap/src/core/build_steps/install.rs
@@ -13,7 +13,6 @@ use crate::core::builder::{Builder, RunConfig, ShouldRun, Step};
use crate::core::config::{Config, TargetSelection};
use crate::utils::helpers::t;
use crate::utils::tarball::GeneratedTarball;
-use crate::INTERNER;
use crate::{Compiler, Kind};
#[cfg(target_os = "illumos")]
@@ -291,7 +290,7 @@ install!((self, builder, _config),
RustcCodegenCranelift, alias = "rustc-codegen-cranelift", Self::should_build(_config), only_hosts: true, {
if let Some(tarball) = builder.ensure(dist::CodegenBackend {
compiler: self.compiler,
- backend: INTERNER.intern_str("cranelift"),
+ backend: "cranelift".to_string(),
}) {
install_sh(builder, "rustc-codegen-cranelift", self.compiler.stage, Some(self.target), &tarball);
} else {
diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
index 4a4497e57db14..659c992d59705 100644
--- a/src/bootstrap/src/core/build_steps/test.rs
+++ b/src/bootstrap/src/core/build_steps/test.rs
@@ -26,7 +26,6 @@ use crate::core::builder::{Builder, Compiler, Kind, RunConfig, ShouldRun, Step};
use crate::core::config::flags::get_completion;
use crate::core::config::flags::Subcommand;
use crate::core::config::TargetSelection;
-use crate::utils::cache::{Interned, INTERNER};
use crate::utils::exec::BootstrapCommand;
use crate::utils::helpers::{
self, add_link_lib_path, add_rustdoc_cargo_linker_args, dylib_path, dylib_path_var,
@@ -38,9 +37,9 @@ use crate::{envify, CLang, DocTests, GitRepo, Mode};
const ADB_TEST_DIR: &str = "/data/local/tmp/work";
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct CrateBootstrap {
- path: Interned<PathBuf>,
+ path: PathBuf,
host: TargetSelection,
}
@@ -58,7 +57,7 @@ impl Step for CrateBootstrap {
fn make_run(run: RunConfig<'_>) {
for path in run.paths {
- let path = INTERNER.intern_path(path.assert_single_path().path.clone());
+ let path = path.assert_single_path().path.clone();
run.builder.ensure(CrateBootstrap { host: run.target, path });
}
}
@@ -623,7 +622,7 @@ impl Step for Miri {
// miri tests need to know about the stage sysroot
cargo.env("MIRI_SYSROOT", &miri_sysroot);
- cargo.env("MIRI_HOST_SYSROOT", sysroot);
+ cargo.env("MIRI_HOST_SYSROOT", &sysroot);
cargo.env("MIRI", &miri);
if builder.config.locked_deps {
// enforce lockfiles
@@ -1646,8 +1645,10 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
}
if suite == "debuginfo" {
- builder
- .ensure(dist::DebuggerScripts { sysroot: builder.sysroot(compiler), host: target });
+ builder.ensure(dist::DebuggerScripts {
+ sysroot: builder.sysroot(compiler).to_path_buf(),
+ host: target,
+ });
}
// Also provide `rust_test_helpers` for the host.
@@ -2378,7 +2379,7 @@ impl Step for RustcGuide {
pub struct CrateLibrustc {
compiler: Compiler,
target: TargetSelection,
- crates: Vec<Interned<String>>,
+ crates: Vec<String>,
}
impl Step for CrateLibrustc {
@@ -2394,8 +2395,11 @@ impl Step for CrateLibrustc {
let builder = run.builder;
let host = run.build_triple();
let compiler = builder.compiler_for(builder.top_stage, host, host);
- let crates =
- run.paths.iter().map(|p| builder.crate_paths[&p.assert_single_path().path]).collect();
+ let crates = run
+ .paths
+ .iter()
+ .map(|p| builder.crate_paths[&p.assert_single_path().path].clone())
+ .collect();
builder.ensure(CrateLibrustc { compiler, target: run.target, crates });
}
@@ -2418,7 +2422,7 @@ impl Step for CrateLibrustc {
fn run_cargo_test<'a>(
cargo: impl Into<Command>,
libtest_args: &[&str],
- crates: &[Interned<String>],
+ crates: &[String],
primary_crate: &str,
description: impl Into<Option<&'a str>>,
compiler: Compiler,
@@ -2449,7 +2453,7 @@ fn run_cargo_test<'a>(
fn prepare_cargo_test(
cargo: impl Into<Command>,
libtest_args: &[&str],
- crates: &[Interned<String>],
+ crates: &[String],
primary_crate: &str,
compiler: Compiler,
target: TargetSelection,
@@ -2477,7 +2481,7 @@ fn prepare_cargo_test(
DocTests::No => {
let krate = &builder
.crates
- .get(&INTERNER.intern_str(primary_crate))
+ .get(primary_crate)
.unwrap_or_else(|| panic!("missing crate {primary_crate}"));
if krate.has_lib {
cargo.arg("--lib");
@@ -2487,7 +2491,7 @@ fn prepare_cargo_test(
DocTests::Yes => {}
}
- for &krate in crates {
+ for krate in crates {
cargo.arg("-p").arg(krate);
}
@@ -2529,7 +2533,7 @@ pub struct Crate {
pub compiler: Compiler,
pub target: TargetSelection,
pub mode: Mode,
- pub crates: Vec<Interned<String>>,
+ pub crates: Vec<String>,
}
impl Step for Crate {
@@ -2544,8 +2548,11 @@ impl Step for Crate {
let builder = run.builder;
let host = run.build_triple();
let compiler = builder.compiler_for(builder.top_stage, host, host);
- let crates =
- run.paths.iter().map(|p| builder.crate_paths[&p.assert_single_path().path]).collect();
+ let crates = run
+ .paths
+ .iter()
+ .map(|p| builder.crate_paths[&p.assert_single_path().path].clone())
+ .collect();
builder.ensure(Crate { compiler, target: run.target, mode: Mode::Std, crates });
}
@@ -2707,7 +2714,7 @@ impl Step for CrateRustdoc {
run_cargo_test(
cargo,
&[],
- &[INTERNER.intern_str("rustdoc:0.0.0")],
+ &["rustdoc:0.0.0".to_string()],
"rustdoc",
"rustdoc",
compiler,
@@ -2768,7 +2775,7 @@ impl Step for CrateRustdocJsonTypes {
run_cargo_test(
cargo,
libtest_args,
- &[INTERNER.intern_str("rustdoc-json-types")],
+ &["rustdoc-json-types".to_string()],
"rustdoc-json-types",
"rustdoc-json-types",
compiler,
@@ -3194,8 +3201,7 @@ impl Step for CodegenCranelift {
return;
}
- if !builder.config.codegen_backends(run.target).contains(&INTERNER.intern_str("cranelift"))
- {
+ if !builder.config.codegen_backends(run.target).contains(&"cranelift".to_owned()) {
builder.info("cranelift not in rust.codegen-backends. skipping");
return;
}
@@ -3319,7 +3325,7 @@ impl Step for CodegenGCC {
return;
}
- if !builder.config.codegen_backends(run.target).contains(&INTERNER.intern_str("gcc")) {
+ if !builder.config.codegen_backends(run.target).contains(&"gcc".to_owned()) {
builder.info("gcc not in rust.codegen-backends. skipping");
return;
}
diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs
index 8223a80c93107..4927c83760808 100644
--- a/src/bootstrap/src/core/builder.rs
+++ b/src/bootstrap/src/core/builder.rs
@@ -19,7 +19,7 @@ use crate::core::build_steps::{check, clean, compile, dist, doc, install, run, s
use crate::core::config::flags::{Color, Subcommand};
use crate::core::config::{DryRun, SplitDebuginfo, TargetSelection};
use crate::prepare_behaviour_dump_dir;
-use crate::utils::cache::{Cache, Interned, INTERNER};
+use crate::utils::cache::Cache;
use crate::utils::helpers::{self, add_dylib_path, add_link_lib_path, exe, linker_args};
use crate::utils::helpers::{check_cfg_arg, libdir, linker_flags, output, t, LldThreads};
use crate::EXTRA_CHECK_CFGS;
@@ -102,7 +102,7 @@ impl RunConfig<'_> {
/// Return a list of crate names selected by `run.paths`.
#[track_caller]
- pub fn cargo_crates_in_set(&self) -> Interned<Vec<String>> {
+ pub fn cargo_crates_in_set(&self) -> Vec<String> {
let mut crates = Vec::new();
for krate in &self.paths {
let path = krate.assert_single_path();
@@ -111,7 +111,7 @@ impl RunConfig<'_> {
};
crates.push(crate_name.to_string());
}
- INTERNER.intern_list(crates)
+ crates
}
/// Given an `alias` selected by the `Step` and the paths passed on the command line,
@@ -120,7 +120,7 @@ impl RunConfig<'_> {
/// Normally, people will pass *just* `library` if they pass it.
/// But it's possible (although strange) to pass something like `library std core`.
/// Build all crates anyway, as if they hadn't passed the other args.
- pub fn make_run_crates(&self, alias: Alias) -> Interned<Vec<String>> {
+ pub fn make_run_crates(&self, alias: Alias) -> Vec<String> {
let has_alias =
self.paths.iter().any(|set| set.assert_single_path().path.ends_with(alias.as_str()));
if !has_alias {
@@ -133,7 +133,7 @@ impl RunConfig<'_> {
};
let crate_names = crates.into_iter().map(|krate| krate.name.to_string()).collect();
- INTERNER.intern_list(crate_names)
+ crate_names
}
}
@@ -1062,26 +1062,26 @@ impl<'a> Builder<'a> {
}
}
- pub fn sysroot(&self, compiler: Compiler) -> Interned<PathBuf> {
+ pub fn sysroot(&self, compiler: Compiler) -> PathBuf {
self.ensure(compile::Sysroot::new(compiler))
}
/// Returns the libdir where the standard library and other artifacts are
/// found for a compiler's sysroot.
- pub fn sysroot_libdir(&self, compiler: Compiler, target: TargetSelection) -> Interned<PathBuf> {
+ pub fn sysroot_libdir(&self, compiler: Compiler, target: TargetSelection) -> PathBuf {
#[derive(Debug, Clone, Hash, PartialEq, Eq)]
struct Libdir {
compiler: Compiler,
target: TargetSelection,
}
impl Step for Libdir {
- type Output = Interned<PathBuf>;
+ type Output = PathBuf;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
run.never()
}
- fn run(self, builder: &Builder<'_>) -> Interned<PathBuf> {
+ fn run(self, builder: &Builder<'_>) -> PathBuf {
let lib = builder.sysroot_libdir_relative(self.compiler);
let sysroot = builder
.sysroot(self.compiler)
@@ -1110,7 +1110,7 @@ impl<'a> Builder<'a> {
);
}
- INTERNER.intern_path(sysroot)
+ sysroot
}
}
self.ensure(Libdir { compiler, target })
diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs
index 2cbebbcf4e2af..6a1dde51603be 100644
--- a/src/bootstrap/src/core/builder/tests.rs
+++ b/src/bootstrap/src/core/builder/tests.rs
@@ -608,7 +608,7 @@ mod dist {
compiler: Compiler { host, stage: 0 },
target: host,
mode: Mode::Std,
- crates: vec![INTERNER.intern_str("std")],
+ crates: vec!["std".to_owned()],
},]
);
}
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
index 326f8f57173a1..af6b6e96d349b 100644
--- a/src/bootstrap/src/core/config/config.rs
+++ b/src/bootstrap/src/core/config/config.rs
@@ -264,7 +264,7 @@ pub struct Config {
pub rustc_default_linker: Option<String>,
pub rust_optimize_tests: bool,
pub rust_dist_src: bool,
- pub rust_codegen_backends: Vec<Interned<String>>,
+ pub rust_codegen_backends: Vec<String>,
pub rust_verify_llvm_ir: bool,
pub rust_thin_lto_import_instr_limit: Option<u32>,
pub rust_remap_debuginfo: bool,
@@ -458,6 +458,8 @@ impl std::str::FromStr for RustcLto {
}
#[derive(Copy, Clone, Default, PartialEq, Eq, PartialOrd, Ord, Hash)]
+// N.B.: This type is used everywhere, and the entire codebase relies on it being Copy.
+// Making !Copy is highly nontrivial!
pub struct TargetSelection {
pub triple: Interned<String>,
file: Option<Interned<String>>,
@@ -580,7 +582,7 @@ pub struct Target {
pub wasi_root: Option<PathBuf>,
pub qemu_rootfs: Option<PathBuf>,
pub no_std: bool,
- pub codegen_backends: Option<Vec<Interned<String>>>,
+ pub codegen_backends: Option<Vec<String>>,
}
impl Target {
@@ -1163,7 +1165,7 @@ impl Config {
channel: "dev".to_string(),
codegen_tests: true,
rust_dist_src: true,
- rust_codegen_backends: vec![INTERNER.intern_str("llvm")],
+ rust_codegen_backends: vec!["llvm".to_owned()],
deny_warnings: true,
bindir: "bin".into(),
dist_include_mingw_linker: true,
@@ -1693,7 +1695,7 @@ impl Config {
}
}
- INTERNER.intern_str(s)
+ s.clone()
}).collect();
}
@@ -1880,7 +1882,7 @@ impl Config {
}
}
- INTERNER.intern_str(s)
+ s.clone()
}).collect());
}
@@ -2267,7 +2269,7 @@ impl Config {
}
pub fn llvm_enabled(&self, target: TargetSelection) -> bool {
- self.codegen_backends(target).contains(&INTERNER.intern_str("llvm"))
+ self.codegen_backends(target).contains(&"llvm".to_owned())
}
pub fn llvm_libunwind(&self, target: TargetSelection) -> LlvmLibunwind {
@@ -2286,14 +2288,14 @@ impl Config {
self.submodules.unwrap_or(rust_info.is_managed_git_subrepository())
}
- pub fn codegen_backends(&self, target: TargetSelection) -> &[Interned<String>] {
+ pub fn codegen_backends(&self, target: TargetSelection) -> &[String] {
self.target_config
.get(&target)
.and_then(|cfg| cfg.codegen_backends.as_deref())
.unwrap_or(&self.rust_codegen_backends)
}
- pub fn default_codegen_backend(&self, target: TargetSelection) -> Option<Interned<String>> {
+ pub fn default_codegen_backend(&self, target: TargetSelection) -> Option<String> {
self.codegen_backends(target).first().cloned()
}
diff --git a/src/bootstrap/src/core/metadata.rs b/src/bootstrap/src/core/metadata.rs
index 5802082326a88..08a96407a6917 100644
--- a/src/bootstrap/src/core/metadata.rs
+++ b/src/bootstrap/src/core/metadata.rs
@@ -3,7 +3,6 @@ use std::process::Command;
use serde_derive::Deserialize;
-use crate::utils::cache::INTERNER;
use crate::utils::helpers::output;
use crate::{t, Build, Crate};
@@ -43,19 +42,19 @@ struct Target {
pub fn build(build: &mut Build) {
for package in workspace_members(build) {
if package.source.is_none() {
- let name = INTERNER.intern_string(package.name);
+ let name = package.name;
let mut path = PathBuf::from(package.manifest_path);
path.pop();
let deps = package
.dependencies
.into_iter()
.filter(|dep| dep.source.is_none())
- .map(|dep| INTERNER.intern_string(dep.name))
+ .map(|dep| dep.name)
.collect();
let has_lib = package.targets.iter().any(|t| t.kind.iter().any(|k| k == "lib"));
- let krate = Crate { name, deps, path, has_lib };
+ let krate = Crate { name: name.clone(), deps, path, has_lib };
let relative_path = krate.local_path(build);
- build.crates.insert(name, krate);
+ build.crates.insert(name.clone(), krate);
let existing_path = build.crate_paths.insert(relative_path, name);
assert!(
existing_path.is_none(),
diff --git a/src/bootstrap/src/core/sanity.rs b/src/bootstrap/src/core/sanity.rs
index 1dce8d8ac7184..81acd65d85142 100644
--- a/src/bootstrap/src/core/sanity.rs
+++ b/src/bootstrap/src/core/sanity.rs
@@ -15,6 +15,7 @@ use std::fs;
use std::path::PathBuf;
use std::process::Command;
+use crate::builder::Kind;
use crate::core::config::Target;
use crate::utils::helpers::output;
use crate::Build;
@@ -64,6 +65,8 @@ pub fn check(build: &mut Build) {
let mut skip_target_sanity =
env::var_os("BOOTSTRAP_SKIP_TARGET_SANITY").is_some_and(|s| s == "1" || s == "true");
+ skip_target_sanity |= build.config.cmd.kind() == Kind::Check;
+
// Skip target sanity checks when we are doing anything with mir-opt tests or Miri
let skipped_paths = [OsStr::new("mir-opt"), OsStr::new("miri")];
skip_target_sanity |= build.config.paths.iter().any(|path| {
@@ -169,11 +172,7 @@ than building it.
continue;
}
- // Some environments don't want or need these tools, such as when testing Miri.
- // FIXME: it would be better to refactor this code to split necessary setup from pure sanity
- // checks, and have a regular flag for skipping the latter. Also see
- // <https://github.com/rust-lang/rust/pull/103569#discussion_r1008741742>.
- if skip_target_sanity {
+ if skip_target_sanity && target != &build.build {
continue;
}
@@ -215,11 +214,7 @@ than building it.
panic!("All the *-none-* and nvptx* targets are no-std targets")
}
- // Some environments don't want or need these tools, such as when testing Miri.
- // FIXME: it would be better to refactor this code to split necessary setup from pure sanity
- // checks, and have a regular flag for skipping the latter. Also see
- // <https://github.com/rust-lang/rust/pull/103569#discussion_r1008741742>.
- if skip_target_sanity {
+ if skip_target_sanity && target != &build.build {
continue;
}
diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
index ab8f3c0d9e497..a252aaac97d74 100644
--- a/src/bootstrap/src/lib.rs
+++ b/src/bootstrap/src/lib.rs
@@ -41,7 +41,6 @@ use crate::core::builder::Kind;
use crate::core::config::{flags, LldMode};
use crate::core::config::{DryRun, Target};
use crate::core::config::{LlvmLibunwind, TargetSelection};
-use crate::utils::cache::{Interned, INTERNER};
use crate::utils::exec::{BehaviorOnFailure, BootstrapCommand, OutputMode};
use crate::utils::helpers::{self, dir_is_empty, exe, libdir, mtime, output, symlink_dir};
@@ -191,8 +190,8 @@ pub struct Build {
ranlib: RefCell<HashMap<TargetSelection, PathBuf>>,
// Miscellaneous
// allow bidirectional lookups: both name -> path and path -> name
- crates: HashMap<Interned<String>, Crate>,
- crate_paths: HashMap<PathBuf, Interned<String>>,
+ crates: HashMap<String, Crate>,
+ crate_paths: HashMap<PathBuf, String>,
is_sudo: bool,
ci_env: CiEnv,
delayed_failures: RefCell<Vec<String>>,
@@ -204,8 +203,8 @@ pub struct Build {
#[derive(Debug, Clone)]
struct Crate {
- name: Interned<String>,
- deps: HashSet<Interned<String>>,
+ name: String,
+ deps: HashSet<String>,
path: PathBuf,
has_lib: bool,
}
@@ -829,8 +828,8 @@ impl Build {
}
/// Output directory for some generated md crate documentation for a target (temporary)
- fn md_doc_out(&self, target: TargetSelection) -> Interned<PathBuf> {
- INTERNER.intern_path(self.out.join(&*target.triple).join("md-doc"))
+ fn md_doc_out(&self, target: TargetSelection) -> PathBuf {
+ self.out.join(&*target.triple).join("md-doc")
}
/// Returns `true` if this is an external version of LLVM not managed by bootstrap.
@@ -1538,7 +1537,7 @@ impl Build {
/// "local" crates (those in the local source tree, not from a registry).
fn in_tree_crates(&self, root: &str, target: Option<TargetSelection>) -> Vec<&Crate> {
let mut ret = Vec::new();
- let mut list = vec![INTERNER.intern_str(root)];
+ let mut list = vec![root.to_owned()];
let mut visited = HashSet::new();
while let Some(krate) = list.pop() {
let krate = self
@@ -1564,11 +1563,11 @@ impl Build {
&& (dep != "rustc_codegen_llvm"
|| self.config.hosts.iter().any(|host| self.config.llvm_enabled(*host)))
{
- list.push(*dep);
+ list.push(dep.clone());
}
}
}
- ret.sort_unstable_by_key(|krate| krate.name); // reproducible order needed for tests
+ ret.sort_unstable_by_key(|krate| krate.name.clone()); // reproducible order needed for tests
ret
}
diff --git a/src/bootstrap/src/utils/cache.rs b/src/bootstrap/src/utils/cache.rs
index 2b86585a9d3c0..e18dcbb47bea0 100644
--- a/src/bootstrap/src/utils/cache.rs
+++ b/src/bootstrap/src/utils/cache.rs
@@ -194,17 +194,6 @@ impl Interner {
pub fn intern_str(&self, s: &str) -> Interned<String> {
self.strs.lock().unwrap().intern_borrow(s)
}
- pub fn intern_string(&self, s: String) -> Interned<String> {
- self.strs.lock().unwrap().intern(s)
- }
-
- pub fn intern_path(&self, s: PathBuf) -> Interned<PathBuf> {
- self.paths.lock().unwrap().intern(s)
- }
-
- pub fn intern_list(&self, v: Vec<String>) -> Interned<Vec<String>> {
- self.lists.lock().unwrap().intern(v)
- }
}
pub static INTERNER: Lazy<Interner> = Lazy::new(Interner::default);
diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-llvm-17/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-17/Dockerfile
index fe30a95344104..1eedfe3f09b4d 100644
--- a/src/ci/docker/host-x86_64/x86_64-gnu-llvm-17/Dockerfile
+++ b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-17/Dockerfile
@@ -42,6 +42,10 @@ RUN sh /scripts/sccache.sh
ENV NO_DOWNLOAD_CI_LLVM 1
ENV EXTERNAL_LLVM 1
+# This is not the latest LLVM version, so some components required by tests may
+# be missing.
+ENV IS_NOT_LATEST_LLVM 1
+
# Using llvm-link-shared due to libffi issues -- see #34486
ENV RUST_CONFIGURE_ARGS \
--build=x86_64-unknown-linux-gnu \
diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-llvm-18/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-18/Dockerfile
new file mode 100644
index 0000000000000..e8383500dfc94
--- /dev/null
+++ b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-18/Dockerfile
@@ -0,0 +1,55 @@
+FROM ubuntu:24.04
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+ g++ \
+ gcc-multilib \
+ make \
+ ninja-build \
+ file \
+ curl \
+ ca-certificates \
+ python3 \
+ git \
+ cmake \
+ sudo \
+ gdb \
+ llvm-18-tools \
+ llvm-18-dev \
+ libedit-dev \
+ libssl-dev \
+ pkg-config \
+ zlib1g-dev \
+ xz-utils \
+ nodejs \
+ mingw-w64 \
+ libgccjit-13-dev \
+ && rm -rf /var/lib/apt/lists/*
+
+# Note: libgccjit needs to match the default gcc version for the linker to find it.
+
+# Install powershell (universal package) so we can test x.ps1 on Linux
+# FIXME: need a "universal" version that supports libicu74, but for now it still works to ignore that dep.
+RUN curl -sL "https://github.com/PowerShell/PowerShell/releases/download/v7.3.1/powershell_7.3.1-1.deb_amd64.deb" > powershell.deb && \
+ dpkg --ignore-depends=libicu72 -i powershell.deb && \
+ rm -f powershell.deb
+
+COPY scripts/sccache.sh /scripts/
+RUN sh /scripts/sccache.sh
+
+# We are disabling CI LLVM since this builder is intentionally using a host
+# LLVM, rather than the typical src/llvm-project LLVM.
+ENV NO_DOWNLOAD_CI_LLVM 1
+ENV EXTERNAL_LLVM 1
+
+# Using llvm-link-shared due to libffi issues -- see #34486
+ENV RUST_CONFIGURE_ARGS \
+ --build=x86_64-unknown-linux-gnu \
+ --llvm-root=/usr/lib/llvm-18 \
+ --enable-llvm-link-shared \
+ --set rust.thin-lto-import-instr-limit=10
+
+COPY host-x86_64/x86_64-gnu-llvm-16/script.sh /tmp/
+
+ENV SCRIPT /tmp/script.sh
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 2ba5d357a1d00..c392ccec3dc2b 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -510,6 +510,11 @@ jobs:
- name: x86_64-gnu-distcheck
<<: *job-linux-8c
+ - name: x86_64-gnu-llvm-18
+ env:
+ RUST_BACKTRACE: 1
+ <<: *job-linux-8c
+
- name: x86_64-gnu-llvm-17
env:
RUST_BACKTRACE: 1
diff --git a/src/tools/tidy/src/fluent_alphabetical.rs b/src/tools/tidy/src/fluent_alphabetical.rs
index 67b745373f019..9803b6eab2db5 100644
--- a/src/tools/tidy/src/fluent_alphabetical.rs
+++ b/src/tools/tidy/src/fluent_alphabetical.rs
@@ -1,6 +1,7 @@
//! Checks that all Flunt files have messages in alphabetical order
use crate::walk::{filter_dirs, walk};
+use std::collections::HashMap;
use std::{fs::OpenOptions, io::Write, path::Path};
use regex::Regex;
@@ -13,11 +14,27 @@ fn filter_fluent(path: &Path) -> bool {
if let Some(ext) = path.extension() { ext.to_str() != Some("ftl") } else { true }
}
-fn check_alphabetic(filename: &str, fluent: &str, bad: &mut bool) {
+fn check_alphabetic(
+ filename: &str,
+ fluent: &str,
+ bad: &mut bool,
+ all_defined_msgs: &mut HashMap<String, String>,
+) {
let mut matches = MESSAGE.captures_iter(fluent).peekable();
while let Some(m) = matches.next() {
+ let name = m.get(1).unwrap();
+ if let Some(defined_filename) = all_defined_msgs.get(name.as_str()) {
+ tidy_error!(
+ bad,
+ "{filename}: message `{}` is already defined in {}",
+ name.as_str(),
+ defined_filename,
+ );
+ }
+
+ all_defined_msgs.insert(name.as_str().to_owned(), filename.to_owned());
+
if let Some(next) = matches.peek() {
- let name = m.get(1).unwrap();
let next = next.get(1).unwrap();
if name.as_str() > next.as_str() {
tidy_error!(
@@ -34,13 +51,29 @@ run `./x.py test tidy --bless` to sort the file correctly",
}
}
-fn sort_messages(fluent: &str) -> String {
+fn sort_messages(
+ filename: &str,
+ fluent: &str,
+ bad: &mut bool,
+ all_defined_msgs: &mut HashMap<String, String>,
+) -> String {
let mut chunks = vec![];
let mut cur = String::new();
for line in fluent.lines() {
- if MESSAGE.is_match(line) {
+ if let Some(name) = MESSAGE.find(line) {
+ if let Some(defined_filename) = all_defined_msgs.get(name.as_str()) {
+ tidy_error!(
+ bad,
+ "{filename}: message `{}` is already defined in {}",
+ name.as_str(),
+ defined_filename,
+ );
+ }
+
+ all_defined_msgs.insert(name.as_str().to_owned(), filename.to_owned());
chunks.push(std::mem::take(&mut cur));
}
+
cur += line;
cur.push('\n');
}
@@ -53,20 +86,33 @@ fn sort_messages(fluent: &str) -> String {
}
pub fn check(path: &Path, bless: bool, bad: &mut bool) {
+ let mut all_defined_msgs = HashMap::new();
walk(
path,
|path, is_dir| filter_dirs(path) || (!is_dir && filter_fluent(path)),
&mut |ent, contents| {
if bless {
- let sorted = sort_messages(contents);
+ let sorted = sort_messages(
+ ent.path().to_str().unwrap(),
+ contents,
+ bad,
+ &mut all_defined_msgs,
+ );
if sorted != contents {
let mut f =
OpenOptions::new().write(true).truncate(true).open(ent.path()).unwrap();
f.write(sorted.as_bytes()).unwrap();
}
} else {
- check_alphabetic(ent.path().to_str().unwrap(), contents, bad);
+ check_alphabetic(
+ ent.path().to_str().unwrap(),
+ contents,
+ bad,
+ &mut all_defined_msgs,
+ );
}
},
);
+
+ crate::fluent_used::check(path, all_defined_msgs, bad);
}
diff --git a/src/tools/tidy/src/fluent_used.rs b/src/tools/tidy/src/fluent_used.rs
new file mode 100644
index 0000000000000..b73e79cb38d94
--- /dev/null
+++ b/src/tools/tidy/src/fluent_used.rs
@@ -0,0 +1,43 @@
+//! Checks that all Fluent messages appear at least twice
+
+use crate::walk::{filter_dirs, walk};
+use regex::Regex;
+use std::collections::HashMap;
+use std::path::Path;
+
+lazy_static::lazy_static! {
+ static ref WORD: Regex = Regex::new(r"\w+").unwrap();
+}
+
+fn filter_used_messages(
+ contents: &str,
+ msgs_not_appeared_yet: &mut HashMap<String, String>,
+ msgs_appeared_only_once: &mut HashMap<String, String>,
+) {
+ // we don't just check messages never appear in Rust files,
+ // because messages can be used as parts of other fluent messages in Fluent files,
+ // so we do checking messages appear only once in all Rust and Fluent files.
+ let mut matches = WORD.find_iter(contents);
+ while let Some(name) = matches.next() {
+ if let Some((name, filename)) = msgs_not_appeared_yet.remove_entry(name.as_str()) {
+ // if one msg appears for the first time,
+ // remove it from `msgs_not_appeared_yet` and insert it into `msgs_appeared_only_once`.
+ msgs_appeared_only_once.insert(name, filename);
+ } else {
+ // if one msg appears for the second time,
+ // remove it from `msgs_appeared_only_once`.
+ msgs_appeared_only_once.remove(name.as_str());
+ }
+ }
+}
+
+pub fn check(path: &Path, mut all_defined_msgs: HashMap<String, String>, bad: &mut bool) {
+ let mut msgs_appear_only_once = HashMap::new();
+ walk(path, |path, _| filter_dirs(path), &mut |_, contents| {
+ filter_used_messages(contents, &mut all_defined_msgs, &mut msgs_appear_only_once);
+ });
+
+ for (name, filename) in msgs_appear_only_once {
+ tidy_error!(bad, "{filename}: message `{}` is not used", name,);
+ }
+}
diff --git a/src/tools/tidy/src/lib.rs b/src/tools/tidy/src/lib.rs
index 6f3ade0ab58c7..670b7eb2be995 100644
--- a/src/tools/tidy/src/lib.rs
+++ b/src/tools/tidy/src/lib.rs
@@ -65,6 +65,7 @@ pub mod ext_tool_checks;
pub mod extdeps;
pub mod features;
pub mod fluent_alphabetical;
+mod fluent_used;
pub(crate) mod iter_header;
pub mod mir_opt_tests;
pub mod pal;
diff --git a/tests/ui/lint/non_local_definitions.rs b/tests/ui/lint/non_local_definitions.rs
index bbcc81898713c..eee582a6f11ba 100644
--- a/tests/ui/lint/non_local_definitions.rs
+++ b/tests/ui/lint/non_local_definitions.rs
@@ -1,7 +1,7 @@
//@ check-pass
//@ edition:2021
//@ aux-build:non_local_macro.rs
-//@ rustc-env:CARGO=/usr/bin/cargo
+//@ rustc-env:CARGO_CRATE_NAME=non_local_def
#![feature(inline_const)]
#![warn(non_local_definitions)]
@@ -245,6 +245,26 @@ fn bad() {
//~^ WARN non-local `impl` definition
}
+trait Uto9 {}
+trait Uto10 {}
+const _: u32 = {
+ let _a = || {
+ impl Uto9 for Test {}
+ //~^ WARN non-local `impl` definition
+
+ 1
+ };
+
+ type A = [u32; {
+ impl Uto10 for Test {}
+ //~^ WARN non-local `impl` definition
+
+ 1
+ }];
+
+ 1
+};
+
struct UwU<T>(T);
fn fun() {
diff --git a/tests/ui/lint/non_local_definitions.stderr b/tests/ui/lint/non_local_definitions.stderr
index b9583ae983f34..ef74e262f9dbc 100644
--- a/tests/ui/lint/non_local_definitions.stderr
+++ b/tests/ui/lint/non_local_definitions.stderr
@@ -442,7 +442,29 @@ LL | impl<T> Uto8 for T {}
= note: this lint may become deny-by-default in the edition 2024 and higher, see the tracking issue <https://github.com/rust-lang/rust/issues/120363>
warning: non-local `impl` definition, they should be avoided as they go against expectation
- --> $DIR/non_local_definitions.rs:253:5
+ --> $DIR/non_local_definitions.rs:252:9
+ |
+LL | impl Uto9 for Test {}
+ | ^^^^^^^^^^^^^^^^^^^^^
+ |
+ = help: move this `impl` block outside the of the current closure `<unnameable>` and up 2 bodies
+ = note: an `impl` definition is non-local if it is nested inside an item and neither the type nor the trait are at the same nesting level as the `impl` block
+ = note: one exception to the rule are anon-const (`const _: () = { ... }`) at top-level module and anon-const at the same nesting as the trait or type
+ = note: this lint may become deny-by-default in the edition 2024 and higher, see the tracking issue <https://github.com/rust-lang/rust/issues/120363>
+
+warning: non-local `impl` definition, they should be avoided as they go against expectation
+ --> $DIR/non_local_definitions.rs:259:9
+ |
+LL | impl Uto10 for Test {}
+ | ^^^^^^^^^^^^^^^^^^^^^^
+ |
+ = help: move this `impl` block outside the of the current constant expression `<unnameable>` and up 2 bodies
+ = note: an `impl` definition is non-local if it is nested inside an item and neither the type nor the trait are at the same nesting level as the `impl` block
+ = note: one exception to the rule are anon-const (`const _: () = { ... }`) at top-level module and anon-const at the same nesting as the trait or type
+ = note: this lint may become deny-by-default in the edition 2024 and higher, see the tracking issue <https://github.com/rust-lang/rust/issues/120363>
+
+warning: non-local `impl` definition, they should be avoided as they go against expectation
+ --> $DIR/non_local_definitions.rs:273:5
|
LL | / impl Default for UwU<OwO> {
LL | |
@@ -458,7 +480,7 @@ LL | | }
= note: this lint may become deny-by-default in the edition 2024 and higher, see the tracking issue <https://github.com/rust-lang/rust/issues/120363>
warning: non-local `impl` definition, they should be avoided as they go against expectation
- --> $DIR/non_local_definitions.rs:264:5
+ --> $DIR/non_local_definitions.rs:284:5
|
LL | / impl From<Cat> for () {
LL | |
@@ -474,7 +496,7 @@ LL | | }
= note: this lint may become deny-by-default in the edition 2024 and higher, see the tracking issue <https://github.com/rust-lang/rust/issues/120363>
warning: non-local `impl` definition, they should be avoided as they go against expectation
- --> $DIR/non_local_definitions.rs:273:5
+ --> $DIR/non_local_definitions.rs:293:5
|
LL | / impl AsRef<Cat> for () {
LL | |
@@ -488,7 +510,7 @@ LL | | }
= note: this lint may become deny-by-default in the edition 2024 and higher, see the tracking issue <https://github.com/rust-lang/rust/issues/120363>
warning: non-local `impl` definition, they should be avoided as they go against expectation
- --> $DIR/non_local_definitions.rs:284:5
+ --> $DIR/non_local_definitions.rs:304:5
|
LL | / impl PartialEq<B> for G {
LL | |
@@ -504,7 +526,7 @@ LL | | }
= note: this lint may become deny-by-default in the edition 2024 and higher, see the tracking issue <https://github.com/rust-lang/rust/issues/120363>
warning: non-local `impl` definition, they should be avoided as they go against expectation
- --> $DIR/non_local_definitions.rs:301:5
+ --> $DIR/non_local_definitions.rs:321:5
|
LL | / impl PartialEq<Dog> for &Dog {
LL | |
@@ -520,7 +542,7 @@ LL | | }
= note: this lint may become deny-by-default in the edition 2024 and higher, see the tracking issue <https://github.com/rust-lang/rust/issues/120363>
warning: non-local `impl` definition, they should be avoided as they go against expectation
- --> $DIR/non_local_definitions.rs:308:5
+ --> $DIR/non_local_definitions.rs:328:5
|
LL | / impl PartialEq<()> for Dog {
LL | |
@@ -536,7 +558,7 @@ LL | | }
= note: this lint may become deny-by-default in the edition 2024 and higher, see the tracking issue <https://github.com/rust-lang/rust/issues/120363>
warning: non-local `impl` definition, they should be avoided as they go against expectation
- --> $DIR/non_local_definitions.rs:315:5
+ --> $DIR/non_local_definitions.rs:335:5
|
LL | / impl PartialEq<()> for &Dog {
LL | |
@@ -552,7 +574,7 @@ LL | | }
= note: this lint may become deny-by-default in the edition 2024 and higher, see the tracking issue <https://github.com/rust-lang/rust/issues/120363>
warning: non-local `impl` definition, they should be avoided as they go against expectation
- --> $DIR/non_local_definitions.rs:322:5
+ --> $DIR/non_local_definitions.rs:342:5
|
LL | / impl PartialEq<Dog> for () {
LL | |
@@ -568,7 +590,7 @@ LL | | }
= note: this lint may become deny-by-default in the edition 2024 and higher, see the tracking issue <https://github.com/rust-lang/rust/issues/120363>
warning: non-local `impl` definition, they should be avoided as they go against expectation
- --> $DIR/non_local_definitions.rs:344:5
+ --> $DIR/non_local_definitions.rs:364:5
|
LL | / impl From<Wrap<Wrap<Lion>>> for () {
LL | |
@@ -584,7 +606,7 @@ LL | | }
= note: this lint may become deny-by-default in the edition 2024 and higher, see the tracking issue <https://github.com/rust-lang/rust/issues/120363>
warning: non-local `impl` definition, they should be avoided as they go against expectation
- --> $DIR/non_local_definitions.rs:351:5
+ --> $DIR/non_local_definitions.rs:371:5
|
LL | / impl From<()> for Wrap<Lion> {
LL | |
@@ -600,7 +622,7 @@ LL | | }
= note: this lint may become deny-by-default in the edition 2024 and higher, see the tracking issue <https://github.com/rust-lang/rust/issues/120363>
warning: non-local `impl` definition, they should be avoided as they go against expectation
- --> $DIR/non_local_definitions.rs:364:13
+ --> $DIR/non_local_definitions.rs:384:13
|
LL | impl MacroTrait for OutsideStruct {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -615,7 +637,7 @@ LL | m!();
= note: this warning originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
warning: non-local `impl` definition, they should be avoided as they go against expectation
- --> $DIR/non_local_definitions.rs:374:1
+ --> $DIR/non_local_definitions.rs:394:1
|
LL | non_local_macro::non_local_impl!(CargoUpdate);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -628,7 +650,7 @@ LL | non_local_macro::non_local_impl!(CargoUpdate);
= note: this warning originates in the macro `non_local_macro::non_local_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
warning: non-local `macro_rules!` definition, they should be avoided as they go against expectation
- --> $DIR/non_local_definitions.rs:377:1
+ --> $DIR/non_local_definitions.rs:397:1
|
LL | non_local_macro::non_local_macro_rules!(my_macro);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -640,5 +662,5 @@ LL | non_local_macro::non_local_macro_rules!(my_macro);
= note: the macro `non_local_macro::non_local_macro_rules` may come from an old version of the `non_local_macro` crate, try updating your dependency with `cargo update -p non_local_macro`
= note: this warning originates in the macro `non_local_macro::non_local_macro_rules` (in Nightly builds, run with -Z macro-backtrace for more info)
-warning: 50 warnings emitted
+warning: 52 warnings emitted
diff --git a/tests/ui/parser/help-set-edition-ice-122130.rs b/tests/ui/parser/help-set-edition-ice-122130.rs
new file mode 100644
index 0000000000000..bc5af04ecbc0c
--- /dev/null
+++ b/tests/ui/parser/help-set-edition-ice-122130.rs
@@ -0,0 +1,5 @@
+enum will {
+ s#[c"owned_box"]
+ //~^ERROR expected one of `(`, `,`, `=`, `{`, or `}`, found `#`
+ //~|ERROR expected item, found `"owned_box"`
+}
diff --git a/tests/ui/parser/help-set-edition-ice-122130.stderr b/tests/ui/parser/help-set-edition-ice-122130.stderr
new file mode 100644
index 0000000000000..fe4d212f2db65
--- /dev/null
+++ b/tests/ui/parser/help-set-edition-ice-122130.stderr
@@ -0,0 +1,21 @@
+error: expected one of `(`, `,`, `=`, `{`, or `}`, found `#`
+ --> $DIR/help-set-edition-ice-122130.rs:2:6
+ |
+LL | s#[c"owned_box"]
+ | ^ expected one of `(`, `,`, `=`, `{`, or `}`
+ |
+ = note: you may be trying to write a c-string literal
+ = note: c-string literals require Rust 2021 or later
+ = help: pass `--edition 2021` to `rustc`
+ = note: for more on editions, read https://doc.rust-lang.org/edition-guide
+
+error: expected item, found `"owned_box"`
+ --> $DIR/help-set-edition-ice-122130.rs:2:9
+ |
+LL | s#[c"owned_box"]
+ | ^^^^^^^^^^^ expected item
+ |
+ = note: for a full list of items that can appear in modules, see <https://doc.rust-lang.org/reference/items.html>
+
+error: aborting due to 2 previous errors
+