mirror of
https://github.com/rust-lang/rust.git
synced 2025-06-04 19:29:07 +00:00
Auto merge of #137235 - matthiaskrgr:rollup-2kjua2t, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - #135711 (Do not ICE on default_field_value const with lifetimes) - #136599 (librustdoc: more usages of `Joined::joined`) - #136876 (Locking documentation updates) - #137000 (Deeply normalize item bounds in new solver) - #137126 (fix docs for inherent str constructors) - #137161 (Pattern Migration 2024: fix incorrect messages/suggestions when errors arise in macro expansions) - #137191 (Update mdbook and move error_index_generator) - #137203 (Improve MIR modification) - #137206 (Make E0599 a structured error) - #137218 (misc `layout_of` cleanup) r? `@ghost` `@rustbot` modify labels: rollup
This commit is contained in:
bors
commit
f44efbf9e1
194
Cargo.lock
194
Cargo.lock
@ -61,19 +61,6 @@ version = "0.2.21"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
|
checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "ammonia"
|
|
||||||
version = "4.0.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "1ab99eae5ee58501ab236beb6f20f6ca39be615267b014899c89b2f0bc18a459"
|
|
||||||
dependencies = [
|
|
||||||
"html5ever",
|
|
||||||
"maplit",
|
|
||||||
"once_cell",
|
|
||||||
"tendril",
|
|
||||||
"url",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "android-tzdata"
|
name = "android-tzdata"
|
||||||
version = "0.1.1"
|
version = "0.1.1"
|
||||||
@ -513,16 +500,6 @@ dependencies = [
|
|||||||
"anstyle",
|
"anstyle",
|
||||||
"clap_lex",
|
"clap_lex",
|
||||||
"strsim",
|
"strsim",
|
||||||
"terminal_size",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "clap_complete"
|
|
||||||
version = "4.5.42"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "33a7e468e750fa4b6be660e8b5651ad47372e8fb114030b594c2d75d48c5ffd0"
|
|
||||||
dependencies = [
|
|
||||||
"clap",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1084,18 +1061,6 @@ version = "1.13.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
|
checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "elasticlunr-rs"
|
|
||||||
version = "3.0.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "41e83863a500656dfa214fee6682de9c5b9f03de6860fec531235ed2ae9f6571"
|
|
||||||
dependencies = [
|
|
||||||
"regex",
|
|
||||||
"serde",
|
|
||||||
"serde_derive",
|
|
||||||
"serde_json",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "elsa"
|
name = "elsa"
|
||||||
version = "1.11.0"
|
version = "1.11.0"
|
||||||
@ -1159,13 +1124,6 @@ dependencies = [
|
|||||||
"windows-sys 0.59.0",
|
"windows-sys 0.59.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "error_index_generator"
|
|
||||||
version = "0.0.0"
|
|
||||||
dependencies = [
|
|
||||||
"mdbook",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "expect-test"
|
name = "expect-test"
|
||||||
version = "1.5.1"
|
version = "1.5.1"
|
||||||
@ -1517,22 +1475,6 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "handlebars"
|
|
||||||
version = "6.3.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "3d6b224b95c1e668ac0270325ad563b2eef1469fbbb8959bc7c692c844b813d9"
|
|
||||||
dependencies = [
|
|
||||||
"derive_builder",
|
|
||||||
"log",
|
|
||||||
"num-order",
|
|
||||||
"pest",
|
|
||||||
"pest_derive",
|
|
||||||
"serde",
|
|
||||||
"serde_json",
|
|
||||||
"thiserror 2.0.11",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hashbrown"
|
name = "hashbrown"
|
||||||
version = "0.14.5"
|
version = "0.14.5"
|
||||||
@ -2189,12 +2131,6 @@ version = "0.1.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
|
checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "maplit"
|
|
||||||
version = "1.0.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "markup5ever"
|
name = "markup5ever"
|
||||||
version = "0.12.1"
|
version = "0.12.1"
|
||||||
@ -2228,34 +2164,6 @@ dependencies = [
|
|||||||
"digest",
|
"digest",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "mdbook"
|
|
||||||
version = "0.4.43"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "fe1f98b8d66e537d2f0ba06e7dec4f44001deec539a2d18bfc102d6a86189148"
|
|
||||||
dependencies = [
|
|
||||||
"ammonia",
|
|
||||||
"anyhow",
|
|
||||||
"chrono",
|
|
||||||
"clap",
|
|
||||||
"clap_complete",
|
|
||||||
"elasticlunr-rs",
|
|
||||||
"env_logger",
|
|
||||||
"handlebars",
|
|
||||||
"log",
|
|
||||||
"memchr",
|
|
||||||
"once_cell",
|
|
||||||
"opener",
|
|
||||||
"pulldown-cmark 0.10.3",
|
|
||||||
"regex",
|
|
||||||
"serde",
|
|
||||||
"serde_json",
|
|
||||||
"shlex",
|
|
||||||
"tempfile",
|
|
||||||
"toml 0.5.11",
|
|
||||||
"topological-sort",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "measureme"
|
name = "measureme"
|
||||||
version = "11.0.1"
|
version = "11.0.1"
|
||||||
@ -2483,21 +2391,6 @@ dependencies = [
|
|||||||
"num-traits",
|
"num-traits",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "num-modular"
|
|
||||||
version = "0.6.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "17bb261bf36fa7d83f4c294f834e91256769097b3cb505d44831e0a179ac647f"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "num-order"
|
|
||||||
version = "1.2.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "537b596b97c40fcf8056d153049eb22f481c17ebce72a513ec9286e4986d1bb6"
|
|
||||||
dependencies = [
|
|
||||||
"num-modular",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num-rational"
|
name = "num-rational"
|
||||||
version = "0.4.2"
|
version = "0.4.2"
|
||||||
@ -2718,51 +2611,6 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "pest"
|
|
||||||
version = "2.7.15"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc"
|
|
||||||
dependencies = [
|
|
||||||
"memchr",
|
|
||||||
"thiserror 2.0.11",
|
|
||||||
"ucd-trie",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "pest_derive"
|
|
||||||
version = "2.7.15"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e"
|
|
||||||
dependencies = [
|
|
||||||
"pest",
|
|
||||||
"pest_generator",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "pest_generator"
|
|
||||||
version = "2.7.15"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b"
|
|
||||||
dependencies = [
|
|
||||||
"pest",
|
|
||||||
"pest_meta",
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn 2.0.96",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "pest_meta"
|
|
||||||
version = "2.7.15"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea"
|
|
||||||
dependencies = [
|
|
||||||
"once_cell",
|
|
||||||
"pest",
|
|
||||||
"sha2",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "phf"
|
name = "phf"
|
||||||
version = "0.11.3"
|
version = "0.11.3"
|
||||||
@ -2921,18 +2769,6 @@ dependencies = [
|
|||||||
"unicase",
|
"unicase",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "pulldown-cmark"
|
|
||||||
version = "0.10.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "76979bea66e7875e7509c4ec5300112b316af87fa7a252ca91c448b32dfe3993"
|
|
||||||
dependencies = [
|
|
||||||
"bitflags",
|
|
||||||
"memchr",
|
|
||||||
"pulldown-cmark-escape 0.10.1",
|
|
||||||
"unicase",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pulldown-cmark"
|
name = "pulldown-cmark"
|
||||||
version = "0.11.3"
|
version = "0.11.3"
|
||||||
@ -2941,16 +2777,10 @@ checksum = "679341d22c78c6c649893cbd6c3278dcbe9fc4faa62fea3a9296ae2b50c14625"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"memchr",
|
"memchr",
|
||||||
"pulldown-cmark-escape 0.11.0",
|
"pulldown-cmark-escape",
|
||||||
"unicase",
|
"unicase",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "pulldown-cmark-escape"
|
|
||||||
version = "0.10.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "bd348ff538bc9caeda7ee8cad2d1d48236a1f443c1fa3913c6a02fe0043b1dd3"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pulldown-cmark-escape"
|
name = "pulldown-cmark-escape"
|
||||||
version = "0.11.0"
|
version = "0.11.0"
|
||||||
@ -5310,16 +5140,6 @@ dependencies = [
|
|||||||
"winapi-util",
|
"winapi-util",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "terminal_size"
|
|
||||||
version = "0.4.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9"
|
|
||||||
dependencies = [
|
|
||||||
"rustix",
|
|
||||||
"windows-sys 0.59.0",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "termize"
|
name = "termize"
|
||||||
version = "0.1.1"
|
version = "0.1.1"
|
||||||
@ -5560,12 +5380,6 @@ dependencies = [
|
|||||||
"winnow",
|
"winnow",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "topological-sort"
|
|
||||||
version = "0.2.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tracing"
|
name = "tracing"
|
||||||
version = "0.1.37"
|
version = "0.1.37"
|
||||||
@ -5686,12 +5500,6 @@ dependencies = [
|
|||||||
"regex-lite",
|
"regex-lite",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "ucd-trie"
|
|
||||||
version = "0.1.7"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ui_test"
|
name = "ui_test"
|
||||||
version = "0.26.5"
|
version = "0.26.5"
|
||||||
|
|||||||
@ -13,7 +13,6 @@ members = [
|
|||||||
"src/tools/clippy/clippy_dev",
|
"src/tools/clippy/clippy_dev",
|
||||||
"src/tools/compiletest",
|
"src/tools/compiletest",
|
||||||
"src/tools/run-make-support",
|
"src/tools/run-make-support",
|
||||||
"src/tools/error_index_generator",
|
|
||||||
"src/tools/linkchecker",
|
"src/tools/linkchecker",
|
||||||
"src/tools/lint-docs",
|
"src/tools/lint-docs",
|
||||||
"src/tools/miropt-test-tools",
|
"src/tools/miropt-test-tools",
|
||||||
|
|||||||
@ -21,6 +21,7 @@ use std::iter;
|
|||||||
use rustc_data_structures::fx::FxIndexMap;
|
use rustc_data_structures::fx::FxIndexMap;
|
||||||
use rustc_errors::Diag;
|
use rustc_errors::Diag;
|
||||||
use rustc_hir::BodyOwnerKind;
|
use rustc_hir::BodyOwnerKind;
|
||||||
|
use rustc_hir::def::DefKind;
|
||||||
use rustc_hir::def_id::{DefId, LocalDefId};
|
use rustc_hir::def_id::{DefId, LocalDefId};
|
||||||
use rustc_hir::lang_items::LangItem;
|
use rustc_hir::lang_items::LangItem;
|
||||||
use rustc_index::IndexVec;
|
use rustc_index::IndexVec;
|
||||||
@ -603,7 +604,10 @@ impl<'cx, 'tcx> UniversalRegionsBuilder<'cx, 'tcx> {
|
|||||||
|
|
||||||
BodyOwnerKind::Const { .. } | BodyOwnerKind::Static(..) => {
|
BodyOwnerKind::Const { .. } | BodyOwnerKind::Static(..) => {
|
||||||
let identity_args = GenericArgs::identity_for_item(tcx, typeck_root_def_id);
|
let identity_args = GenericArgs::identity_for_item(tcx, typeck_root_def_id);
|
||||||
if self.mir_def.to_def_id() == typeck_root_def_id {
|
if self.mir_def.to_def_id() == typeck_root_def_id
|
||||||
|
// Do not ICE when checking default_field_values consts with lifetimes (#135649)
|
||||||
|
&& DefKind::Field != tcx.def_kind(tcx.parent(typeck_root_def_id))
|
||||||
|
{
|
||||||
let args =
|
let args =
|
||||||
self.infcx.replace_free_regions_with_nll_infer_vars(FR, identity_args);
|
self.infcx.replace_free_regions_with_nll_infer_vars(FR, identity_args);
|
||||||
DefiningTy::Const(self.mir_def.to_def_id(), args)
|
DefiningTy::Const(self.mir_def.to_def_id(), args)
|
||||||
|
|||||||
@ -387,6 +387,8 @@ hir_analysis_must_implement_not_function_span_note = required by this annotation
|
|||||||
|
|
||||||
hir_analysis_must_implement_one_of_attribute = the `#[rustc_must_implement_one_of]` attribute must be used with at least 2 args
|
hir_analysis_must_implement_one_of_attribute = the `#[rustc_must_implement_one_of]` attribute must be used with at least 2 args
|
||||||
|
|
||||||
|
hir_analysis_no_variant_named = no variant named `{$ident}` found for enum `{$ty}`
|
||||||
|
|
||||||
hir_analysis_not_supported_delegation = {$descr}
|
hir_analysis_not_supported_delegation = {$descr}
|
||||||
.label = callee defined here
|
.label = callee defined here
|
||||||
|
|
||||||
|
|||||||
@ -2104,18 +2104,21 @@ pub(super) fn check_type_bounds<'tcx>(
|
|||||||
ObligationCause::new(impl_ty_span, impl_ty_def_id, code)
|
ObligationCause::new(impl_ty_span, impl_ty_def_id, code)
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut obligations: Vec<_> = tcx
|
let mut obligations: Vec<_> = util::elaborate(
|
||||||
.explicit_item_bounds(trait_ty.def_id)
|
tcx,
|
||||||
.iter_instantiated_copied(tcx, rebased_args)
|
tcx.explicit_item_bounds(trait_ty.def_id).iter_instantiated_copied(tcx, rebased_args).map(
|
||||||
.map(|(concrete_ty_bound, span)| {
|
|(concrete_ty_bound, span)| {
|
||||||
debug!(?concrete_ty_bound);
|
debug!(?concrete_ty_bound);
|
||||||
traits::Obligation::new(tcx, mk_cause(span), param_env, concrete_ty_bound)
|
traits::Obligation::new(tcx, mk_cause(span), param_env, concrete_ty_bound)
|
||||||
})
|
},
|
||||||
.collect();
|
),
|
||||||
|
)
|
||||||
|
.collect();
|
||||||
|
|
||||||
// Only in a const implementation do we need to check that the `~const` item bounds hold.
|
// Only in a const implementation do we need to check that the `~const` item bounds hold.
|
||||||
if tcx.is_conditionally_const(impl_ty_def_id) {
|
if tcx.is_conditionally_const(impl_ty_def_id) {
|
||||||
obligations.extend(
|
obligations.extend(util::elaborate(
|
||||||
|
tcx,
|
||||||
tcx.explicit_implied_const_bounds(trait_ty.def_id)
|
tcx.explicit_implied_const_bounds(trait_ty.def_id)
|
||||||
.iter_instantiated_copied(tcx, rebased_args)
|
.iter_instantiated_copied(tcx, rebased_args)
|
||||||
.map(|(c, span)| {
|
.map(|(c, span)| {
|
||||||
@ -2126,7 +2129,7 @@ pub(super) fn check_type_bounds<'tcx>(
|
|||||||
c.to_host_effect_clause(tcx, ty::BoundConstness::Maybe),
|
c.to_host_effect_clause(tcx, ty::BoundConstness::Maybe),
|
||||||
)
|
)
|
||||||
}),
|
}),
|
||||||
);
|
));
|
||||||
}
|
}
|
||||||
debug!(item_bounds=?obligations);
|
debug!(item_bounds=?obligations);
|
||||||
|
|
||||||
@ -2134,26 +2137,19 @@ pub(super) fn check_type_bounds<'tcx>(
|
|||||||
// to its definition type. This should be the param-env we use to *prove* the
|
// to its definition type. This should be the param-env we use to *prove* the
|
||||||
// predicate too, but we don't do that because of performance issues.
|
// predicate too, but we don't do that because of performance issues.
|
||||||
// See <https://github.com/rust-lang/rust/pull/117542#issue-1976337685>.
|
// See <https://github.com/rust-lang/rust/pull/117542#issue-1976337685>.
|
||||||
let trait_projection_ty = Ty::new_projection_from_args(tcx, trait_ty.def_id, rebased_args);
|
|
||||||
let impl_identity_ty = tcx.type_of(impl_ty.def_id).instantiate_identity();
|
|
||||||
let normalize_param_env = param_env_with_gat_bounds(tcx, impl_ty, impl_trait_ref);
|
let normalize_param_env = param_env_with_gat_bounds(tcx, impl_ty, impl_trait_ref);
|
||||||
for mut obligation in util::elaborate(tcx, obligations) {
|
for obligation in &mut obligations {
|
||||||
let normalized_predicate = if infcx.next_trait_solver() {
|
match ocx.deeply_normalize(&normalize_cause, normalize_param_env, obligation.predicate) {
|
||||||
obligation.predicate.fold_with(&mut ReplaceTy {
|
Ok(pred) => obligation.predicate = pred,
|
||||||
tcx,
|
Err(e) => {
|
||||||
from: trait_projection_ty,
|
return Err(infcx.err_ctxt().report_fulfillment_errors(e));
|
||||||
to: impl_identity_ty,
|
}
|
||||||
})
|
}
|
||||||
} else {
|
|
||||||
ocx.normalize(&normalize_cause, normalize_param_env, obligation.predicate)
|
|
||||||
};
|
|
||||||
debug!(?normalized_predicate);
|
|
||||||
obligation.predicate = normalized_predicate;
|
|
||||||
|
|
||||||
ocx.register_obligation(obligation);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check that all obligations are satisfied by the implementation's
|
// Check that all obligations are satisfied by the implementation's
|
||||||
// version.
|
// version.
|
||||||
|
ocx.register_obligations(obligations);
|
||||||
let errors = ocx.select_all_or_error();
|
let errors = ocx.select_all_or_error();
|
||||||
if !errors.is_empty() {
|
if !errors.is_empty() {
|
||||||
let reported = infcx.err_ctxt().report_fulfillment_errors(errors);
|
let reported = infcx.err_ctxt().report_fulfillment_errors(errors);
|
||||||
@ -2165,22 +2161,6 @@ pub(super) fn check_type_bounds<'tcx>(
|
|||||||
ocx.resolve_regions_and_report_errors(impl_ty_def_id, param_env, assumed_wf_types)
|
ocx.resolve_regions_and_report_errors(impl_ty_def_id, param_env, assumed_wf_types)
|
||||||
}
|
}
|
||||||
|
|
||||||
struct ReplaceTy<'tcx> {
|
|
||||||
tcx: TyCtxt<'tcx>,
|
|
||||||
from: Ty<'tcx>,
|
|
||||||
to: Ty<'tcx>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<'tcx> TypeFolder<TyCtxt<'tcx>> for ReplaceTy<'tcx> {
|
|
||||||
fn cx(&self) -> TyCtxt<'tcx> {
|
|
||||||
self.tcx
|
|
||||||
}
|
|
||||||
|
|
||||||
fn fold_ty(&mut self, ty: Ty<'tcx>) -> Ty<'tcx> {
|
|
||||||
if self.from == ty { self.to } else { ty.super_fold_with(self) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Install projection predicates that allow GATs to project to their own
|
/// Install projection predicates that allow GATs to project to their own
|
||||||
/// definition types. This is not allowed in general in cases of default
|
/// definition types. This is not allowed in general in cases of default
|
||||||
/// associated types in trait definitions, or when specialization is involved,
|
/// associated types in trait definitions, or when specialization is involved,
|
||||||
|
|||||||
@ -1417,6 +1417,15 @@ pub(crate) struct CrossCrateTraitsDefined {
|
|||||||
pub traits: String,
|
pub traits: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Diagnostic)]
|
||||||
|
#[diag(hir_analysis_no_variant_named, code = E0599)]
|
||||||
|
pub struct NoVariantNamed<'tcx> {
|
||||||
|
#[primary_span]
|
||||||
|
pub span: Span,
|
||||||
|
pub ident: Ident,
|
||||||
|
pub ty: Ty<'tcx>,
|
||||||
|
}
|
||||||
|
|
||||||
// FIXME(fmease): Deduplicate:
|
// FIXME(fmease): Deduplicate:
|
||||||
|
|
||||||
#[derive(Diagnostic)]
|
#[derive(Diagnostic)]
|
||||||
|
|||||||
@ -53,7 +53,9 @@ use rustc_type_ir::Upcast;
|
|||||||
use tracing::{debug, instrument};
|
use tracing::{debug, instrument};
|
||||||
|
|
||||||
use crate::check::check_abi_fn_ptr;
|
use crate::check::check_abi_fn_ptr;
|
||||||
use crate::errors::{AmbiguousLifetimeBound, BadReturnTypeNotation, InvalidBaseType};
|
use crate::errors::{
|
||||||
|
AmbiguousLifetimeBound, BadReturnTypeNotation, InvalidBaseType, NoVariantNamed,
|
||||||
|
};
|
||||||
use crate::hir_ty_lowering::errors::{GenericsArgsErrExtend, prohibit_assoc_item_constraint};
|
use crate::hir_ty_lowering::errors::{GenericsArgsErrExtend, prohibit_assoc_item_constraint};
|
||||||
use crate::hir_ty_lowering::generics::{check_generic_arg_count, lower_generic_args};
|
use crate::hir_ty_lowering::generics::{check_generic_arg_count, lower_generic_args};
|
||||||
use crate::middle::resolve_bound_vars as rbv;
|
use crate::middle::resolve_bound_vars as rbv;
|
||||||
@ -1205,14 +1207,11 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
|
|||||||
let msg = format!("expected type, found variant `{assoc_ident}`");
|
let msg = format!("expected type, found variant `{assoc_ident}`");
|
||||||
self.dcx().span_err(span, msg)
|
self.dcx().span_err(span, msg)
|
||||||
} else if qself_ty.is_enum() {
|
} else if qself_ty.is_enum() {
|
||||||
let mut err = struct_span_code_err!(
|
let mut err = self.dcx().create_err(NoVariantNamed {
|
||||||
self.dcx(),
|
span: assoc_ident.span,
|
||||||
assoc_ident.span,
|
ident: assoc_ident,
|
||||||
E0599,
|
ty: qself_ty,
|
||||||
"no variant named `{}` found for enum `{}`",
|
});
|
||||||
assoc_ident,
|
|
||||||
qself_ty,
|
|
||||||
);
|
|
||||||
|
|
||||||
let adt_def = qself_ty.ty_adt_def().expect("enum is not an ADT");
|
let adt_def = qself_ty.ty_adt_def().expect("enum is not an ADT");
|
||||||
if let Some(variant_name) = find_best_match_for_name(
|
if let Some(variant_name) = find_best_match_for_name(
|
||||||
|
|||||||
@ -92,6 +92,7 @@ mod impl_wf_check;
|
|||||||
mod outlives;
|
mod outlives;
|
||||||
mod variance;
|
mod variance;
|
||||||
|
|
||||||
|
pub use errors::NoVariantNamed;
|
||||||
use rustc_abi::ExternAbi;
|
use rustc_abi::ExternAbi;
|
||||||
use rustc_hir as hir;
|
use rustc_hir as hir;
|
||||||
use rustc_hir::def::DefKind;
|
use rustc_hir::def::DefKind;
|
||||||
|
|||||||
@ -19,6 +19,7 @@ use rustc_hir::def_id::DefId;
|
|||||||
use rustc_hir::intravisit::Visitor;
|
use rustc_hir::intravisit::Visitor;
|
||||||
use rustc_hir::lang_items::LangItem;
|
use rustc_hir::lang_items::LangItem;
|
||||||
use rustc_hir::{ExprKind, HirId, QPath};
|
use rustc_hir::{ExprKind, HirId, QPath};
|
||||||
|
use rustc_hir_analysis::NoVariantNamed;
|
||||||
use rustc_hir_analysis::hir_ty_lowering::{FeedConstTy, HirTyLowerer as _};
|
use rustc_hir_analysis::hir_ty_lowering::{FeedConstTy, HirTyLowerer as _};
|
||||||
use rustc_infer::infer;
|
use rustc_infer::infer;
|
||||||
use rustc_infer::infer::{DefineOpaqueTypes, InferOk};
|
use rustc_infer::infer::{DefineOpaqueTypes, InferOk};
|
||||||
@ -3837,15 +3838,10 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
|
|||||||
.iter_enumerated()
|
.iter_enumerated()
|
||||||
.find(|(_, v)| v.ident(self.tcx).normalize_to_macros_2_0() == ident)
|
.find(|(_, v)| v.ident(self.tcx).normalize_to_macros_2_0() == ident)
|
||||||
else {
|
else {
|
||||||
type_error_struct!(
|
self.dcx()
|
||||||
self.dcx(),
|
.create_err(NoVariantNamed { span: ident.span, ident, ty: container })
|
||||||
ident.span,
|
.with_span_label(field.span, "variant not found")
|
||||||
container,
|
.emit_unless(container.references_error());
|
||||||
E0599,
|
|
||||||
"no variant named `{ident}` found for enum `{container}`",
|
|
||||||
)
|
|
||||||
.with_span_label(field.span, "variant not found")
|
|
||||||
.emit();
|
|
||||||
break;
|
break;
|
||||||
};
|
};
|
||||||
let Some(&subfield) = fields.next() else {
|
let Some(&subfield) = fields.next() else {
|
||||||
|
|||||||
@ -2806,31 +2806,33 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
|
|||||||
&& !self.tcx.features().ref_pat_eat_one_layer_2024_structural(),
|
&& !self.tcx.features().ref_pat_eat_one_layer_2024_structural(),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
let pat_kind = if let PatKind::Binding(user_bind_annot, _, _, _) = subpat.kind {
|
||||||
|
info.bad_modifiers = true;
|
||||||
|
// If the user-provided binding modifier doesn't match the default binding mode, we'll
|
||||||
|
// need to suggest reference patterns, which can affect other bindings.
|
||||||
|
// For simplicity, we opt to suggest making the pattern fully explicit.
|
||||||
|
info.suggest_eliding_modes &=
|
||||||
|
user_bind_annot == BindingMode(ByRef::Yes(def_br_mutbl), Mutability::Not);
|
||||||
|
"binding modifier"
|
||||||
|
} else {
|
||||||
|
info.bad_ref_pats = true;
|
||||||
|
// For simplicity, we don't try to suggest eliding reference patterns. Thus, we'll
|
||||||
|
// suggest adding them instead, which can affect the types assigned to bindings.
|
||||||
|
// As such, we opt to suggest making the pattern fully explicit.
|
||||||
|
info.suggest_eliding_modes = false;
|
||||||
|
"reference pattern"
|
||||||
|
};
|
||||||
// Only provide a detailed label if the problematic subpattern isn't from an expansion.
|
// Only provide a detailed label if the problematic subpattern isn't from an expansion.
|
||||||
// In the case that it's from a macro, we'll add a more detailed note in the emitter.
|
// In the case that it's from a macro, we'll add a more detailed note in the emitter.
|
||||||
let from_expansion = subpat.span.from_expansion();
|
let from_expansion = subpat.span.from_expansion();
|
||||||
let primary_label = if from_expansion {
|
let primary_label = if from_expansion {
|
||||||
|
// We can't suggest eliding modifiers within expansions.
|
||||||
|
info.suggest_eliding_modes = false;
|
||||||
// NB: This wording assumes the only expansions that can produce problematic reference
|
// NB: This wording assumes the only expansions that can produce problematic reference
|
||||||
// patterns and bindings are macros. If a desugaring or AST pass is added that can do
|
// patterns and bindings are macros. If a desugaring or AST pass is added that can do
|
||||||
// so, we may want to inspect the span's source callee or macro backtrace.
|
// so, we may want to inspect the span's source callee or macro backtrace.
|
||||||
"occurs within macro expansion".to_owned()
|
"occurs within macro expansion".to_owned()
|
||||||
} else {
|
} else {
|
||||||
let pat_kind = if let PatKind::Binding(user_bind_annot, _, _, _) = subpat.kind {
|
|
||||||
info.bad_modifiers |= true;
|
|
||||||
// If the user-provided binding modifier doesn't match the default binding mode, we'll
|
|
||||||
// need to suggest reference patterns, which can affect other bindings.
|
|
||||||
// For simplicity, we opt to suggest making the pattern fully explicit.
|
|
||||||
info.suggest_eliding_modes &=
|
|
||||||
user_bind_annot == BindingMode(ByRef::Yes(def_br_mutbl), Mutability::Not);
|
|
||||||
"binding modifier"
|
|
||||||
} else {
|
|
||||||
info.bad_ref_pats |= true;
|
|
||||||
// For simplicity, we don't try to suggest eliding reference patterns. Thus, we'll
|
|
||||||
// suggest adding them instead, which can affect the types assigned to bindings.
|
|
||||||
// As such, we opt to suggest making the pattern fully explicit.
|
|
||||||
info.suggest_eliding_modes = false;
|
|
||||||
"reference pattern"
|
|
||||||
};
|
|
||||||
let dbm_str = match def_br_mutbl {
|
let dbm_str = match def_br_mutbl {
|
||||||
Mutability::Not => "ref",
|
Mutability::Not => "ref",
|
||||||
Mutability::Mut => "ref mut",
|
Mutability::Mut => "ref mut",
|
||||||
|
|||||||
@ -37,9 +37,6 @@ middle_autodiff_unsafe_inner_const_ref = reading from a `Duplicated` const {$ty}
|
|||||||
middle_bounds_check =
|
middle_bounds_check =
|
||||||
index out of bounds: the length is {$len} but the index is {$index}
|
index out of bounds: the length is {$len} but the index is {$index}
|
||||||
|
|
||||||
middle_cannot_be_normalized =
|
|
||||||
unable to determine layout for `{$ty}` because `{$failure_ty}` cannot be normalized
|
|
||||||
|
|
||||||
middle_conflict_types =
|
middle_conflict_types =
|
||||||
this expression supplies two conflicting concrete types for the same opaque type
|
this expression supplies two conflicting concrete types for the same opaque type
|
||||||
|
|
||||||
@ -52,9 +49,6 @@ middle_const_eval_non_int =
|
|||||||
middle_const_not_used_in_type_alias =
|
middle_const_not_used_in_type_alias =
|
||||||
const parameter `{$ct}` is part of concrete type but not used in parameter list for the `impl Trait` type alias
|
const parameter `{$ct}` is part of concrete type but not used in parameter list for the `impl Trait` type alias
|
||||||
|
|
||||||
middle_cycle =
|
|
||||||
a cycle occurred during layout computation
|
|
||||||
|
|
||||||
middle_deprecated = use of deprecated {$kind} `{$path}`{$has_note ->
|
middle_deprecated = use of deprecated {$kind} `{$path}`{$has_note ->
|
||||||
[true] : {$note}
|
[true] : {$note}
|
||||||
*[other] {""}
|
*[other] {""}
|
||||||
@ -78,9 +72,23 @@ middle_erroneous_constant = erroneous constant encountered
|
|||||||
middle_failed_writing_file =
|
middle_failed_writing_file =
|
||||||
failed to write file {$path}: {$error}"
|
failed to write file {$path}: {$error}"
|
||||||
|
|
||||||
|
middle_layout_cycle =
|
||||||
|
a cycle occurred during layout computation
|
||||||
|
|
||||||
|
middle_layout_normalization_failure =
|
||||||
|
unable to determine layout for `{$ty}` because `{$failure_ty}` cannot be normalized
|
||||||
|
|
||||||
middle_layout_references_error =
|
middle_layout_references_error =
|
||||||
the type has an unknown layout
|
the type has an unknown layout
|
||||||
|
|
||||||
|
middle_layout_size_overflow =
|
||||||
|
values of the type `{$ty}` are too big for the target architecture
|
||||||
|
|
||||||
|
middle_layout_too_generic = the type `{$ty}` does not have a fixed layout
|
||||||
|
|
||||||
|
middle_layout_unknown =
|
||||||
|
the type `{$ty}` has an unknown layout
|
||||||
|
|
||||||
middle_opaque_hidden_type_mismatch =
|
middle_opaque_hidden_type_mismatch =
|
||||||
concrete type differs from previous defining opaque type use
|
concrete type differs from previous defining opaque type use
|
||||||
.label = expected `{$self_ty}`, got `{$other_ty}`
|
.label = expected `{$self_ty}`, got `{$other_ty}`
|
||||||
@ -98,16 +106,8 @@ middle_strict_coherence_needs_negative_coherence =
|
|||||||
to use `strict_coherence` on this trait, the `with_negative_coherence` feature must be enabled
|
to use `strict_coherence` on this trait, the `with_negative_coherence` feature must be enabled
|
||||||
.label = due to this attribute
|
.label = due to this attribute
|
||||||
|
|
||||||
middle_too_generic = `{$ty}` does not have a fixed size
|
|
||||||
|
|
||||||
middle_type_length_limit = reached the type-length limit while instantiating `{$shrunk}`
|
middle_type_length_limit = reached the type-length limit while instantiating `{$shrunk}`
|
||||||
|
|
||||||
middle_unknown_layout =
|
|
||||||
the type `{$ty}` has an unknown layout
|
|
||||||
|
|
||||||
middle_unsupported_union = we don't support unions yet: '{$ty_name}'
|
middle_unsupported_union = we don't support unions yet: '{$ty_name}'
|
||||||
|
|
||||||
middle_values_too_big =
|
|
||||||
values of the type `{$ty}` are too big for the target architecture
|
|
||||||
|
|
||||||
middle_written_to_path = the full type name has been written to '{$path}'
|
middle_written_to_path = the full type name has been written to '{$path}'
|
||||||
|
|||||||
@ -132,19 +132,19 @@ impl fmt::Debug for CustomSubdiagnostic<'_> {
|
|||||||
|
|
||||||
#[derive(Diagnostic)]
|
#[derive(Diagnostic)]
|
||||||
pub enum LayoutError<'tcx> {
|
pub enum LayoutError<'tcx> {
|
||||||
#[diag(middle_unknown_layout)]
|
#[diag(middle_layout_unknown)]
|
||||||
Unknown { ty: Ty<'tcx> },
|
Unknown { ty: Ty<'tcx> },
|
||||||
|
|
||||||
#[diag(middle_too_generic)]
|
#[diag(middle_layout_too_generic)]
|
||||||
TooGeneric { ty: Ty<'tcx> },
|
TooGeneric { ty: Ty<'tcx> },
|
||||||
|
|
||||||
#[diag(middle_values_too_big)]
|
#[diag(middle_layout_size_overflow)]
|
||||||
Overflow { ty: Ty<'tcx> },
|
Overflow { ty: Ty<'tcx> },
|
||||||
|
|
||||||
#[diag(middle_cannot_be_normalized)]
|
#[diag(middle_layout_normalization_failure)]
|
||||||
NormalizationFailure { ty: Ty<'tcx>, failure_ty: String },
|
NormalizationFailure { ty: Ty<'tcx>, failure_ty: String },
|
||||||
|
|
||||||
#[diag(middle_cycle)]
|
#[diag(middle_layout_cycle)]
|
||||||
Cycle,
|
Cycle,
|
||||||
|
|
||||||
#[diag(middle_layout_references_error)]
|
#[diag(middle_layout_references_error)]
|
||||||
|
|||||||
@ -4,8 +4,8 @@
|
|||||||
|
|
||||||
use std::borrow::Cow;
|
use std::borrow::Cow;
|
||||||
use std::fmt::{self, Debug, Formatter};
|
use std::fmt::{self, Debug, Formatter};
|
||||||
|
use std::iter;
|
||||||
use std::ops::{Index, IndexMut};
|
use std::ops::{Index, IndexMut};
|
||||||
use std::{iter, mem};
|
|
||||||
|
|
||||||
pub use basic_blocks::{BasicBlocks, SwitchTargetValue};
|
pub use basic_blocks::{BasicBlocks, SwitchTargetValue};
|
||||||
use either::Either;
|
use either::Either;
|
||||||
@ -1365,66 +1365,6 @@ impl<'tcx> BasicBlockData<'tcx> {
|
|||||||
self.terminator.as_mut().expect("invalid terminator state")
|
self.terminator.as_mut().expect("invalid terminator state")
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn retain_statements<F>(&mut self, mut f: F)
|
|
||||||
where
|
|
||||||
F: FnMut(&mut Statement<'_>) -> bool,
|
|
||||||
{
|
|
||||||
for s in &mut self.statements {
|
|
||||||
if !f(s) {
|
|
||||||
s.make_nop();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn expand_statements<F, I>(&mut self, mut f: F)
|
|
||||||
where
|
|
||||||
F: FnMut(&mut Statement<'tcx>) -> Option<I>,
|
|
||||||
I: iter::TrustedLen<Item = Statement<'tcx>>,
|
|
||||||
{
|
|
||||||
// Gather all the iterators we'll need to splice in, and their positions.
|
|
||||||
let mut splices: Vec<(usize, I)> = vec![];
|
|
||||||
let mut extra_stmts = 0;
|
|
||||||
for (i, s) in self.statements.iter_mut().enumerate() {
|
|
||||||
if let Some(mut new_stmts) = f(s) {
|
|
||||||
if let Some(first) = new_stmts.next() {
|
|
||||||
// We can already store the first new statement.
|
|
||||||
*s = first;
|
|
||||||
|
|
||||||
// Save the other statements for optimized splicing.
|
|
||||||
let remaining = new_stmts.size_hint().0;
|
|
||||||
if remaining > 0 {
|
|
||||||
splices.push((i + 1 + extra_stmts, new_stmts));
|
|
||||||
extra_stmts += remaining;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
s.make_nop();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Splice in the new statements, from the end of the block.
|
|
||||||
// FIXME(eddyb) This could be more efficient with a "gap buffer"
|
|
||||||
// where a range of elements ("gap") is left uninitialized, with
|
|
||||||
// splicing adding new elements to the end of that gap and moving
|
|
||||||
// existing elements from before the gap to the end of the gap.
|
|
||||||
// For now, this is safe code, emulating a gap but initializing it.
|
|
||||||
let mut gap = self.statements.len()..self.statements.len() + extra_stmts;
|
|
||||||
self.statements.resize(
|
|
||||||
gap.end,
|
|
||||||
Statement { source_info: SourceInfo::outermost(DUMMY_SP), kind: StatementKind::Nop },
|
|
||||||
);
|
|
||||||
for (splice_start, new_stmts) in splices.into_iter().rev() {
|
|
||||||
let splice_end = splice_start + new_stmts.size_hint().0;
|
|
||||||
while gap.end > splice_end {
|
|
||||||
gap.start -= 1;
|
|
||||||
gap.end -= 1;
|
|
||||||
self.statements.swap(gap.start, gap.end);
|
|
||||||
}
|
|
||||||
self.statements.splice(splice_start..splice_end, new_stmts);
|
|
||||||
gap.end = splice_start;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn visitable(&self, index: usize) -> &dyn MirVisitable<'tcx> {
|
pub fn visitable(&self, index: usize) -> &dyn MirVisitable<'tcx> {
|
||||||
if index < self.statements.len() { &self.statements[index] } else { &self.terminator }
|
if index < self.statements.len() { &self.statements[index] } else { &self.terminator }
|
||||||
}
|
}
|
||||||
|
|||||||
@ -19,15 +19,6 @@ impl Statement<'_> {
|
|||||||
pub fn make_nop(&mut self) {
|
pub fn make_nop(&mut self) {
|
||||||
self.kind = StatementKind::Nop
|
self.kind = StatementKind::Nop
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Changes a statement to a nop and returns the original statement.
|
|
||||||
#[must_use = "If you don't need the statement, use `make_nop` instead"]
|
|
||||||
pub fn replace_nop(&mut self) -> Self {
|
|
||||||
Statement {
|
|
||||||
source_info: self.source_info,
|
|
||||||
kind: mem::replace(&mut self.kind, StatementKind::Nop),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'tcx> StatementKind<'tcx> {
|
impl<'tcx> StatementKind<'tcx> {
|
||||||
|
|||||||
@ -229,11 +229,32 @@ impl fmt::Display for ValidityRequirement {
|
|||||||
|
|
||||||
#[derive(Copy, Clone, Debug, HashStable, TyEncodable, TyDecodable)]
|
#[derive(Copy, Clone, Debug, HashStable, TyEncodable, TyDecodable)]
|
||||||
pub enum LayoutError<'tcx> {
|
pub enum LayoutError<'tcx> {
|
||||||
|
/// A type doesn't have a sensible layout.
|
||||||
|
///
|
||||||
|
/// This variant is used for layout errors that don't necessarily cause
|
||||||
|
/// compile errors.
|
||||||
|
///
|
||||||
|
/// For example, this can happen if a struct contains an unsized type in a
|
||||||
|
/// non-tail field, but has an unsatisfiable bound like `str: Sized`.
|
||||||
Unknown(Ty<'tcx>),
|
Unknown(Ty<'tcx>),
|
||||||
|
/// The size of a type exceeds [`TargetDataLayout::obj_size_bound`].
|
||||||
SizeOverflow(Ty<'tcx>),
|
SizeOverflow(Ty<'tcx>),
|
||||||
|
/// The layout can vary due to a generic parameter.
|
||||||
|
///
|
||||||
|
/// Unlike `Unknown`, this variant is a "soft" error and indicates that the layout
|
||||||
|
/// may become computable after further instantiating the generic parameter(s).
|
||||||
TooGeneric(Ty<'tcx>),
|
TooGeneric(Ty<'tcx>),
|
||||||
|
/// An alias failed to normalize.
|
||||||
|
///
|
||||||
|
/// This variant is necessary, because, due to trait solver incompleteness, it is
|
||||||
|
/// possible than an alias that was rigid during analysis fails to normalize after
|
||||||
|
/// revealing opaque types.
|
||||||
|
///
|
||||||
|
/// See `tests/ui/layout/normalization-failure.rs` for an example.
|
||||||
NormalizationFailure(Ty<'tcx>, NormalizationError<'tcx>),
|
NormalizationFailure(Ty<'tcx>, NormalizationError<'tcx>),
|
||||||
|
/// A non-layout error is reported elsewhere.
|
||||||
ReferencesError(ErrorGuaranteed),
|
ReferencesError(ErrorGuaranteed),
|
||||||
|
/// A type has cyclic layout, i.e. the type contains itself without indirection.
|
||||||
Cycle(ErrorGuaranteed),
|
Cycle(ErrorGuaranteed),
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -243,11 +264,11 @@ impl<'tcx> LayoutError<'tcx> {
|
|||||||
|
|
||||||
use crate::fluent_generated::*;
|
use crate::fluent_generated::*;
|
||||||
match self {
|
match self {
|
||||||
Unknown(_) => middle_unknown_layout,
|
Unknown(_) => middle_layout_unknown,
|
||||||
SizeOverflow(_) => middle_values_too_big,
|
SizeOverflow(_) => middle_layout_size_overflow,
|
||||||
TooGeneric(_) => middle_too_generic,
|
TooGeneric(_) => middle_layout_too_generic,
|
||||||
NormalizationFailure(_, _) => middle_cannot_be_normalized,
|
NormalizationFailure(_, _) => middle_layout_normalization_failure,
|
||||||
Cycle(_) => middle_cycle,
|
Cycle(_) => middle_layout_cycle,
|
||||||
ReferencesError(_) => middle_layout_references_error,
|
ReferencesError(_) => middle_layout_references_error,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -276,7 +297,7 @@ impl<'tcx> fmt::Display for LayoutError<'tcx> {
|
|||||||
match *self {
|
match *self {
|
||||||
LayoutError::Unknown(ty) => write!(f, "the type `{ty}` has an unknown layout"),
|
LayoutError::Unknown(ty) => write!(f, "the type `{ty}` has an unknown layout"),
|
||||||
LayoutError::TooGeneric(ty) => {
|
LayoutError::TooGeneric(ty) => {
|
||||||
write!(f, "`{ty}` does not have a fixed size")
|
write!(f, "the type `{ty}` does not have a fixed layout")
|
||||||
}
|
}
|
||||||
LayoutError::SizeOverflow(ty) => {
|
LayoutError::SizeOverflow(ty) => {
|
||||||
write!(f, "values of the type `{ty}` are too big for the target architecture")
|
write!(f, "values of the type `{ty}` are too big for the target architecture")
|
||||||
|
|||||||
@ -393,12 +393,13 @@ impl<'tcx> MutVisitor<'tcx> for TransformVisitor<'tcx> {
|
|||||||
|
|
||||||
fn visit_basic_block_data(&mut self, block: BasicBlock, data: &mut BasicBlockData<'tcx>) {
|
fn visit_basic_block_data(&mut self, block: BasicBlock, data: &mut BasicBlockData<'tcx>) {
|
||||||
// Remove StorageLive and StorageDead statements for remapped locals
|
// Remove StorageLive and StorageDead statements for remapped locals
|
||||||
data.retain_statements(|s| match s.kind {
|
for s in &mut data.statements {
|
||||||
StatementKind::StorageLive(l) | StatementKind::StorageDead(l) => {
|
if let StatementKind::StorageLive(l) | StatementKind::StorageDead(l) = s.kind
|
||||||
!self.remap.contains(l)
|
&& self.remap.contains(l)
|
||||||
|
{
|
||||||
|
s.make_nop();
|
||||||
}
|
}
|
||||||
_ => true,
|
}
|
||||||
});
|
|
||||||
|
|
||||||
let ret_val = match data.terminator().kind {
|
let ret_val = match data.terminator().kind {
|
||||||
TerminatorKind::Return => {
|
TerminatorKind::Return => {
|
||||||
|
|||||||
@ -417,7 +417,7 @@ impl<'a, 'tcx> ElaborateDropsCtxt<'a, 'tcx> {
|
|||||||
..
|
..
|
||||||
} = data.terminator().kind
|
} = data.terminator().kind
|
||||||
{
|
{
|
||||||
assert!(!self.patch.is_patched(bb));
|
assert!(!self.patch.is_term_patched(bb));
|
||||||
|
|
||||||
let loc = Location { block: tgt, statement_index: 0 };
|
let loc = Location { block: tgt, statement_index: 0 };
|
||||||
let path = self.move_data().rev_lookup.find(destination.as_ref());
|
let path = self.move_data().rev_lookup.find(destination.as_ref());
|
||||||
@ -462,7 +462,7 @@ impl<'a, 'tcx> ElaborateDropsCtxt<'a, 'tcx> {
|
|||||||
// a Goto; see `MirPatch::new`).
|
// a Goto; see `MirPatch::new`).
|
||||||
}
|
}
|
||||||
_ => {
|
_ => {
|
||||||
assert!(!self.patch.is_patched(bb));
|
assert!(!self.patch.is_term_patched(bb));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -486,7 +486,7 @@ impl<'a, 'tcx> ElaborateDropsCtxt<'a, 'tcx> {
|
|||||||
..
|
..
|
||||||
} = data.terminator().kind
|
} = data.terminator().kind
|
||||||
{
|
{
|
||||||
assert!(!self.patch.is_patched(bb));
|
assert!(!self.patch.is_term_patched(bb));
|
||||||
|
|
||||||
let loc = Location { block: bb, statement_index: data.statements.len() };
|
let loc = Location { block: bb, statement_index: data.statements.len() };
|
||||||
let path = self.move_data().rev_lookup.find(destination.as_ref());
|
let path = self.move_data().rev_lookup.find(destination.as_ref());
|
||||||
|
|||||||
@ -6,6 +6,8 @@ use rustc_middle::ty::util::IntTypeExt;
|
|||||||
use rustc_middle::ty::{self, AdtDef, Ty, TyCtxt};
|
use rustc_middle::ty::{self, AdtDef, Ty, TyCtxt};
|
||||||
use rustc_session::Session;
|
use rustc_session::Session;
|
||||||
|
|
||||||
|
use crate::patch::MirPatch;
|
||||||
|
|
||||||
/// A pass that seeks to optimize unnecessary moves of large enum types, if there is a large
|
/// A pass that seeks to optimize unnecessary moves of large enum types, if there is a large
|
||||||
/// enough discrepancy between them.
|
/// enough discrepancy between them.
|
||||||
///
|
///
|
||||||
@ -41,31 +43,34 @@ impl<'tcx> crate::MirPass<'tcx> for EnumSizeOpt {
|
|||||||
let mut alloc_cache = FxHashMap::default();
|
let mut alloc_cache = FxHashMap::default();
|
||||||
let typing_env = body.typing_env(tcx);
|
let typing_env = body.typing_env(tcx);
|
||||||
|
|
||||||
let blocks = body.basic_blocks.as_mut();
|
let mut patch = MirPatch::new(body);
|
||||||
let local_decls = &mut body.local_decls;
|
|
||||||
|
|
||||||
for bb in blocks {
|
for (block, data) in body.basic_blocks.as_mut().iter_enumerated_mut() {
|
||||||
bb.expand_statements(|st| {
|
for (statement_index, st) in data.statements.iter_mut().enumerate() {
|
||||||
let StatementKind::Assign(box (
|
let StatementKind::Assign(box (
|
||||||
lhs,
|
lhs,
|
||||||
Rvalue::Use(Operand::Copy(rhs) | Operand::Move(rhs)),
|
Rvalue::Use(Operand::Copy(rhs) | Operand::Move(rhs)),
|
||||||
)) = &st.kind
|
)) = &st.kind
|
||||||
else {
|
else {
|
||||||
return None;
|
continue;
|
||||||
};
|
};
|
||||||
|
|
||||||
let ty = lhs.ty(local_decls, tcx).ty;
|
let location = Location { block, statement_index };
|
||||||
|
|
||||||
let (adt_def, num_variants, alloc_id) =
|
let ty = lhs.ty(&body.local_decls, tcx).ty;
|
||||||
self.candidate(tcx, typing_env, ty, &mut alloc_cache)?;
|
|
||||||
|
|
||||||
let source_info = st.source_info;
|
let Some((adt_def, num_variants, alloc_id)) =
|
||||||
let span = source_info.span;
|
self.candidate(tcx, typing_env, ty, &mut alloc_cache)
|
||||||
|
else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
|
||||||
|
let span = st.source_info.span;
|
||||||
|
|
||||||
let tmp_ty = Ty::new_array(tcx, tcx.types.usize, num_variants as u64);
|
let tmp_ty = Ty::new_array(tcx, tcx.types.usize, num_variants as u64);
|
||||||
let size_array_local = local_decls.push(LocalDecl::new(tmp_ty, span));
|
let size_array_local = patch.new_temp(tmp_ty, span);
|
||||||
let store_live =
|
|
||||||
Statement { source_info, kind: StatementKind::StorageLive(size_array_local) };
|
let store_live = StatementKind::StorageLive(size_array_local);
|
||||||
|
|
||||||
let place = Place::from(size_array_local);
|
let place = Place::from(size_array_local);
|
||||||
let constant_vals = ConstOperand {
|
let constant_vals = ConstOperand {
|
||||||
@ -77,108 +82,63 @@ impl<'tcx> crate::MirPass<'tcx> for EnumSizeOpt {
|
|||||||
),
|
),
|
||||||
};
|
};
|
||||||
let rval = Rvalue::Use(Operand::Constant(Box::new(constant_vals)));
|
let rval = Rvalue::Use(Operand::Constant(Box::new(constant_vals)));
|
||||||
let const_assign =
|
let const_assign = StatementKind::Assign(Box::new((place, rval)));
|
||||||
Statement { source_info, kind: StatementKind::Assign(Box::new((place, rval))) };
|
|
||||||
|
|
||||||
let discr_place = Place::from(
|
let discr_place =
|
||||||
local_decls.push(LocalDecl::new(adt_def.repr().discr_type().to_ty(tcx), span)),
|
Place::from(patch.new_temp(adt_def.repr().discr_type().to_ty(tcx), span));
|
||||||
);
|
let store_discr =
|
||||||
let store_discr = Statement {
|
StatementKind::Assign(Box::new((discr_place, Rvalue::Discriminant(*rhs))));
|
||||||
source_info,
|
|
||||||
kind: StatementKind::Assign(Box::new((
|
|
||||||
discr_place,
|
|
||||||
Rvalue::Discriminant(*rhs),
|
|
||||||
))),
|
|
||||||
};
|
|
||||||
|
|
||||||
let discr_cast_place =
|
let discr_cast_place = Place::from(patch.new_temp(tcx.types.usize, span));
|
||||||
Place::from(local_decls.push(LocalDecl::new(tcx.types.usize, span)));
|
let cast_discr = StatementKind::Assign(Box::new((
|
||||||
let cast_discr = Statement {
|
discr_cast_place,
|
||||||
source_info,
|
Rvalue::Cast(CastKind::IntToInt, Operand::Copy(discr_place), tcx.types.usize),
|
||||||
kind: StatementKind::Assign(Box::new((
|
)));
|
||||||
discr_cast_place,
|
|
||||||
Rvalue::Cast(
|
|
||||||
CastKind::IntToInt,
|
|
||||||
Operand::Copy(discr_place),
|
|
||||||
tcx.types.usize,
|
|
||||||
),
|
|
||||||
))),
|
|
||||||
};
|
|
||||||
|
|
||||||
let size_place =
|
let size_place = Place::from(patch.new_temp(tcx.types.usize, span));
|
||||||
Place::from(local_decls.push(LocalDecl::new(tcx.types.usize, span)));
|
let store_size = StatementKind::Assign(Box::new((
|
||||||
let store_size = Statement {
|
size_place,
|
||||||
source_info,
|
Rvalue::Use(Operand::Copy(Place {
|
||||||
kind: StatementKind::Assign(Box::new((
|
local: size_array_local,
|
||||||
size_place,
|
projection: tcx.mk_place_elems(&[PlaceElem::Index(discr_cast_place.local)]),
|
||||||
Rvalue::Use(Operand::Copy(Place {
|
})),
|
||||||
local: size_array_local,
|
)));
|
||||||
projection: tcx
|
|
||||||
.mk_place_elems(&[PlaceElem::Index(discr_cast_place.local)]),
|
|
||||||
})),
|
|
||||||
))),
|
|
||||||
};
|
|
||||||
|
|
||||||
let dst =
|
let dst = Place::from(patch.new_temp(Ty::new_mut_ptr(tcx, ty), span));
|
||||||
Place::from(local_decls.push(LocalDecl::new(Ty::new_mut_ptr(tcx, ty), span)));
|
let dst_ptr =
|
||||||
let dst_ptr = Statement {
|
StatementKind::Assign(Box::new((dst, Rvalue::RawPtr(RawPtrKind::Mut, *lhs))));
|
||||||
source_info,
|
|
||||||
kind: StatementKind::Assign(Box::new((
|
|
||||||
dst,
|
|
||||||
Rvalue::RawPtr(RawPtrKind::Mut, *lhs),
|
|
||||||
))),
|
|
||||||
};
|
|
||||||
|
|
||||||
let dst_cast_ty = Ty::new_mut_ptr(tcx, tcx.types.u8);
|
let dst_cast_ty = Ty::new_mut_ptr(tcx, tcx.types.u8);
|
||||||
let dst_cast_place =
|
let dst_cast_place = Place::from(patch.new_temp(dst_cast_ty, span));
|
||||||
Place::from(local_decls.push(LocalDecl::new(dst_cast_ty, span)));
|
let dst_cast = StatementKind::Assign(Box::new((
|
||||||
let dst_cast = Statement {
|
dst_cast_place,
|
||||||
source_info,
|
Rvalue::Cast(CastKind::PtrToPtr, Operand::Copy(dst), dst_cast_ty),
|
||||||
kind: StatementKind::Assign(Box::new((
|
)));
|
||||||
dst_cast_place,
|
|
||||||
Rvalue::Cast(CastKind::PtrToPtr, Operand::Copy(dst), dst_cast_ty),
|
|
||||||
))),
|
|
||||||
};
|
|
||||||
|
|
||||||
let src =
|
let src = Place::from(patch.new_temp(Ty::new_imm_ptr(tcx, ty), span));
|
||||||
Place::from(local_decls.push(LocalDecl::new(Ty::new_imm_ptr(tcx, ty), span)));
|
let src_ptr =
|
||||||
let src_ptr = Statement {
|
StatementKind::Assign(Box::new((src, Rvalue::RawPtr(RawPtrKind::Const, *rhs))));
|
||||||
source_info,
|
|
||||||
kind: StatementKind::Assign(Box::new((
|
|
||||||
src,
|
|
||||||
Rvalue::RawPtr(RawPtrKind::Const, *rhs),
|
|
||||||
))),
|
|
||||||
};
|
|
||||||
|
|
||||||
let src_cast_ty = Ty::new_imm_ptr(tcx, tcx.types.u8);
|
let src_cast_ty = Ty::new_imm_ptr(tcx, tcx.types.u8);
|
||||||
let src_cast_place =
|
let src_cast_place = Place::from(patch.new_temp(src_cast_ty, span));
|
||||||
Place::from(local_decls.push(LocalDecl::new(src_cast_ty, span)));
|
let src_cast = StatementKind::Assign(Box::new((
|
||||||
let src_cast = Statement {
|
src_cast_place,
|
||||||
source_info,
|
Rvalue::Cast(CastKind::PtrToPtr, Operand::Copy(src), src_cast_ty),
|
||||||
kind: StatementKind::Assign(Box::new((
|
)));
|
||||||
src_cast_place,
|
|
||||||
Rvalue::Cast(CastKind::PtrToPtr, Operand::Copy(src), src_cast_ty),
|
|
||||||
))),
|
|
||||||
};
|
|
||||||
|
|
||||||
let deinit_old =
|
let deinit_old = StatementKind::Deinit(Box::new(dst));
|
||||||
Statement { source_info, kind: StatementKind::Deinit(Box::new(dst)) };
|
|
||||||
|
|
||||||
let copy_bytes = Statement {
|
let copy_bytes = StatementKind::Intrinsic(Box::new(
|
||||||
source_info,
|
NonDivergingIntrinsic::CopyNonOverlapping(CopyNonOverlapping {
|
||||||
kind: StatementKind::Intrinsic(Box::new(
|
src: Operand::Copy(src_cast_place),
|
||||||
NonDivergingIntrinsic::CopyNonOverlapping(CopyNonOverlapping {
|
dst: Operand::Copy(dst_cast_place),
|
||||||
src: Operand::Copy(src_cast_place),
|
count: Operand::Copy(size_place),
|
||||||
dst: Operand::Copy(dst_cast_place),
|
}),
|
||||||
count: Operand::Copy(size_place),
|
));
|
||||||
}),
|
|
||||||
)),
|
|
||||||
};
|
|
||||||
|
|
||||||
let store_dead =
|
let store_dead = StatementKind::StorageDead(size_array_local);
|
||||||
Statement { source_info, kind: StatementKind::StorageDead(size_array_local) };
|
|
||||||
|
|
||||||
let iter = [
|
let stmts = [
|
||||||
store_live,
|
store_live,
|
||||||
const_assign,
|
const_assign,
|
||||||
store_discr,
|
store_discr,
|
||||||
@ -191,14 +151,16 @@ impl<'tcx> crate::MirPass<'tcx> for EnumSizeOpt {
|
|||||||
deinit_old,
|
deinit_old,
|
||||||
copy_bytes,
|
copy_bytes,
|
||||||
store_dead,
|
store_dead,
|
||||||
]
|
];
|
||||||
.into_iter();
|
for stmt in stmts {
|
||||||
|
patch.add_statement(location, stmt);
|
||||||
|
}
|
||||||
|
|
||||||
st.make_nop();
|
st.make_nop();
|
||||||
|
}
|
||||||
Some(iter)
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
patch.apply(body);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn is_required(&self) -> bool {
|
fn is_required(&self) -> bool {
|
||||||
|
|||||||
@ -4,11 +4,12 @@ use rustc_middle::ty::Ty;
|
|||||||
use rustc_span::Span;
|
use rustc_span::Span;
|
||||||
use tracing::debug;
|
use tracing::debug;
|
||||||
|
|
||||||
/// This struct represents a patch to MIR, which can add
|
/// This struct lets you "patch" a MIR body, i.e. modify it. You can queue up
|
||||||
/// new statements and basic blocks and patch over block
|
/// various changes, such as the addition of new statements and basic blocks
|
||||||
/// terminators.
|
/// and replacement of terminators, and then apply the queued changes all at
|
||||||
|
/// once with `apply`. This is useful for MIR transformation passes.
|
||||||
pub(crate) struct MirPatch<'tcx> {
|
pub(crate) struct MirPatch<'tcx> {
|
||||||
patch_map: IndexVec<BasicBlock, Option<TerminatorKind<'tcx>>>,
|
term_patch_map: IndexVec<BasicBlock, Option<TerminatorKind<'tcx>>>,
|
||||||
new_blocks: Vec<BasicBlockData<'tcx>>,
|
new_blocks: Vec<BasicBlockData<'tcx>>,
|
||||||
new_statements: Vec<(Location, StatementKind<'tcx>)>,
|
new_statements: Vec<(Location, StatementKind<'tcx>)>,
|
||||||
new_locals: Vec<LocalDecl<'tcx>>,
|
new_locals: Vec<LocalDecl<'tcx>>,
|
||||||
@ -24,9 +25,10 @@ pub(crate) struct MirPatch<'tcx> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl<'tcx> MirPatch<'tcx> {
|
impl<'tcx> MirPatch<'tcx> {
|
||||||
|
/// Creates a new, empty patch.
|
||||||
pub(crate) fn new(body: &Body<'tcx>) -> Self {
|
pub(crate) fn new(body: &Body<'tcx>) -> Self {
|
||||||
let mut result = MirPatch {
|
let mut result = MirPatch {
|
||||||
patch_map: IndexVec::from_elem(None, &body.basic_blocks),
|
term_patch_map: IndexVec::from_elem(None, &body.basic_blocks),
|
||||||
new_blocks: vec![],
|
new_blocks: vec![],
|
||||||
new_statements: vec![],
|
new_statements: vec![],
|
||||||
new_locals: vec![],
|
new_locals: vec![],
|
||||||
@ -141,10 +143,12 @@ impl<'tcx> MirPatch<'tcx> {
|
|||||||
bb
|
bb
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn is_patched(&self, bb: BasicBlock) -> bool {
|
/// Has a replacement of this block's terminator been queued in this patch?
|
||||||
self.patch_map[bb].is_some()
|
pub(crate) fn is_term_patched(&self, bb: BasicBlock) -> bool {
|
||||||
|
self.term_patch_map[bb].is_some()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Queues the addition of a new temporary with additional local info.
|
||||||
pub(crate) fn new_local_with_info(
|
pub(crate) fn new_local_with_info(
|
||||||
&mut self,
|
&mut self,
|
||||||
ty: Ty<'tcx>,
|
ty: Ty<'tcx>,
|
||||||
@ -159,6 +163,7 @@ impl<'tcx> MirPatch<'tcx> {
|
|||||||
Local::new(index)
|
Local::new(index)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Queues the addition of a new temporary.
|
||||||
pub(crate) fn new_temp(&mut self, ty: Ty<'tcx>, span: Span) -> Local {
|
pub(crate) fn new_temp(&mut self, ty: Ty<'tcx>, span: Span) -> Local {
|
||||||
let index = self.next_local;
|
let index = self.next_local;
|
||||||
self.next_local += 1;
|
self.next_local += 1;
|
||||||
@ -174,29 +179,46 @@ impl<'tcx> MirPatch<'tcx> {
|
|||||||
self.new_locals[new_local_idx].ty
|
self.new_locals[new_local_idx].ty
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Queues the addition of a new basic block.
|
||||||
pub(crate) fn new_block(&mut self, data: BasicBlockData<'tcx>) -> BasicBlock {
|
pub(crate) fn new_block(&mut self, data: BasicBlockData<'tcx>) -> BasicBlock {
|
||||||
let block = BasicBlock::new(self.patch_map.len());
|
let block = BasicBlock::new(self.term_patch_map.len());
|
||||||
debug!("MirPatch: new_block: {:?}: {:?}", block, data);
|
debug!("MirPatch: new_block: {:?}: {:?}", block, data);
|
||||||
self.new_blocks.push(data);
|
self.new_blocks.push(data);
|
||||||
self.patch_map.push(None);
|
self.term_patch_map.push(None);
|
||||||
block
|
block
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Queues the replacement of a block's terminator.
|
||||||
pub(crate) fn patch_terminator(&mut self, block: BasicBlock, new: TerminatorKind<'tcx>) {
|
pub(crate) fn patch_terminator(&mut self, block: BasicBlock, new: TerminatorKind<'tcx>) {
|
||||||
assert!(self.patch_map[block].is_none());
|
assert!(self.term_patch_map[block].is_none());
|
||||||
debug!("MirPatch: patch_terminator({:?}, {:?})", block, new);
|
debug!("MirPatch: patch_terminator({:?}, {:?})", block, new);
|
||||||
self.patch_map[block] = Some(new);
|
self.term_patch_map[block] = Some(new);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Queues the insertion of a statement at a given location. The statement
|
||||||
|
/// currently at that location, and all statements that follow, are shifted
|
||||||
|
/// down. If multiple statements are queued for addition at the same
|
||||||
|
/// location, the final statement order after calling `apply` will match
|
||||||
|
/// the queue insertion order.
|
||||||
|
///
|
||||||
|
/// E.g. if we have `s0` at location `loc` and do these calls:
|
||||||
|
///
|
||||||
|
/// p.add_statement(loc, s1);
|
||||||
|
/// p.add_statement(loc, s2);
|
||||||
|
/// p.apply(body);
|
||||||
|
///
|
||||||
|
/// then the final order will be `s1, s2, s0`, with `s1` at `loc`.
|
||||||
pub(crate) fn add_statement(&mut self, loc: Location, stmt: StatementKind<'tcx>) {
|
pub(crate) fn add_statement(&mut self, loc: Location, stmt: StatementKind<'tcx>) {
|
||||||
debug!("MirPatch: add_statement({:?}, {:?})", loc, stmt);
|
debug!("MirPatch: add_statement({:?}, {:?})", loc, stmt);
|
||||||
self.new_statements.push((loc, stmt));
|
self.new_statements.push((loc, stmt));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Like `add_statement`, but specialized for assignments.
|
||||||
pub(crate) fn add_assign(&mut self, loc: Location, place: Place<'tcx>, rv: Rvalue<'tcx>) {
|
pub(crate) fn add_assign(&mut self, loc: Location, place: Place<'tcx>, rv: Rvalue<'tcx>) {
|
||||||
self.add_statement(loc, StatementKind::Assign(Box::new((place, rv))));
|
self.add_statement(loc, StatementKind::Assign(Box::new((place, rv))));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Applies the queued changes.
|
||||||
pub(crate) fn apply(self, body: &mut Body<'tcx>) {
|
pub(crate) fn apply(self, body: &mut Body<'tcx>) {
|
||||||
debug!(
|
debug!(
|
||||||
"MirPatch: {:?} new temps, starting from index {}: {:?}",
|
"MirPatch: {:?} new temps, starting from index {}: {:?}",
|
||||||
@ -209,14 +231,14 @@ impl<'tcx> MirPatch<'tcx> {
|
|||||||
self.new_blocks.len(),
|
self.new_blocks.len(),
|
||||||
body.basic_blocks.len()
|
body.basic_blocks.len()
|
||||||
);
|
);
|
||||||
let bbs = if self.patch_map.is_empty() && self.new_blocks.is_empty() {
|
let bbs = if self.term_patch_map.is_empty() && self.new_blocks.is_empty() {
|
||||||
body.basic_blocks.as_mut_preserves_cfg()
|
body.basic_blocks.as_mut_preserves_cfg()
|
||||||
} else {
|
} else {
|
||||||
body.basic_blocks.as_mut()
|
body.basic_blocks.as_mut()
|
||||||
};
|
};
|
||||||
bbs.extend(self.new_blocks);
|
bbs.extend(self.new_blocks);
|
||||||
body.local_decls.extend(self.new_locals);
|
body.local_decls.extend(self.new_locals);
|
||||||
for (src, patch) in self.patch_map.into_iter_enumerated() {
|
for (src, patch) in self.term_patch_map.into_iter_enumerated() {
|
||||||
if let Some(patch) = patch {
|
if let Some(patch) = patch {
|
||||||
debug!("MirPatch: patching block {:?}", src);
|
debug!("MirPatch: patching block {:?}", src);
|
||||||
bbs[src].terminator_mut().kind = patch;
|
bbs[src].terminator_mut().kind = patch;
|
||||||
@ -224,6 +246,9 @@ impl<'tcx> MirPatch<'tcx> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let mut new_statements = self.new_statements;
|
let mut new_statements = self.new_statements;
|
||||||
|
|
||||||
|
// This must be a stable sort to provide the ordering described in the
|
||||||
|
// comment for `add_statement`.
|
||||||
new_statements.sort_by_key(|s| s.0);
|
new_statements.sort_by_key(|s| s.0);
|
||||||
|
|
||||||
let mut delta = 0;
|
let mut delta = 0;
|
||||||
|
|||||||
@ -48,9 +48,11 @@ impl<'tcx> crate::MirPass<'tcx> for SingleUseConsts {
|
|||||||
|
|
||||||
// We're only changing an operand, not the terminator kinds or successors
|
// We're only changing an operand, not the terminator kinds or successors
|
||||||
let basic_blocks = body.basic_blocks.as_mut_preserves_cfg();
|
let basic_blocks = body.basic_blocks.as_mut_preserves_cfg();
|
||||||
let init_statement =
|
let init_statement_kind = std::mem::replace(
|
||||||
basic_blocks[init_loc.block].statements[init_loc.statement_index].replace_nop();
|
&mut basic_blocks[init_loc.block].statements[init_loc.statement_index].kind,
|
||||||
let StatementKind::Assign(place_and_rvalue) = init_statement.kind else {
|
StatementKind::Nop,
|
||||||
|
);
|
||||||
|
let StatementKind::Assign(place_and_rvalue) = init_statement_kind else {
|
||||||
bug!("No longer an assign?");
|
bug!("No longer an assign?");
|
||||||
};
|
};
|
||||||
let (place, rvalue) = *place_and_rvalue;
|
let (place, rvalue) = *place_and_rvalue;
|
||||||
|
|||||||
@ -791,7 +791,7 @@ where
|
|||||||
return Ok(self.make_ambiguous_response_no_constraints(MaybeCause::Ambiguity));
|
return Ok(self.make_ambiguous_response_no_constraints(MaybeCause::Ambiguity));
|
||||||
};
|
};
|
||||||
|
|
||||||
let responses: Vec<_> = match proven_via {
|
match proven_via {
|
||||||
// Even when a trait bound has been proven using a where-bound, we
|
// Even when a trait bound has been proven using a where-bound, we
|
||||||
// still need to consider alias-bounds for normalization, see
|
// still need to consider alias-bounds for normalization, see
|
||||||
// tests/ui/next-solver/alias-bound-shadowed-by-env.rs.
|
// tests/ui/next-solver/alias-bound-shadowed-by-env.rs.
|
||||||
@ -800,7 +800,7 @@ where
|
|||||||
// constness checking. Doing so is *at least theoretically* breaking,
|
// constness checking. Doing so is *at least theoretically* breaking,
|
||||||
// see github.com/rust-lang/rust/issues/133044#issuecomment-2500709754
|
// see github.com/rust-lang/rust/issues/133044#issuecomment-2500709754
|
||||||
TraitGoalProvenVia::ParamEnv | TraitGoalProvenVia::AliasBound => {
|
TraitGoalProvenVia::ParamEnv | TraitGoalProvenVia::AliasBound => {
|
||||||
let mut candidates_from_env: Vec<_> = candidates
|
let mut candidates_from_env_and_bounds: Vec<_> = candidates
|
||||||
.iter()
|
.iter()
|
||||||
.filter(|c| {
|
.filter(|c| {
|
||||||
matches!(
|
matches!(
|
||||||
@ -813,16 +813,37 @@ where
|
|||||||
|
|
||||||
// If the trait goal has been proven by using the environment, we want to treat
|
// If the trait goal has been proven by using the environment, we want to treat
|
||||||
// aliases as rigid if there are no applicable projection bounds in the environment.
|
// aliases as rigid if there are no applicable projection bounds in the environment.
|
||||||
if candidates_from_env.is_empty() {
|
if candidates_from_env_and_bounds.is_empty() {
|
||||||
if let Ok(response) = inject_normalize_to_rigid_candidate(self) {
|
if let Ok(response) = inject_normalize_to_rigid_candidate(self) {
|
||||||
candidates_from_env.push(response);
|
candidates_from_env_and_bounds.push(response);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
candidates_from_env
|
|
||||||
}
|
|
||||||
TraitGoalProvenVia::Misc => candidates.iter().map(|c| c.result).collect(),
|
|
||||||
};
|
|
||||||
|
|
||||||
self.try_merge_responses(&responses).map_or_else(|| self.flounder(&responses), Ok)
|
if let Some(response) = self.try_merge_responses(&candidates_from_env_and_bounds) {
|
||||||
|
Ok(response)
|
||||||
|
} else {
|
||||||
|
self.flounder(&candidates_from_env_and_bounds)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
TraitGoalProvenVia::Misc => {
|
||||||
|
// Prefer "orphaned" param-env normalization predicates, which are used
|
||||||
|
// (for example, and ideally only) when proving item bounds for an impl.
|
||||||
|
let candidates_from_env: Vec<_> = candidates
|
||||||
|
.iter()
|
||||||
|
.filter(|c| matches!(c.source, CandidateSource::ParamEnv(_)))
|
||||||
|
.map(|c| c.result)
|
||||||
|
.collect();
|
||||||
|
if let Some(response) = self.try_merge_responses(&candidates_from_env) {
|
||||||
|
return Ok(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
let responses: Vec<_> = candidates.iter().map(|c| c.result).collect();
|
||||||
|
if let Some(response) = self.try_merge_responses(&responses) {
|
||||||
|
Ok(response)
|
||||||
|
} else {
|
||||||
|
self.flounder(&responses)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -134,42 +134,32 @@ fn univariant_uninterned<'tcx>(
|
|||||||
cx: &LayoutCx<'tcx>,
|
cx: &LayoutCx<'tcx>,
|
||||||
ty: Ty<'tcx>,
|
ty: Ty<'tcx>,
|
||||||
fields: &IndexSlice<FieldIdx, TyAndLayout<'tcx>>,
|
fields: &IndexSlice<FieldIdx, TyAndLayout<'tcx>>,
|
||||||
repr: &ReprOptions,
|
|
||||||
kind: StructKind,
|
kind: StructKind,
|
||||||
) -> Result<LayoutData<FieldIdx, VariantIdx>, &'tcx LayoutError<'tcx>> {
|
) -> Result<LayoutData<FieldIdx, VariantIdx>, &'tcx LayoutError<'tcx>> {
|
||||||
let pack = repr.pack;
|
let repr = ReprOptions::default();
|
||||||
if pack.is_some() && repr.align.is_some() {
|
cx.calc.univariant(fields, &repr, kind).map_err(|err| map_error(cx, ty, err))
|
||||||
cx.tcx().dcx().bug("struct cannot be packed and aligned");
|
|
||||||
}
|
|
||||||
|
|
||||||
cx.calc.univariant(fields, repr, kind).map_err(|err| map_error(cx, ty, err))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn extract_const_value<'tcx>(
|
fn extract_const_value<'tcx>(
|
||||||
const_: ty::Const<'tcx>,
|
|
||||||
ty: Ty<'tcx>,
|
|
||||||
cx: &LayoutCx<'tcx>,
|
cx: &LayoutCx<'tcx>,
|
||||||
|
ty: Ty<'tcx>,
|
||||||
|
ct: ty::Const<'tcx>,
|
||||||
) -> Result<ty::Value<'tcx>, &'tcx LayoutError<'tcx>> {
|
) -> Result<ty::Value<'tcx>, &'tcx LayoutError<'tcx>> {
|
||||||
match const_.kind() {
|
match ct.kind() {
|
||||||
ty::ConstKind::Value(cv) => Ok(cv),
|
ty::ConstKind::Value(cv) => Ok(cv),
|
||||||
ty::ConstKind::Error(guar) => {
|
ty::ConstKind::Param(_) | ty::ConstKind::Expr(_) | ty::ConstKind::Unevaluated(_) => {
|
||||||
return Err(error(cx, LayoutError::ReferencesError(guar)));
|
if !ct.has_param() {
|
||||||
}
|
bug!("failed to normalize const, but it is not generic: {ct:?}");
|
||||||
ty::ConstKind::Param(_) | ty::ConstKind::Expr(_) => {
|
|
||||||
if !const_.has_param() {
|
|
||||||
bug!("no generic type found in the type: {ty:?}");
|
|
||||||
}
|
}
|
||||||
return Err(error(cx, LayoutError::TooGeneric(ty)));
|
Err(error(cx, LayoutError::TooGeneric(ty)))
|
||||||
}
|
}
|
||||||
ty::ConstKind::Unevaluated(_) => {
|
ty::ConstKind::Infer(_)
|
||||||
if !const_.has_param() {
|
| ty::ConstKind::Bound(..)
|
||||||
return Err(error(cx, LayoutError::Unknown(ty)));
|
| ty::ConstKind::Placeholder(_)
|
||||||
} else {
|
| ty::ConstKind::Error(_) => {
|
||||||
return Err(error(cx, LayoutError::TooGeneric(ty)));
|
// `ty::ConstKind::Error` is handled at the top of `layout_of_uncached`
|
||||||
}
|
// (via `ty.error_reported()`).
|
||||||
}
|
bug!("layout_of: unexpected const: {ct:?}");
|
||||||
ty::ConstKind::Infer(_) | ty::ConstKind::Bound(..) | ty::ConstKind::Placeholder(_) => {
|
|
||||||
bug!("unexpected type: {ty:?}");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -194,10 +184,9 @@ fn layout_of_uncached<'tcx>(
|
|||||||
};
|
};
|
||||||
let scalar = |value: Primitive| tcx.mk_layout(LayoutData::scalar(cx, scalar_unit(value)));
|
let scalar = |value: Primitive| tcx.mk_layout(LayoutData::scalar(cx, scalar_unit(value)));
|
||||||
|
|
||||||
let univariant =
|
let univariant = |fields: &IndexSlice<FieldIdx, TyAndLayout<'tcx>>, kind| {
|
||||||
|fields: &IndexSlice<FieldIdx, TyAndLayout<'tcx>>, repr: &ReprOptions, kind| {
|
Ok(tcx.mk_layout(univariant_uninterned(cx, ty, fields, kind)?))
|
||||||
Ok(tcx.mk_layout(univariant_uninterned(cx, ty, fields, repr, kind)?))
|
};
|
||||||
};
|
|
||||||
debug_assert!(!ty.has_non_region_infer());
|
debug_assert!(!ty.has_non_region_infer());
|
||||||
|
|
||||||
Ok(match *ty.kind() {
|
Ok(match *ty.kind() {
|
||||||
@ -210,12 +199,12 @@ fn layout_of_uncached<'tcx>(
|
|||||||
&mut layout.backend_repr
|
&mut layout.backend_repr
|
||||||
{
|
{
|
||||||
if let Some(start) = start {
|
if let Some(start) = start {
|
||||||
scalar.valid_range_mut().start = extract_const_value(start, ty, cx)?
|
scalar.valid_range_mut().start = extract_const_value(cx, ty, start)?
|
||||||
.try_to_bits(tcx, cx.typing_env)
|
.try_to_bits(tcx, cx.typing_env)
|
||||||
.ok_or_else(|| error(cx, LayoutError::Unknown(ty)))?;
|
.ok_or_else(|| error(cx, LayoutError::Unknown(ty)))?;
|
||||||
}
|
}
|
||||||
if let Some(end) = end {
|
if let Some(end) = end {
|
||||||
let mut end = extract_const_value(end, ty, cx)?
|
let mut end = extract_const_value(cx, ty, end)?
|
||||||
.try_to_bits(tcx, cx.typing_env)
|
.try_to_bits(tcx, cx.typing_env)
|
||||||
.ok_or_else(|| error(cx, LayoutError::Unknown(ty)))?;
|
.ok_or_else(|| error(cx, LayoutError::Unknown(ty)))?;
|
||||||
if !include_end {
|
if !include_end {
|
||||||
@ -274,16 +263,11 @@ fn layout_of_uncached<'tcx>(
|
|||||||
data_ptr.valid_range_mut().start = 1;
|
data_ptr.valid_range_mut().start = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
let pointee = tcx.normalize_erasing_regions(cx.typing_env, pointee);
|
|
||||||
if pointee.is_sized(tcx, cx.typing_env) {
|
if pointee.is_sized(tcx, cx.typing_env) {
|
||||||
return Ok(tcx.mk_layout(LayoutData::scalar(cx, data_ptr)));
|
return Ok(tcx.mk_layout(LayoutData::scalar(cx, data_ptr)));
|
||||||
}
|
}
|
||||||
|
|
||||||
let metadata = if let Some(metadata_def_id) = tcx.lang_items().metadata_type()
|
let metadata = if let Some(metadata_def_id) = tcx.lang_items().metadata_type() {
|
||||||
// Projection eagerly bails out when the pointee references errors,
|
|
||||||
// fall back to structurally deducing metadata.
|
|
||||||
&& !pointee.references_error()
|
|
||||||
{
|
|
||||||
let pointee_metadata = Ty::new_projection(tcx, metadata_def_id, [pointee]);
|
let pointee_metadata = Ty::new_projection(tcx, metadata_def_id, [pointee]);
|
||||||
let metadata_ty =
|
let metadata_ty =
|
||||||
match tcx.try_normalize_erasing_regions(cx.typing_env, pointee_metadata) {
|
match tcx.try_normalize_erasing_regions(cx.typing_env, pointee_metadata) {
|
||||||
@ -354,7 +338,7 @@ fn layout_of_uncached<'tcx>(
|
|||||||
|
|
||||||
// Arrays and slices.
|
// Arrays and slices.
|
||||||
ty::Array(element, count) => {
|
ty::Array(element, count) => {
|
||||||
let count = extract_const_value(count, ty, cx)?
|
let count = extract_const_value(cx, ty, count)?
|
||||||
.try_to_target_usize(tcx)
|
.try_to_target_usize(tcx)
|
||||||
.ok_or_else(|| error(cx, LayoutError::Unknown(ty)))?;
|
.ok_or_else(|| error(cx, LayoutError::Unknown(ty)))?;
|
||||||
|
|
||||||
@ -415,17 +399,10 @@ fn layout_of_uncached<'tcx>(
|
|||||||
}),
|
}),
|
||||||
|
|
||||||
// Odd unit types.
|
// Odd unit types.
|
||||||
ty::FnDef(..) => {
|
ty::FnDef(..) => univariant(IndexSlice::empty(), StructKind::AlwaysSized)?,
|
||||||
univariant(IndexSlice::empty(), &ReprOptions::default(), StructKind::AlwaysSized)?
|
|
||||||
}
|
|
||||||
ty::Dynamic(_, _, ty::Dyn) | ty::Foreign(..) => {
|
ty::Dynamic(_, _, ty::Dyn) | ty::Foreign(..) => {
|
||||||
let mut unit = univariant_uninterned(
|
let mut unit =
|
||||||
cx,
|
univariant_uninterned(cx, ty, IndexSlice::empty(), StructKind::AlwaysSized)?;
|
||||||
ty,
|
|
||||||
IndexSlice::empty(),
|
|
||||||
&ReprOptions::default(),
|
|
||||||
StructKind::AlwaysSized,
|
|
||||||
)?;
|
|
||||||
match unit.backend_repr {
|
match unit.backend_repr {
|
||||||
BackendRepr::Memory { ref mut sized } => *sized = false,
|
BackendRepr::Memory { ref mut sized } => *sized = false,
|
||||||
_ => bug!(),
|
_ => bug!(),
|
||||||
@ -439,7 +416,6 @@ fn layout_of_uncached<'tcx>(
|
|||||||
let tys = args.as_closure().upvar_tys();
|
let tys = args.as_closure().upvar_tys();
|
||||||
univariant(
|
univariant(
|
||||||
&tys.iter().map(|ty| cx.layout_of(ty)).try_collect::<IndexVec<_, _>>()?,
|
&tys.iter().map(|ty| cx.layout_of(ty)).try_collect::<IndexVec<_, _>>()?,
|
||||||
&ReprOptions::default(),
|
|
||||||
StructKind::AlwaysSized,
|
StructKind::AlwaysSized,
|
||||||
)?
|
)?
|
||||||
}
|
}
|
||||||
@ -448,7 +424,6 @@ fn layout_of_uncached<'tcx>(
|
|||||||
let tys = args.as_coroutine_closure().upvar_tys();
|
let tys = args.as_coroutine_closure().upvar_tys();
|
||||||
univariant(
|
univariant(
|
||||||
&tys.iter().map(|ty| cx.layout_of(ty)).try_collect::<IndexVec<_, _>>()?,
|
&tys.iter().map(|ty| cx.layout_of(ty)).try_collect::<IndexVec<_, _>>()?,
|
||||||
&ReprOptions::default(),
|
|
||||||
StructKind::AlwaysSized,
|
StructKind::AlwaysSized,
|
||||||
)?
|
)?
|
||||||
}
|
}
|
||||||
@ -457,11 +432,7 @@ fn layout_of_uncached<'tcx>(
|
|||||||
let kind =
|
let kind =
|
||||||
if tys.len() == 0 { StructKind::AlwaysSized } else { StructKind::MaybeUnsized };
|
if tys.len() == 0 { StructKind::AlwaysSized } else { StructKind::MaybeUnsized };
|
||||||
|
|
||||||
univariant(
|
univariant(&tys.iter().map(|k| cx.layout_of(k)).try_collect::<IndexVec<_, _>>()?, kind)?
|
||||||
&tys.iter().map(|k| cx.layout_of(k)).try_collect::<IndexVec<_, _>>()?,
|
|
||||||
&ReprOptions::default(),
|
|
||||||
kind,
|
|
||||||
)?
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// SIMD vector types.
|
// SIMD vector types.
|
||||||
@ -719,25 +690,30 @@ fn layout_of_uncached<'tcx>(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Types with no meaningful known layout.
|
// Types with no meaningful known layout.
|
||||||
ty::Alias(..) => {
|
|
||||||
if ty.has_param() {
|
|
||||||
return Err(error(cx, LayoutError::TooGeneric(ty)));
|
|
||||||
}
|
|
||||||
// NOTE(eddyb) `layout_of` query should've normalized these away,
|
|
||||||
// if that was possible, so there's no reason to try again here.
|
|
||||||
return Err(error(cx, LayoutError::Unknown(ty)));
|
|
||||||
}
|
|
||||||
|
|
||||||
ty::Bound(..) | ty::CoroutineWitness(..) | ty::Infer(_) | ty::Error(_) => {
|
|
||||||
bug!("Layout::compute: unexpected type `{}`", ty)
|
|
||||||
}
|
|
||||||
|
|
||||||
ty::Param(_) => {
|
ty::Param(_) => {
|
||||||
return Err(error(cx, LayoutError::TooGeneric(ty)));
|
return Err(error(cx, LayoutError::TooGeneric(ty)));
|
||||||
}
|
}
|
||||||
|
|
||||||
ty::Placeholder(..) => {
|
ty::Alias(..) => {
|
||||||
return Err(error(cx, LayoutError::Unknown(ty)));
|
// NOTE(eddyb) `layout_of` query should've normalized these away,
|
||||||
|
// if that was possible, so there's no reason to try again here.
|
||||||
|
let err = if ty.has_param() {
|
||||||
|
LayoutError::TooGeneric(ty)
|
||||||
|
} else {
|
||||||
|
// This is only reachable with unsatisfiable predicates. For example, if we have
|
||||||
|
// `u8: Iterator`, then we can't compute the layout of `<u8 as Iterator>::Item`.
|
||||||
|
LayoutError::Unknown(ty)
|
||||||
|
};
|
||||||
|
return Err(error(cx, err));
|
||||||
|
}
|
||||||
|
|
||||||
|
ty::Placeholder(..)
|
||||||
|
| ty::Bound(..)
|
||||||
|
| ty::CoroutineWitness(..)
|
||||||
|
| ty::Infer(_)
|
||||||
|
| ty::Error(_) => {
|
||||||
|
// `ty::Error` is handled at the top of this function.
|
||||||
|
bug!("layout_of: unexpected type `{ty}`")
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -911,13 +887,7 @@ fn coroutine_layout<'tcx>(
|
|||||||
.chain(iter::once(Ok(tag_layout)))
|
.chain(iter::once(Ok(tag_layout)))
|
||||||
.chain(promoted_layouts)
|
.chain(promoted_layouts)
|
||||||
.try_collect::<IndexVec<_, _>>()?;
|
.try_collect::<IndexVec<_, _>>()?;
|
||||||
let prefix = univariant_uninterned(
|
let prefix = univariant_uninterned(cx, ty, &prefix_layouts, StructKind::AlwaysSized)?;
|
||||||
cx,
|
|
||||||
ty,
|
|
||||||
&prefix_layouts,
|
|
||||||
&ReprOptions::default(),
|
|
||||||
StructKind::AlwaysSized,
|
|
||||||
)?;
|
|
||||||
|
|
||||||
let (prefix_size, prefix_align) = (prefix.size, prefix.align);
|
let (prefix_size, prefix_align) = (prefix.size, prefix.align);
|
||||||
|
|
||||||
@ -982,7 +952,6 @@ fn coroutine_layout<'tcx>(
|
|||||||
cx,
|
cx,
|
||||||
ty,
|
ty,
|
||||||
&variant_only_tys.map(|ty| cx.layout_of(ty)).try_collect::<IndexVec<_, _>>()?,
|
&variant_only_tys.map(|ty| cx.layout_of(ty)).try_collect::<IndexVec<_, _>>()?,
|
||||||
&ReprOptions::default(),
|
|
||||||
StructKind::Prefixed(prefix_size, prefix_align.abi),
|
StructKind::Prefixed(prefix_size, prefix_align.abi),
|
||||||
)?;
|
)?;
|
||||||
variant.variants = Variants::Single { index };
|
variant.variants = Variants::Single { index };
|
||||||
|
|||||||
@ -198,7 +198,7 @@ impl str {
|
|||||||
/// Basic usage:
|
/// Basic usage:
|
||||||
///
|
///
|
||||||
/// ```
|
/// ```
|
||||||
/// use std::str;
|
/// #![feature(inherent_str_constructors)]
|
||||||
///
|
///
|
||||||
/// // some bytes, in a vector
|
/// // some bytes, in a vector
|
||||||
/// let sparkle_heart = vec![240, 159, 146, 150];
|
/// let sparkle_heart = vec![240, 159, 146, 150];
|
||||||
@ -207,13 +207,13 @@ impl str {
|
|||||||
/// let sparkle_heart = str::from_utf8(&sparkle_heart)?;
|
/// let sparkle_heart = str::from_utf8(&sparkle_heart)?;
|
||||||
///
|
///
|
||||||
/// assert_eq!("💖", sparkle_heart);
|
/// assert_eq!("💖", sparkle_heart);
|
||||||
/// # Ok::<_, str::Utf8Error>(())
|
/// # Ok::<_, std::str::Utf8Error>(())
|
||||||
/// ```
|
/// ```
|
||||||
///
|
///
|
||||||
/// Incorrect bytes:
|
/// Incorrect bytes:
|
||||||
///
|
///
|
||||||
/// ```
|
/// ```
|
||||||
/// use std::str;
|
/// #![feature(inherent_str_constructors)]
|
||||||
///
|
///
|
||||||
/// // some invalid bytes, in a vector
|
/// // some invalid bytes, in a vector
|
||||||
/// let sparkle_heart = vec![0, 159, 146, 150];
|
/// let sparkle_heart = vec![0, 159, 146, 150];
|
||||||
@ -227,7 +227,7 @@ impl str {
|
|||||||
/// A "stack allocated string":
|
/// A "stack allocated string":
|
||||||
///
|
///
|
||||||
/// ```
|
/// ```
|
||||||
/// use std::str;
|
/// #![feature(inherent_str_constructors)]
|
||||||
///
|
///
|
||||||
/// // some bytes, in a stack-allocated array
|
/// // some bytes, in a stack-allocated array
|
||||||
/// let sparkle_heart = [240, 159, 146, 150];
|
/// let sparkle_heart = [240, 159, 146, 150];
|
||||||
@ -250,7 +250,7 @@ impl str {
|
|||||||
/// Basic usage:
|
/// Basic usage:
|
||||||
///
|
///
|
||||||
/// ```
|
/// ```
|
||||||
/// use std::str;
|
/// #![feature(inherent_str_constructors)]
|
||||||
///
|
///
|
||||||
/// // "Hello, Rust!" as a mutable vector
|
/// // "Hello, Rust!" as a mutable vector
|
||||||
/// let mut hellorust = vec![72, 101, 108, 108, 111, 44, 32, 82, 117, 115, 116, 33];
|
/// let mut hellorust = vec![72, 101, 108, 108, 111, 44, 32, 82, 117, 115, 116, 33];
|
||||||
@ -264,7 +264,7 @@ impl str {
|
|||||||
/// Incorrect bytes:
|
/// Incorrect bytes:
|
||||||
///
|
///
|
||||||
/// ```
|
/// ```
|
||||||
/// use std::str;
|
/// #![feature(inherent_str_constructors)]
|
||||||
///
|
///
|
||||||
/// // Some invalid bytes in a mutable vector
|
/// // Some invalid bytes in a mutable vector
|
||||||
/// let mut invalid = vec![128, 223];
|
/// let mut invalid = vec![128, 223];
|
||||||
@ -294,7 +294,7 @@ impl str {
|
|||||||
/// Basic usage:
|
/// Basic usage:
|
||||||
///
|
///
|
||||||
/// ```
|
/// ```
|
||||||
/// use std::str;
|
/// #![feature(inherent_str_constructors)]
|
||||||
///
|
///
|
||||||
/// // some bytes, in a vector
|
/// // some bytes, in a vector
|
||||||
/// let sparkle_heart = vec![240, 159, 146, 150];
|
/// let sparkle_heart = vec![240, 159, 146, 150];
|
||||||
@ -324,7 +324,7 @@ impl str {
|
|||||||
/// Basic usage:
|
/// Basic usage:
|
||||||
///
|
///
|
||||||
/// ```
|
/// ```
|
||||||
/// use std::str;
|
/// #![feature(inherent_str_constructors)]
|
||||||
///
|
///
|
||||||
/// let mut heart = vec![240, 159, 146, 150];
|
/// let mut heart = vec![240, 159, 146, 150];
|
||||||
/// let heart = unsafe { str::from_utf8_unchecked_mut(&mut heart) };
|
/// let heart = unsafe { str::from_utf8_unchecked_mut(&mut heart) };
|
||||||
|
|||||||
@ -624,21 +624,21 @@ impl File {
|
|||||||
self.inner.datasync()
|
self.inner.datasync()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Acquire an exclusive advisory lock on the file. Blocks until the lock can be acquired.
|
/// Acquire an exclusive lock on the file. Blocks until the lock can be acquired.
|
||||||
///
|
///
|
||||||
/// This acquires an exclusive advisory lock; no other file handle to this file may acquire
|
/// This acquires an exclusive lock; no other file handle to this file may acquire another lock.
|
||||||
/// another lock.
|
|
||||||
///
|
///
|
||||||
/// If this file handle/descriptor, or a clone of it, already holds an advisory lock the exact
|
/// This lock may be advisory or mandatory. This lock is meant to interact with [`lock`],
|
||||||
/// behavior is unspecified and platform dependent, including the possibility that it will
|
/// [`try_lock`], [`lock_shared`], [`try_lock_shared`], and [`unlock`]. Its interactions with
|
||||||
/// deadlock. However, if this method returns, then an exclusive lock is held.
|
/// other methods, such as [`read`] and [`write`] are platform specific, and it may or may not
|
||||||
|
/// cause non-lockholders to block.
|
||||||
|
///
|
||||||
|
/// If this file handle/descriptor, or a clone of it, already holds an lock the exact behavior
|
||||||
|
/// is unspecified and platform dependent, including the possibility that it will deadlock.
|
||||||
|
/// However, if this method returns, then an exclusive lock is held.
|
||||||
///
|
///
|
||||||
/// If the file not open for writing, it is unspecified whether this function returns an error.
|
/// If the file not open for writing, it is unspecified whether this function returns an error.
|
||||||
///
|
///
|
||||||
/// Note, this is an advisory lock meant to interact with [`lock_shared`], [`try_lock`],
|
|
||||||
/// [`try_lock_shared`], and [`unlock`]. Its interactions with other methods, such as [`read`]
|
|
||||||
/// and [`write`] are platform specific, and it may or may not cause non-lockholders to block.
|
|
||||||
///
|
|
||||||
/// The lock will be released when this file (along with any other file descriptors/handles
|
/// The lock will be released when this file (along with any other file descriptors/handles
|
||||||
/// duplicated or inherited from it) is closed, or if the [`unlock`] method is called.
|
/// duplicated or inherited from it) is closed, or if the [`unlock`] method is called.
|
||||||
///
|
///
|
||||||
@ -648,8 +648,12 @@ impl File {
|
|||||||
/// and the `LockFileEx` function on Windows with the `LOCKFILE_EXCLUSIVE_LOCK` flag. Note that,
|
/// and the `LockFileEx` function on Windows with the `LOCKFILE_EXCLUSIVE_LOCK` flag. Note that,
|
||||||
/// this [may change in the future][changes].
|
/// this [may change in the future][changes].
|
||||||
///
|
///
|
||||||
|
/// On Windows, locking a file will fail if the file is opened only for append. To lock a file,
|
||||||
|
/// open it with one of `.read(true)`, `.read(true).append(true)`, or `.write(true)`.
|
||||||
|
///
|
||||||
/// [changes]: io#platform-specific-behavior
|
/// [changes]: io#platform-specific-behavior
|
||||||
///
|
///
|
||||||
|
/// [`lock`]: File::lock
|
||||||
/// [`lock_shared`]: File::lock_shared
|
/// [`lock_shared`]: File::lock_shared
|
||||||
/// [`try_lock`]: File::try_lock
|
/// [`try_lock`]: File::try_lock
|
||||||
/// [`try_lock_shared`]: File::try_lock_shared
|
/// [`try_lock_shared`]: File::try_lock_shared
|
||||||
@ -674,18 +678,19 @@ impl File {
|
|||||||
self.inner.lock()
|
self.inner.lock()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Acquire a shared (non-exclusive) advisory lock on the file. Blocks until the lock can be acquired.
|
/// Acquire a shared (non-exclusive) lock on the file. Blocks until the lock can be acquired.
|
||||||
///
|
///
|
||||||
/// This acquires a shared advisory lock; more than one file handle may hold a shared lock, but
|
/// This acquires a shared lock; more than one file handle may hold a shared lock, but none may
|
||||||
/// none may hold an exclusive lock at the same time.
|
/// hold an exclusive lock at the same time.
|
||||||
///
|
///
|
||||||
/// If this file handle/descriptor, or a clone of it, already holds an advisory lock, the exact
|
/// This lock may be advisory or mandatory. This lock is meant to interact with [`lock`],
|
||||||
/// behavior is unspecified and platform dependent, including the possibility that it will
|
/// [`try_lock`], [`lock_shared`], [`try_lock_shared`], and [`unlock`]. Its interactions with
|
||||||
/// deadlock. However, if this method returns, then a shared lock is held.
|
/// other methods, such as [`read`] and [`write`] are platform specific, and it may or may not
|
||||||
|
/// cause non-lockholders to block.
|
||||||
///
|
///
|
||||||
/// Note, this is an advisory lock meant to interact with [`lock`], [`try_lock`],
|
/// If this file handle/descriptor, or a clone of it, already holds an lock, the exact behavior
|
||||||
/// [`try_lock_shared`], and [`unlock`]. Its interactions with other methods, such as [`read`]
|
/// is unspecified and platform dependent, including the possibility that it will deadlock.
|
||||||
/// and [`write`] are platform specific, and it may or may not cause non-lockholders to block.
|
/// However, if this method returns, then a shared lock is held.
|
||||||
///
|
///
|
||||||
/// The lock will be released when this file (along with any other file descriptors/handles
|
/// The lock will be released when this file (along with any other file descriptors/handles
|
||||||
/// duplicated or inherited from it) is closed, or if the [`unlock`] method is called.
|
/// duplicated or inherited from it) is closed, or if the [`unlock`] method is called.
|
||||||
@ -696,9 +701,13 @@ impl File {
|
|||||||
/// and the `LockFileEx` function on Windows. Note that, this
|
/// and the `LockFileEx` function on Windows. Note that, this
|
||||||
/// [may change in the future][changes].
|
/// [may change in the future][changes].
|
||||||
///
|
///
|
||||||
|
/// On Windows, locking a file will fail if the file is opened only for append. To lock a file,
|
||||||
|
/// open it with one of `.read(true)`, `.read(true).append(true)`, or `.write(true)`.
|
||||||
|
///
|
||||||
/// [changes]: io#platform-specific-behavior
|
/// [changes]: io#platform-specific-behavior
|
||||||
///
|
///
|
||||||
/// [`lock`]: File::lock
|
/// [`lock`]: File::lock
|
||||||
|
/// [`lock_shared`]: File::lock_shared
|
||||||
/// [`try_lock`]: File::try_lock
|
/// [`try_lock`]: File::try_lock
|
||||||
/// [`try_lock_shared`]: File::try_lock_shared
|
/// [`try_lock_shared`]: File::try_lock_shared
|
||||||
/// [`unlock`]: File::unlock
|
/// [`unlock`]: File::unlock
|
||||||
@ -722,25 +731,24 @@ impl File {
|
|||||||
self.inner.lock_shared()
|
self.inner.lock_shared()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Try to acquire an exclusive advisory lock on the file.
|
/// Try to acquire an exclusive lock on the file.
|
||||||
///
|
///
|
||||||
/// Returns `Ok(false)` if a different lock is already held on this file (via another
|
/// Returns `Ok(false)` if a different lock is already held on this file (via another
|
||||||
/// handle/descriptor).
|
/// handle/descriptor).
|
||||||
///
|
///
|
||||||
/// This acquires an exclusive advisory lock; no other file handle to this file may acquire
|
/// This acquires an exclusive lock; no other file handle to this file may acquire another lock.
|
||||||
/// another lock.
|
|
||||||
///
|
///
|
||||||
/// If this file handle/descriptor, or a clone of it, already holds an advisory lock, the exact
|
/// This lock may be advisory or mandatory. This lock is meant to interact with [`lock`],
|
||||||
/// behavior is unspecified and platform dependent, including the possibility that it will
|
/// [`try_lock`], [`lock_shared`], [`try_lock_shared`], and [`unlock`]. Its interactions with
|
||||||
/// deadlock. However, if this method returns `Ok(true)`, then it has acquired an exclusive
|
/// other methods, such as [`read`] and [`write`] are platform specific, and it may or may not
|
||||||
/// lock.
|
/// cause non-lockholders to block.
|
||||||
|
///
|
||||||
|
/// If this file handle/descriptor, or a clone of it, already holds an lock, the exact behavior
|
||||||
|
/// is unspecified and platform dependent, including the possibility that it will deadlock.
|
||||||
|
/// However, if this method returns `Ok(true)`, then it has acquired an exclusive lock.
|
||||||
///
|
///
|
||||||
/// If the file not open for writing, it is unspecified whether this function returns an error.
|
/// If the file not open for writing, it is unspecified whether this function returns an error.
|
||||||
///
|
///
|
||||||
/// Note, this is an advisory lock meant to interact with [`lock`], [`lock_shared`],
|
|
||||||
/// [`try_lock_shared`], and [`unlock`]. Its interactions with other methods, such as [`read`]
|
|
||||||
/// and [`write`] are platform specific, and it may or may not cause non-lockholders to block.
|
|
||||||
///
|
|
||||||
/// The lock will be released when this file (along with any other file descriptors/handles
|
/// The lock will be released when this file (along with any other file descriptors/handles
|
||||||
/// duplicated or inherited from it) is closed, or if the [`unlock`] method is called.
|
/// duplicated or inherited from it) is closed, or if the [`unlock`] method is called.
|
||||||
///
|
///
|
||||||
@ -751,10 +759,14 @@ impl File {
|
|||||||
/// and `LOCKFILE_FAIL_IMMEDIATELY` flags. Note that, this
|
/// and `LOCKFILE_FAIL_IMMEDIATELY` flags. Note that, this
|
||||||
/// [may change in the future][changes].
|
/// [may change in the future][changes].
|
||||||
///
|
///
|
||||||
|
/// On Windows, locking a file will fail if the file is opened only for append. To lock a file,
|
||||||
|
/// open it with one of `.read(true)`, `.read(true).append(true)`, or `.write(true)`.
|
||||||
|
///
|
||||||
/// [changes]: io#platform-specific-behavior
|
/// [changes]: io#platform-specific-behavior
|
||||||
///
|
///
|
||||||
/// [`lock`]: File::lock
|
/// [`lock`]: File::lock
|
||||||
/// [`lock_shared`]: File::lock_shared
|
/// [`lock_shared`]: File::lock_shared
|
||||||
|
/// [`try_lock`]: File::try_lock
|
||||||
/// [`try_lock_shared`]: File::try_lock_shared
|
/// [`try_lock_shared`]: File::try_lock_shared
|
||||||
/// [`unlock`]: File::unlock
|
/// [`unlock`]: File::unlock
|
||||||
/// [`read`]: Read::read
|
/// [`read`]: Read::read
|
||||||
@ -777,22 +789,23 @@ impl File {
|
|||||||
self.inner.try_lock()
|
self.inner.try_lock()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Try to acquire a shared (non-exclusive) advisory lock on the file.
|
/// Try to acquire a shared (non-exclusive) lock on the file.
|
||||||
///
|
///
|
||||||
/// Returns `Ok(false)` if an exclusive lock is already held on this file (via another
|
/// Returns `Ok(false)` if an exclusive lock is already held on this file (via another
|
||||||
/// handle/descriptor).
|
/// handle/descriptor).
|
||||||
///
|
///
|
||||||
/// This acquires a shared advisory lock; more than one file handle may hold a shared lock, but
|
/// This acquires a shared lock; more than one file handle may hold a shared lock, but none may
|
||||||
/// none may hold an exclusive lock at the same time.
|
/// hold an exclusive lock at the same time.
|
||||||
///
|
///
|
||||||
/// If this file handle, or a clone of it, already holds an advisory lock, the exact behavior is
|
/// This lock may be advisory or mandatory. This lock is meant to interact with [`lock`],
|
||||||
|
/// [`try_lock`], [`lock_shared`], [`try_lock_shared`], and [`unlock`]. Its interactions with
|
||||||
|
/// other methods, such as [`read`] and [`write`] are platform specific, and it may or may not
|
||||||
|
/// cause non-lockholders to block.
|
||||||
|
///
|
||||||
|
/// If this file handle, or a clone of it, already holds an lock, the exact behavior is
|
||||||
/// unspecified and platform dependent, including the possibility that it will deadlock.
|
/// unspecified and platform dependent, including the possibility that it will deadlock.
|
||||||
/// However, if this method returns `Ok(true)`, then it has acquired a shared lock.
|
/// However, if this method returns `Ok(true)`, then it has acquired a shared lock.
|
||||||
///
|
///
|
||||||
/// Note, this is an advisory lock meant to interact with [`lock`], [`try_lock`],
|
|
||||||
/// [`try_lock`], and [`unlock`]. Its interactions with other methods, such as [`read`]
|
|
||||||
/// and [`write`] are platform specific, and it may or may not cause non-lockholders to block.
|
|
||||||
///
|
|
||||||
/// The lock will be released when this file (along with any other file descriptors/handles
|
/// The lock will be released when this file (along with any other file descriptors/handles
|
||||||
/// duplicated or inherited from it) is closed, or if the [`unlock`] method is called.
|
/// duplicated or inherited from it) is closed, or if the [`unlock`] method is called.
|
||||||
///
|
///
|
||||||
@ -803,11 +816,15 @@ impl File {
|
|||||||
/// `LOCKFILE_FAIL_IMMEDIATELY` flag. Note that, this
|
/// `LOCKFILE_FAIL_IMMEDIATELY` flag. Note that, this
|
||||||
/// [may change in the future][changes].
|
/// [may change in the future][changes].
|
||||||
///
|
///
|
||||||
|
/// On Windows, locking a file will fail if the file is opened only for append. To lock a file,
|
||||||
|
/// open it with one of `.read(true)`, `.read(true).append(true)`, or `.write(true)`.
|
||||||
|
///
|
||||||
/// [changes]: io#platform-specific-behavior
|
/// [changes]: io#platform-specific-behavior
|
||||||
///
|
///
|
||||||
/// [`lock`]: File::lock
|
/// [`lock`]: File::lock
|
||||||
/// [`lock_shared`]: File::lock_shared
|
/// [`lock_shared`]: File::lock_shared
|
||||||
/// [`try_lock`]: File::try_lock
|
/// [`try_lock`]: File::try_lock
|
||||||
|
/// [`try_lock_shared`]: File::try_lock_shared
|
||||||
/// [`unlock`]: File::unlock
|
/// [`unlock`]: File::unlock
|
||||||
/// [`read`]: Read::read
|
/// [`read`]: Read::read
|
||||||
/// [`write`]: Write::write
|
/// [`write`]: Write::write
|
||||||
@ -844,6 +861,9 @@ impl File {
|
|||||||
/// and the `UnlockFile` function on Windows. Note that, this
|
/// and the `UnlockFile` function on Windows. Note that, this
|
||||||
/// [may change in the future][changes].
|
/// [may change in the future][changes].
|
||||||
///
|
///
|
||||||
|
/// On Windows, locking a file will fail if the file is opened only for append. To lock a file,
|
||||||
|
/// open it with one of `.read(true)`, `.read(true).append(true)`, or `.write(true)`.
|
||||||
|
///
|
||||||
/// [changes]: io#platform-specific-behavior
|
/// [changes]: io#platform-specific-behavior
|
||||||
///
|
///
|
||||||
/// # Examples
|
/// # Examples
|
||||||
|
|||||||
@ -6,25 +6,18 @@ pub static CRATES: &[&str] = &[
|
|||||||
"annotate-snippets",
|
"annotate-snippets",
|
||||||
"anstyle",
|
"anstyle",
|
||||||
"basic-toml",
|
"basic-toml",
|
||||||
"block-buffer",
|
|
||||||
"bumpalo",
|
"bumpalo",
|
||||||
"cfg-if",
|
|
||||||
"cpufeatures",
|
|
||||||
"crypto-common",
|
|
||||||
"darling",
|
"darling",
|
||||||
"darling_core",
|
"darling_core",
|
||||||
"derive_builder_core",
|
"derive_builder_core",
|
||||||
"digest",
|
|
||||||
"fluent-bundle",
|
"fluent-bundle",
|
||||||
"fluent-langneg",
|
"fluent-langneg",
|
||||||
"fluent-syntax",
|
"fluent-syntax",
|
||||||
"fnv",
|
"fnv",
|
||||||
"generic-array",
|
|
||||||
"heck",
|
"heck",
|
||||||
"ident_case",
|
"ident_case",
|
||||||
"intl-memoizer",
|
"intl-memoizer",
|
||||||
"intl_pluralrules",
|
"intl_pluralrules",
|
||||||
"libc",
|
|
||||||
"log",
|
"log",
|
||||||
"memchr",
|
"memchr",
|
||||||
"mime",
|
"mime",
|
||||||
@ -32,17 +25,12 @@ pub static CRATES: &[&str] = &[
|
|||||||
"minimal-lexical",
|
"minimal-lexical",
|
||||||
"nom",
|
"nom",
|
||||||
"num-conv",
|
"num-conv",
|
||||||
"once_cell",
|
|
||||||
"pest",
|
|
||||||
"pest_generator",
|
|
||||||
"pest_meta",
|
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"rinja_parser",
|
"rinja_parser",
|
||||||
"rustc-hash",
|
"rustc-hash",
|
||||||
"self_cell",
|
"self_cell",
|
||||||
"serde",
|
"serde",
|
||||||
"sha2",
|
|
||||||
"smallvec",
|
"smallvec",
|
||||||
"stable_deref_trait",
|
"stable_deref_trait",
|
||||||
"strsim",
|
"strsim",
|
||||||
@ -52,15 +40,12 @@ pub static CRATES: &[&str] = &[
|
|||||||
"time-core",
|
"time-core",
|
||||||
"tinystr",
|
"tinystr",
|
||||||
"type-map",
|
"type-map",
|
||||||
"typenum",
|
|
||||||
"ucd-trie",
|
|
||||||
"unic-langid",
|
"unic-langid",
|
||||||
"unic-langid-impl",
|
"unic-langid-impl",
|
||||||
"unic-langid-macros",
|
"unic-langid-macros",
|
||||||
"unicase",
|
"unicase",
|
||||||
"unicode-ident",
|
"unicode-ident",
|
||||||
"unicode-width",
|
"unicode-width",
|
||||||
"version_check",
|
|
||||||
"wasm-bindgen-backend",
|
"wasm-bindgen-backend",
|
||||||
"wasm-bindgen-macro-support",
|
"wasm-bindgen-macro-support",
|
||||||
"wasm-bindgen-shared",
|
"wasm-bindgen-shared",
|
||||||
|
|||||||
@ -1150,9 +1150,9 @@ fn clean_args_from_types_and_body_id<'tcx>(
|
|||||||
Arguments {
|
Arguments {
|
||||||
values: types
|
values: types
|
||||||
.iter()
|
.iter()
|
||||||
.enumerate()
|
.zip(body.params)
|
||||||
.map(|(i, ty)| Argument {
|
.map(|(ty, param)| Argument {
|
||||||
name: name_from_pat(body.params[i].pat),
|
name: name_from_pat(param.pat),
|
||||||
type_: clean_ty(ty, cx),
|
type_: clean_ty(ty, cx),
|
||||||
is_const: false,
|
is_const: false,
|
||||||
})
|
})
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
use std::assert_matches::debug_assert_matches;
|
use std::assert_matches::debug_assert_matches;
|
||||||
use std::fmt::Write as _;
|
use std::fmt::{self, Display, Write as _};
|
||||||
use std::mem;
|
use std::mem;
|
||||||
use std::sync::LazyLock as Lazy;
|
use std::sync::LazyLock as Lazy;
|
||||||
|
|
||||||
@ -24,6 +24,7 @@ use crate::clean::{
|
|||||||
clean_middle_ty, inline,
|
clean_middle_ty, inline,
|
||||||
};
|
};
|
||||||
use crate::core::DocContext;
|
use crate::core::DocContext;
|
||||||
|
use crate::display::Joined as _;
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests;
|
mod tests;
|
||||||
@ -250,16 +251,20 @@ pub(crate) fn qpath_to_string(p: &hir::QPath<'_>) -> String {
|
|||||||
hir::QPath::LangItem(lang_item, ..) => return lang_item.name().to_string(),
|
hir::QPath::LangItem(lang_item, ..) => return lang_item.name().to_string(),
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut s = String::new();
|
fmt::from_fn(|f| {
|
||||||
for (i, seg) in segments.iter().enumerate() {
|
segments
|
||||||
if i > 0 {
|
.iter()
|
||||||
s.push_str("::");
|
.map(|seg| {
|
||||||
}
|
fmt::from_fn(|f| {
|
||||||
if seg.ident.name != kw::PathRoot {
|
if seg.ident.name != kw::PathRoot {
|
||||||
s.push_str(seg.ident.as_str());
|
write!(f, "{}", seg.ident)?;
|
||||||
}
|
}
|
||||||
}
|
Ok(())
|
||||||
s
|
})
|
||||||
|
})
|
||||||
|
.joined("::", f)
|
||||||
|
})
|
||||||
|
.to_string()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn build_deref_target_impls(
|
pub(crate) fn build_deref_target_impls(
|
||||||
@ -299,35 +304,49 @@ pub(crate) fn name_from_pat(p: &hir::Pat<'_>) -> Symbol {
|
|||||||
|
|
||||||
Symbol::intern(&match p.kind {
|
Symbol::intern(&match p.kind {
|
||||||
// FIXME(never_patterns): does this make sense?
|
// FIXME(never_patterns): does this make sense?
|
||||||
PatKind::Wild | PatKind::Err(_) | PatKind::Never | PatKind::Struct(..) => {
|
PatKind::Wild
|
||||||
|
| PatKind::Err(_)
|
||||||
|
| PatKind::Never
|
||||||
|
| PatKind::Struct(..)
|
||||||
|
| PatKind::Range(..) => {
|
||||||
return kw::Underscore;
|
return kw::Underscore;
|
||||||
}
|
}
|
||||||
PatKind::Binding(_, _, ident, _) => return ident.name,
|
PatKind::Binding(_, _, ident, _) => return ident.name,
|
||||||
|
PatKind::Box(p) | PatKind::Ref(p, _) | PatKind::Guard(p, _) => return name_from_pat(p),
|
||||||
PatKind::TupleStruct(ref p, ..)
|
PatKind::TupleStruct(ref p, ..)
|
||||||
| PatKind::Expr(PatExpr { kind: PatExprKind::Path(ref p), .. }) => qpath_to_string(p),
|
| PatKind::Expr(PatExpr { kind: PatExprKind::Path(ref p), .. }) => qpath_to_string(p),
|
||||||
PatKind::Or(pats) => {
|
PatKind::Or(pats) => {
|
||||||
pats.iter().map(|p| name_from_pat(p).to_string()).collect::<Vec<String>>().join(" | ")
|
fmt::from_fn(|f| pats.iter().map(|p| name_from_pat(p)).joined(" | ", f)).to_string()
|
||||||
|
}
|
||||||
|
PatKind::Tuple(elts, _) => {
|
||||||
|
format!("({})", fmt::from_fn(|f| elts.iter().map(|p| name_from_pat(p)).joined(", ", f)))
|
||||||
}
|
}
|
||||||
PatKind::Tuple(elts, _) => format!(
|
|
||||||
"({})",
|
|
||||||
elts.iter().map(|p| name_from_pat(p).to_string()).collect::<Vec<String>>().join(", ")
|
|
||||||
),
|
|
||||||
PatKind::Box(p) => return name_from_pat(p),
|
|
||||||
PatKind::Deref(p) => format!("deref!({})", name_from_pat(p)),
|
PatKind::Deref(p) => format!("deref!({})", name_from_pat(p)),
|
||||||
PatKind::Ref(p, _) => return name_from_pat(p),
|
|
||||||
PatKind::Expr(..) => {
|
PatKind::Expr(..) => {
|
||||||
warn!(
|
warn!(
|
||||||
"tried to get argument name from PatKind::Expr, which is silly in function arguments"
|
"tried to get argument name from PatKind::Expr, which is silly in function arguments"
|
||||||
);
|
);
|
||||||
return Symbol::intern("()");
|
return Symbol::intern("()");
|
||||||
}
|
}
|
||||||
PatKind::Guard(p, _) => return name_from_pat(p),
|
PatKind::Slice(begin, mid, end) => {
|
||||||
PatKind::Range(..) => return kw::Underscore,
|
fn print_pat<'a>(pat: &'a Pat<'a>, wild: bool) -> impl Display + 'a {
|
||||||
PatKind::Slice(begin, ref mid, end) => {
|
fmt::from_fn(move |f| {
|
||||||
let begin = begin.iter().map(|p| name_from_pat(p).to_string());
|
if wild {
|
||||||
let mid = mid.as_ref().map(|p| format!("..{}", name_from_pat(p))).into_iter();
|
f.write_str("..")?;
|
||||||
let end = end.iter().map(|p| name_from_pat(p).to_string());
|
}
|
||||||
format!("[{}]", begin.chain(mid).chain(end).collect::<Vec<_>>().join(", "))
|
name_from_pat(pat).fmt(f)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
format!(
|
||||||
|
"[{}]",
|
||||||
|
fmt::from_fn(|f| {
|
||||||
|
let begin = begin.iter().map(|p| print_pat(p, false));
|
||||||
|
let mid = mid.map(|p| print_pat(p, true));
|
||||||
|
let end = end.iter().map(|p| print_pat(p, false));
|
||||||
|
begin.chain(mid).chain(end).joined(", ", f)
|
||||||
|
})
|
||||||
|
)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
//! Logic for transforming the raw code given by the user into something actually
|
//! Logic for transforming the raw code given by the user into something actually
|
||||||
//! runnable, e.g. by adding a `main` function if it doesn't already exist.
|
//! runnable, e.g. by adding a `main` function if it doesn't already exist.
|
||||||
|
|
||||||
|
use std::fmt::{self, Write as _};
|
||||||
use std::io;
|
use std::io;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
@ -17,6 +18,7 @@ use rustc_span::symbol::sym;
|
|||||||
use tracing::debug;
|
use tracing::debug;
|
||||||
|
|
||||||
use super::GlobalTestOptions;
|
use super::GlobalTestOptions;
|
||||||
|
use crate::display::Joined as _;
|
||||||
use crate::html::markdown::LangString;
|
use crate::html::markdown::LangString;
|
||||||
|
|
||||||
/// This struct contains information about the doctest itself which is then used to generate
|
/// This struct contains information about the doctest itself which is then used to generate
|
||||||
@ -232,13 +234,15 @@ impl DocTestBuilder {
|
|||||||
|
|
||||||
// add extra 4 spaces for each line to offset the code block
|
// add extra 4 spaces for each line to offset the code block
|
||||||
if opts.insert_indent_space {
|
if opts.insert_indent_space {
|
||||||
prog.push_str(
|
write!(
|
||||||
&everything_else
|
prog,
|
||||||
|
"{}",
|
||||||
|
fmt::from_fn(|f| everything_else
|
||||||
.lines()
|
.lines()
|
||||||
.map(|line| format!(" {}", line))
|
.map(|line| fmt::from_fn(move |f| write!(f, " {line}")))
|
||||||
.collect::<Vec<String>>()
|
.joined("\n", f))
|
||||||
.join("\n"),
|
)
|
||||||
);
|
.unwrap();
|
||||||
} else {
|
} else {
|
||||||
prog.push_str(everything_else);
|
prog.push_str(everything_else);
|
||||||
};
|
};
|
||||||
|
|||||||
@ -2,7 +2,6 @@ use std::cmp::Ordering;
|
|||||||
use std::fmt;
|
use std::fmt;
|
||||||
use std::fmt::Display;
|
use std::fmt::Display;
|
||||||
|
|
||||||
use itertools::Itertools;
|
|
||||||
use rinja::Template;
|
use rinja::Template;
|
||||||
use rustc_abi::VariantIdx;
|
use rustc_abi::VariantIdx;
|
||||||
use rustc_data_structures::captures::Captures;
|
use rustc_data_structures::captures::Captures;
|
||||||
@ -514,11 +513,7 @@ fn item_module(w: &mut String, cx: &Context<'_>, item: &clean::Item, items: &[cl
|
|||||||
class = myitem.type_(),
|
class = myitem.type_(),
|
||||||
unsafety_flag = unsafety_flag,
|
unsafety_flag = unsafety_flag,
|
||||||
href = item_path(myitem.type_(), myitem.name.unwrap().as_str()),
|
href = item_path(myitem.type_(), myitem.name.unwrap().as_str()),
|
||||||
title = [myitem.type_().to_string(), full_path(cx, myitem)]
|
title = format_args!("{} {}", myitem.type_(), full_path(cx, myitem)),
|
||||||
.iter()
|
|
||||||
.filter_map(|s| if !s.is_empty() { Some(s.as_str()) } else { None })
|
|
||||||
.collect::<Vec<_>>()
|
|
||||||
.join(" "),
|
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -915,7 +910,7 @@ fn item_trait(w: &mut String, cx: &Context<'_>, it: &clean::Item, t: &clean::Tra
|
|||||||
w,
|
w,
|
||||||
format_args!(
|
format_args!(
|
||||||
"<div class=\"stab must_implement\">At least one of the `{}` methods is required.</div>",
|
"<div class=\"stab must_implement\">At least one of the `{}` methods is required.</div>",
|
||||||
list.iter().join("`, `")
|
fmt::from_fn(|f| list.iter().joined("`, `", f))
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -1168,17 +1163,18 @@ fn item_trait(w: &mut String, cx: &Context<'_>, it: &clean::Item, t: &clean::Tra
|
|||||||
js_src_path.extend(cx.current.iter().copied());
|
js_src_path.extend(cx.current.iter().copied());
|
||||||
js_src_path.push_fmt(format_args!("{}.{}.js", it.type_(), it.name.unwrap()));
|
js_src_path.push_fmt(format_args!("{}.{}.js", it.type_(), it.name.unwrap()));
|
||||||
}
|
}
|
||||||
let extern_crates = extern_crates
|
let extern_crates = fmt::from_fn(|f| {
|
||||||
.into_iter()
|
if !extern_crates.is_empty() {
|
||||||
.map(|cnum| tcx.crate_name(cnum).to_string())
|
f.write_str(" data-ignore-extern-crates=\"")?;
|
||||||
.collect::<Vec<_>>()
|
extern_crates.iter().map(|&cnum| tcx.crate_name(cnum)).joined(",", f)?;
|
||||||
.join(",");
|
f.write_str("\"")?;
|
||||||
let (extern_before, extern_after) =
|
}
|
||||||
if extern_crates.is_empty() { ("", "") } else { (" data-ignore-extern-crates=\"", "\"") };
|
Ok(())
|
||||||
|
});
|
||||||
write_str(
|
write_str(
|
||||||
w,
|
w,
|
||||||
format_args!(
|
format_args!(
|
||||||
"<script src=\"{src}\"{extern_before}{extern_crates}{extern_after} async></script>",
|
"<script src=\"{src}\"{extern_crates} async></script>",
|
||||||
src = js_src_path.finish()
|
src = js_src_path.finish()
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
@ -1400,7 +1396,7 @@ fn item_type_alias(w: &mut String, cx: &Context<'_>, it: &clean::Item, t: &clean
|
|||||||
.collect();
|
.collect();
|
||||||
js_src_path.extend(target_fqp[..target_fqp.len() - 1].iter().copied());
|
js_src_path.extend(target_fqp[..target_fqp.len() - 1].iter().copied());
|
||||||
js_src_path.push_fmt(format_args!("{target_type}.{}.js", target_fqp.last().unwrap()));
|
js_src_path.push_fmt(format_args!("{target_type}.{}.js", target_fqp.last().unwrap()));
|
||||||
let self_path = self_fqp.iter().map(Symbol::as_str).collect::<Vec<&str>>().join("::");
|
let self_path = fmt::from_fn(|f| self_fqp.iter().joined("::", f));
|
||||||
write_str(
|
write_str(
|
||||||
w,
|
w,
|
||||||
format_args!(
|
format_args!(
|
||||||
|
|||||||
@ -2,6 +2,7 @@
|
|||||||
name = "error_index_generator"
|
name = "error_index_generator"
|
||||||
version = "0.0.0"
|
version = "0.0.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
workspace = "../rustbook"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
mdbook = { version = "0.4", default-features = false, features = ["search"] }
|
mdbook = { version = "0.4", default-features = false, features = ["search"] }
|
||||||
|
|||||||
@ -446,6 +446,13 @@ dependencies = [
|
|||||||
"windows-sys",
|
"windows-sys",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "error_index_generator"
|
||||||
|
version = "0.0.0"
|
||||||
|
dependencies = [
|
||||||
|
"mdbook",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "fastrand"
|
name = "fastrand"
|
||||||
version = "2.3.0"
|
version = "2.3.0"
|
||||||
@ -867,9 +874,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "mdbook"
|
name = "mdbook"
|
||||||
version = "0.4.44"
|
version = "0.4.45"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f9da1e54401fe5d45a664c57e112e70f18e8c5a73e268c179305b932ee864574"
|
checksum = "b07d36d96ffe1b5b16ddf2bc80b3b26bb7a498b2a6591061250bf0af8e8095ad"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ammonia",
|
"ammonia",
|
||||||
"anyhow",
|
"anyhow",
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
[workspace]
|
[workspace]
|
||||||
|
members = ["../error_index_generator"]
|
||||||
|
|
||||||
[package]
|
[package]
|
||||||
name = "rustbook"
|
name = "rustbook"
|
||||||
@ -14,6 +15,6 @@ mdbook-i18n-helpers = "0.3.3"
|
|||||||
mdbook-spec = { path = "../../doc/reference/mdbook-spec" }
|
mdbook-spec = { path = "../../doc/reference/mdbook-spec" }
|
||||||
|
|
||||||
[dependencies.mdbook]
|
[dependencies.mdbook]
|
||||||
version = "0.4.44"
|
version = "0.4.45"
|
||||||
default-features = false
|
default-features = false
|
||||||
features = ["search"]
|
features = ["search"]
|
||||||
|
|||||||
@ -99,7 +99,6 @@ const EXCEPTIONS: ExceptionList = &[
|
|||||||
("dissimilar", "Apache-2.0"), // rustdoc, rustc_lexer (few tests) via expect-test, (dev deps)
|
("dissimilar", "Apache-2.0"), // rustdoc, rustc_lexer (few tests) via expect-test, (dev deps)
|
||||||
("fluent-langneg", "Apache-2.0"), // rustc (fluent translations)
|
("fluent-langneg", "Apache-2.0"), // rustc (fluent translations)
|
||||||
("foldhash", "Zlib"), // rustc
|
("foldhash", "Zlib"), // rustc
|
||||||
("mdbook", "MPL-2.0"), // mdbook
|
|
||||||
("option-ext", "MPL-2.0"), // cargo-miri (via `directories`)
|
("option-ext", "MPL-2.0"), // cargo-miri (via `directories`)
|
||||||
("rustc_apfloat", "Apache-2.0 WITH LLVM-exception"), // rustc (license is the same as LLVM uses)
|
("rustc_apfloat", "Apache-2.0 WITH LLVM-exception"), // rustc (license is the same as LLVM uses)
|
||||||
("ryu", "Apache-2.0 OR BSL-1.0"), // BSL is not acceptble, but we use it under Apache-2.0 // cargo/... (because of serde)
|
("ryu", "Apache-2.0 OR BSL-1.0"), // BSL is not acceptble, but we use it under Apache-2.0 // cargo/... (because of serde)
|
||||||
@ -667,7 +666,7 @@ pub static CRATES: &[&str] = &[
|
|||||||
for extra in expected.difference(&proc_macro_deps) {
|
for extra in expected.difference(&proc_macro_deps) {
|
||||||
tidy_error!(
|
tidy_error!(
|
||||||
bad,
|
bad,
|
||||||
"`{extra}` is not registered in `src/bootstrap/src/utils/proc_macro_deps.rs`, but is not a proc-macro crate dependency",
|
"`{extra}` is registered in `src/bootstrap/src/utils/proc_macro_deps.rs`, but is not a proc-macro crate dependency",
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if *bad != old_bad {
|
if *bad != old_bad {
|
||||||
|
|||||||
@ -47,6 +47,7 @@
|
|||||||
+ Deinit(_8);
|
+ Deinit(_8);
|
||||||
+ copy_nonoverlapping(dst = copy _9, src = copy _11, count = copy _7);
|
+ copy_nonoverlapping(dst = copy _9, src = copy _11, count = copy _7);
|
||||||
+ StorageDead(_4);
|
+ StorageDead(_4);
|
||||||
|
+ nop;
|
||||||
StorageDead(_2);
|
StorageDead(_2);
|
||||||
- _0 = move _1;
|
- _0 = move _1;
|
||||||
+ StorageLive(_12);
|
+ StorageLive(_12);
|
||||||
@ -61,6 +62,7 @@
|
|||||||
+ Deinit(_16);
|
+ Deinit(_16);
|
||||||
+ copy_nonoverlapping(dst = copy _17, src = copy _19, count = copy _15);
|
+ copy_nonoverlapping(dst = copy _17, src = copy _19, count = copy _15);
|
||||||
+ StorageDead(_12);
|
+ StorageDead(_12);
|
||||||
|
+ nop;
|
||||||
StorageDead(_1);
|
StorageDead(_1);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -47,6 +47,7 @@
|
|||||||
+ Deinit(_8);
|
+ Deinit(_8);
|
||||||
+ copy_nonoverlapping(dst = copy _9, src = copy _11, count = copy _7);
|
+ copy_nonoverlapping(dst = copy _9, src = copy _11, count = copy _7);
|
||||||
+ StorageDead(_4);
|
+ StorageDead(_4);
|
||||||
|
+ nop;
|
||||||
StorageDead(_2);
|
StorageDead(_2);
|
||||||
- _0 = move _1;
|
- _0 = move _1;
|
||||||
+ StorageLive(_12);
|
+ StorageLive(_12);
|
||||||
@ -61,6 +62,7 @@
|
|||||||
+ Deinit(_16);
|
+ Deinit(_16);
|
||||||
+ copy_nonoverlapping(dst = copy _17, src = copy _19, count = copy _15);
|
+ copy_nonoverlapping(dst = copy _17, src = copy _19, count = copy _15);
|
||||||
+ StorageDead(_12);
|
+ StorageDead(_12);
|
||||||
|
+ nop;
|
||||||
StorageDead(_1);
|
StorageDead(_1);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -47,6 +47,7 @@
|
|||||||
+ Deinit(_8);
|
+ Deinit(_8);
|
||||||
+ copy_nonoverlapping(dst = copy _9, src = copy _11, count = copy _7);
|
+ copy_nonoverlapping(dst = copy _9, src = copy _11, count = copy _7);
|
||||||
+ StorageDead(_4);
|
+ StorageDead(_4);
|
||||||
|
+ nop;
|
||||||
StorageDead(_2);
|
StorageDead(_2);
|
||||||
- _0 = move _1;
|
- _0 = move _1;
|
||||||
+ StorageLive(_12);
|
+ StorageLive(_12);
|
||||||
@ -61,6 +62,7 @@
|
|||||||
+ Deinit(_16);
|
+ Deinit(_16);
|
||||||
+ copy_nonoverlapping(dst = copy _17, src = copy _19, count = copy _15);
|
+ copy_nonoverlapping(dst = copy _17, src = copy _19, count = copy _15);
|
||||||
+ StorageDead(_12);
|
+ StorageDead(_12);
|
||||||
|
+ nop;
|
||||||
StorageDead(_1);
|
StorageDead(_1);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -47,6 +47,7 @@
|
|||||||
+ Deinit(_8);
|
+ Deinit(_8);
|
||||||
+ copy_nonoverlapping(dst = copy _9, src = copy _11, count = copy _7);
|
+ copy_nonoverlapping(dst = copy _9, src = copy _11, count = copy _7);
|
||||||
+ StorageDead(_4);
|
+ StorageDead(_4);
|
||||||
|
+ nop;
|
||||||
StorageDead(_2);
|
StorageDead(_2);
|
||||||
- _0 = move _1;
|
- _0 = move _1;
|
||||||
+ StorageLive(_12);
|
+ StorageLive(_12);
|
||||||
@ -61,6 +62,7 @@
|
|||||||
+ Deinit(_16);
|
+ Deinit(_16);
|
||||||
+ copy_nonoverlapping(dst = copy _17, src = copy _19, count = copy _15);
|
+ copy_nonoverlapping(dst = copy _17, src = copy _19, count = copy _15);
|
||||||
+ StorageDead(_12);
|
+ StorageDead(_12);
|
||||||
|
+ nop;
|
||||||
StorageDead(_1);
|
StorageDead(_1);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
error[E0478]: lifetime bound not satisfied
|
error[E0478]: lifetime bound not satisfied
|
||||||
--> $DIR/issue-91883.rs:30:24
|
--> $DIR/issue-91883.rs:34:24
|
||||||
|
|
|
|
||||||
LL | type Cursor<'tx>: Cursor<'tx>
|
LL | type Cursor<'tx>: Cursor<'tx>
|
||||||
| ----------------------------- definition of `Cursor` from trait
|
| ----------------------------- definition of `Cursor` from trait
|
||||||
@ -8,12 +8,12 @@ LL | type Cursor<'tx> = CursorImpl<'tx>;
|
|||||||
| ^^^^^^^^^^^^^^^
|
| ^^^^^^^^^^^^^^^
|
||||||
|
|
|
|
||||||
note: lifetime parameter instantiated with the lifetime `'db` as defined here
|
note: lifetime parameter instantiated with the lifetime `'db` as defined here
|
||||||
--> $DIR/issue-91883.rs:29:6
|
--> $DIR/issue-91883.rs:33:6
|
||||||
|
|
|
|
||||||
LL | impl<'db> Transaction<'db> for TransactionImpl<'db> {
|
LL | impl<'db> Transaction<'db> for TransactionImpl<'db> {
|
||||||
| ^^^
|
| ^^^
|
||||||
note: but lifetime parameter must outlive the lifetime `'tx` as defined here
|
note: but lifetime parameter must outlive the lifetime `'tx` as defined here
|
||||||
--> $DIR/issue-91883.rs:30:17
|
--> $DIR/issue-91883.rs:34:17
|
||||||
|
|
|
|
||||||
LL | type Cursor<'tx> = CursorImpl<'tx>;
|
LL | type Cursor<'tx> = CursorImpl<'tx>;
|
||||||
| ^^^
|
| ^^^
|
||||||
20
tests/ui/generic-associated-types/issue-91883.next.stderr
Normal file
20
tests/ui/generic-associated-types/issue-91883.next.stderr
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
error[E0478]: lifetime bound not satisfied
|
||||||
|
--> $DIR/issue-91883.rs:34:24
|
||||||
|
|
|
||||||
|
LL | type Cursor<'tx> = CursorImpl<'tx>;
|
||||||
|
| ^^^^^^^^^^^^^^^
|
||||||
|
|
|
||||||
|
note: lifetime parameter instantiated with the lifetime `'db` as defined here
|
||||||
|
--> $DIR/issue-91883.rs:33:6
|
||||||
|
|
|
||||||
|
LL | impl<'db> Transaction<'db> for TransactionImpl<'db> {
|
||||||
|
| ^^^
|
||||||
|
note: but lifetime parameter must outlive the lifetime `'tx` as defined here
|
||||||
|
--> $DIR/issue-91883.rs:34:17
|
||||||
|
|
|
||||||
|
LL | type Cursor<'tx> = CursorImpl<'tx>;
|
||||||
|
| ^^^
|
||||||
|
|
||||||
|
error: aborting due to 1 previous error
|
||||||
|
|
||||||
|
For more information about this error, try `rustc --explain E0478`.
|
||||||
@ -1,3 +1,7 @@
|
|||||||
|
//@ revisions: current next
|
||||||
|
//@ ignore-compare-mode-next-solver (explicit revisions)
|
||||||
|
//@[next] compile-flags: -Znext-solver
|
||||||
|
|
||||||
use std::fmt::Debug;
|
use std::fmt::Debug;
|
||||||
use std::marker::PhantomData;
|
use std::marker::PhantomData;
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,8 @@
|
|||||||
//@ edition:2021
|
//@ edition:2021
|
||||||
//@ check-pass
|
//@ check-pass
|
||||||
|
//@ revisions: current next
|
||||||
|
//@ ignore-compare-mode-next-solver (explicit revisions)
|
||||||
|
//@[next] compile-flags: -Znext-solver
|
||||||
|
|
||||||
use std::fmt::Debug;
|
use std::fmt::Debug;
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,7 @@
|
|||||||
//@ check-pass
|
//@ check-pass
|
||||||
|
//@ revisions: current next
|
||||||
|
//@ ignore-compare-mode-next-solver (explicit revisions)
|
||||||
|
//@[next] compile-flags: -Znext-solver
|
||||||
|
|
||||||
use std::ops::Deref;
|
use std::ops::Deref;
|
||||||
|
|
||||||
|
|||||||
@ -82,3 +82,8 @@ type Impossible = (str, str); //~ ERROR: cannot be known at compilation time
|
|||||||
#[rustc_layout(debug)]
|
#[rustc_layout(debug)]
|
||||||
union EmptyUnion {} //~ ERROR: has an unknown layout
|
union EmptyUnion {} //~ ERROR: has an unknown layout
|
||||||
//~^ ERROR: unions cannot have zero fields
|
//~^ ERROR: unions cannot have zero fields
|
||||||
|
|
||||||
|
// Test the error message of `LayoutError::TooGeneric`
|
||||||
|
// (this error is never emitted to users).
|
||||||
|
#[rustc_layout(debug)]
|
||||||
|
type TooGeneric<T> = T; //~ ERROR: does not have a fixed layout
|
||||||
|
|||||||
@ -596,12 +596,18 @@ error: the type has an unknown layout
|
|||||||
LL | union EmptyUnion {}
|
LL | union EmptyUnion {}
|
||||||
| ^^^^^^^^^^^^^^^^
|
| ^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
error: the type `T` does not have a fixed layout
|
||||||
|
--> $DIR/debug.rs:89:1
|
||||||
|
|
|
||||||
|
LL | type TooGeneric<T> = T;
|
||||||
|
| ^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
error: `#[rustc_layout]` can only be applied to `struct`/`enum`/`union` declarations and type aliases
|
error: `#[rustc_layout]` can only be applied to `struct`/`enum`/`union` declarations and type aliases
|
||||||
--> $DIR/debug.rs:75:5
|
--> $DIR/debug.rs:75:5
|
||||||
|
|
|
|
||||||
LL | const C: () = ();
|
LL | const C: () = ();
|
||||||
| ^^^^^^^^^^^
|
| ^^^^^^^^^^^
|
||||||
|
|
||||||
error: aborting due to 19 previous errors
|
error: aborting due to 20 previous errors
|
||||||
|
|
||||||
For more information about this error, try `rustc --explain E0277`.
|
For more information about this error, try `rustc --explain E0277`.
|
||||||
|
|||||||
57
tests/ui/layout/normalization-failure.rs
Normal file
57
tests/ui/layout/normalization-failure.rs
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
//! This test demonstrates how `LayoutError::NormalizationFailure` can happen and why
|
||||||
|
//! it is necessary.
|
||||||
|
//!
|
||||||
|
//! This code does not cause an immediate normalization error in typeck, because we
|
||||||
|
//! don't reveal the hidden type returned by `opaque<T>` in the analysis typing mode.
|
||||||
|
//! Instead, `<{opaque} as Project2>::Assoc2` is a *rigid projection*, because we know
|
||||||
|
//! that `{opaque}: Project2` holds, due to the opaque type's `impl Project2` bound,
|
||||||
|
//! but cannot normalize `<{opaque} as Project2>::Assoc2` any further.
|
||||||
|
//!
|
||||||
|
//! However, in the post-analysis typing mode, which is used for the layout computation,
|
||||||
|
//! the opaque's hidden type is revealed to be `PhantomData<T>`, and now we fail to
|
||||||
|
//! normalize `<PhantomData<T> as Project2>::Assoc2` if there is a `T: Project1` bound
|
||||||
|
//! in the param env! This happens, because `PhantomData<T>: Project2` only holds if
|
||||||
|
//! `<T as Project1>::Assoc1 == ()` holds. This would usually be satisfied by the
|
||||||
|
//! blanket `impl<T> Project1 for T`, but due to the `T: Project1` bound we do not
|
||||||
|
//! normalize `<T as Project1>::Assoc1` via the impl and treat it as rigid instead.
|
||||||
|
//! Therefore, `PhantomData<T>: Project2` does NOT hold and normalizing
|
||||||
|
//! `<PhantomData<T> as Project2>::Assoc2` fails.
|
||||||
|
//!
|
||||||
|
//! Note that this layout error can only happen when computing the layout in a generic
|
||||||
|
//! context, which is not required for codegen, but may happen for lints, MIR optimizations,
|
||||||
|
//! and the transmute check.
|
||||||
|
|
||||||
|
use std::marker::PhantomData;
|
||||||
|
|
||||||
|
trait Project1 {
|
||||||
|
type Assoc1;
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T> Project1 for T {
|
||||||
|
type Assoc1 = ();
|
||||||
|
}
|
||||||
|
|
||||||
|
trait Project2 {
|
||||||
|
type Assoc2;
|
||||||
|
fn get(self) -> Self::Assoc2;
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T: Project1<Assoc1 = ()>> Project2 for PhantomData<T> {
|
||||||
|
type Assoc2 = ();
|
||||||
|
fn get(self) -> Self::Assoc2 {}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn opaque<T>() -> impl Project2 {
|
||||||
|
PhantomData::<T>
|
||||||
|
}
|
||||||
|
|
||||||
|
fn check<T: Project1>() {
|
||||||
|
unsafe {
|
||||||
|
std::mem::transmute::<_, ()>(opaque::<T>().get());
|
||||||
|
//~^ ERROR: cannot transmute
|
||||||
|
//~| NOTE: (unable to determine layout for `<impl Project2 as Project2>::Assoc2` because `<impl Project2 as Project2>::Assoc2` cannot be normalized)
|
||||||
|
//~| NOTE: (0 bits)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {}
|
||||||
12
tests/ui/layout/normalization-failure.stderr
Normal file
12
tests/ui/layout/normalization-failure.stderr
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
|
||||||
|
--> $DIR/normalization-failure.rs:50:9
|
||||||
|
|
|
||||||
|
LL | std::mem::transmute::<_, ()>(opaque::<T>().get());
|
||||||
|
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
|
||||||
|
= note: source type: `<impl Project2 as Project2>::Assoc2` (unable to determine layout for `<impl Project2 as Project2>::Assoc2` because `<impl Project2 as Project2>::Assoc2` cannot be normalized)
|
||||||
|
= note: target type: `()` (0 bits)
|
||||||
|
|
||||||
|
error: aborting due to 1 previous error
|
||||||
|
|
||||||
|
For more information about this error, try `rustc --explain E0512`.
|
||||||
@ -9,3 +9,10 @@ macro_rules! mixed_edition_pat {
|
|||||||
Some(mut $foo)
|
Some(mut $foo)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[macro_export]
|
||||||
|
macro_rules! bind_ref {
|
||||||
|
($foo:ident) => {
|
||||||
|
ref $foo
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|||||||
@ -239,4 +239,9 @@ fn main() {
|
|||||||
assert_type_eq(b, &0u32);
|
assert_type_eq(b, &0u32);
|
||||||
assert_type_eq(c, &[0u32]);
|
assert_type_eq(c, &[0u32]);
|
||||||
assert_type_eq(d, 0u32);
|
assert_type_eq(d, 0u32);
|
||||||
|
|
||||||
|
// Test that we use the correct message and suggestion style when pointing inside expansions.
|
||||||
|
let &[migration_lint_macros::bind_ref!(a)] = &[0];
|
||||||
|
//~^ ERROR: binding modifiers may only be written when the default binding mode is `move`
|
||||||
|
assert_type_eq(a, &0u32);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -239,4 +239,9 @@ fn main() {
|
|||||||
assert_type_eq(b, &0u32);
|
assert_type_eq(b, &0u32);
|
||||||
assert_type_eq(c, &[0u32]);
|
assert_type_eq(c, &[0u32]);
|
||||||
assert_type_eq(d, 0u32);
|
assert_type_eq(d, 0u32);
|
||||||
|
|
||||||
|
// Test that we use the correct message and suggestion style when pointing inside expansions.
|
||||||
|
let [migration_lint_macros::bind_ref!(a)] = &[0];
|
||||||
|
//~^ ERROR: binding modifiers may only be written when the default binding mode is `move`
|
||||||
|
assert_type_eq(a, &0u32);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -562,5 +562,23 @@ help: make the implied reference patterns explicit
|
|||||||
LL | let [&Foo(&ref a @ [ref b]), &Foo(&ref c @ [d])] = [&Foo(&[0]); 2];
|
LL | let [&Foo(&ref a @ [ref b]), &Foo(&ref c @ [d])] = [&Foo(&[0]); 2];
|
||||||
| + +
|
| + +
|
||||||
|
|
||||||
error: aborting due to 29 previous errors
|
error: binding modifiers may only be written when the default binding mode is `move`
|
||||||
|
--> $DIR/migration_lint.rs:244:10
|
||||||
|
|
|
||||||
|
LL | let [migration_lint_macros::bind_ref!(a)] = &[0];
|
||||||
|
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ occurs within macro expansion
|
||||||
|
|
|
||||||
|
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2024/match-ergonomics.html>
|
||||||
|
note: matching on a reference type with a non-reference pattern changes the default binding mode
|
||||||
|
--> $DIR/migration_lint.rs:244:9
|
||||||
|
|
|
||||||
|
LL | let [migration_lint_macros::bind_ref!(a)] = &[0];
|
||||||
|
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ this matches on type `&_`
|
||||||
|
= note: this error originates in the macro `migration_lint_macros::bind_ref` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||||
|
help: make the implied reference pattern explicit
|
||||||
|
|
|
||||||
|
LL | let &[migration_lint_macros::bind_ref!(a)] = &[0];
|
||||||
|
| +
|
||||||
|
|
||||||
|
error: aborting due to 30 previous errors
|
||||||
|
|
||||||
|
|||||||
@ -0,0 +1,6 @@
|
|||||||
|
#![feature(default_field_values)]
|
||||||
|
struct A<'a> { //~ ERROR lifetime parameter `'a` is never used
|
||||||
|
x: Vec<A> = Vec::new(), //~ ERROR missing lifetime specifier
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {}
|
||||||
@ -0,0 +1,23 @@
|
|||||||
|
error[E0106]: missing lifetime specifier
|
||||||
|
--> $DIR/do-not-ice-on-invalid-lifetime.rs:3:12
|
||||||
|
|
|
||||||
|
LL | x: Vec<A> = Vec::new(),
|
||||||
|
| ^ expected named lifetime parameter
|
||||||
|
|
|
||||||
|
help: consider using the `'a` lifetime
|
||||||
|
|
|
||||||
|
LL | x: Vec<A<'a>> = Vec::new(),
|
||||||
|
| ++++
|
||||||
|
|
||||||
|
error[E0392]: lifetime parameter `'a` is never used
|
||||||
|
--> $DIR/do-not-ice-on-invalid-lifetime.rs:2:10
|
||||||
|
|
|
||||||
|
LL | struct A<'a> {
|
||||||
|
| ^^ unused lifetime parameter
|
||||||
|
|
|
||||||
|
= help: consider removing `'a`, referring to it in a field, or using a marker such as `PhantomData`
|
||||||
|
|
||||||
|
error: aborting due to 2 previous errors
|
||||||
|
|
||||||
|
Some errors have detailed explanations: E0106, E0392.
|
||||||
|
For more information about an error, try `rustc --explain E0106`.
|
||||||
@ -6,32 +6,21 @@
|
|||||||
#[const_trait] trait Bar {}
|
#[const_trait] trait Bar {}
|
||||||
impl const Bar for () {}
|
impl const Bar for () {}
|
||||||
|
|
||||||
|
|
||||||
#[const_trait] trait TildeConst {
|
#[const_trait] trait TildeConst {
|
||||||
type Bar<T> where T: ~const Bar;
|
|
||||||
|
|
||||||
fn foo<T>() where T: ~const Bar;
|
fn foo<T>() where T: ~const Bar;
|
||||||
}
|
}
|
||||||
impl TildeConst for () {
|
impl TildeConst for () {
|
||||||
type Bar<T> = () where T: Bar;
|
|
||||||
|
|
||||||
fn foo<T>() where T: Bar {}
|
fn foo<T>() where T: Bar {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#[const_trait] trait AlwaysConst {
|
#[const_trait] trait AlwaysConst {
|
||||||
type Bar<T> where T: const Bar;
|
|
||||||
|
|
||||||
fn foo<T>() where T: const Bar;
|
fn foo<T>() where T: const Bar;
|
||||||
}
|
}
|
||||||
impl AlwaysConst for i32 {
|
impl AlwaysConst for i32 {
|
||||||
type Bar<T> = () where T: Bar;
|
|
||||||
|
|
||||||
fn foo<T>() where T: Bar {}
|
fn foo<T>() where T: Bar {}
|
||||||
}
|
}
|
||||||
impl const AlwaysConst for u32 {
|
impl const AlwaysConst for u32 {
|
||||||
type Bar<T> = () where T: ~const Bar;
|
|
||||||
|
|
||||||
fn foo<T>() where T: ~const Bar {}
|
fn foo<T>() where T: ~const Bar {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,18 +1,8 @@
|
|||||||
error[E0275]: overflow evaluating the requirement `<T as Overflow>::Assoc: Sized`
|
error[E0275]: overflow evaluating the requirement `<T as Overflow>::Assoc == _`
|
||||||
--> $DIR/trait_ref_is_knowable-norm-overflow.rs:10:18
|
--> $DIR/trait_ref_is_knowable-norm-overflow.rs:10:18
|
||||||
|
|
|
|
||||||
LL | type Assoc = <T as Overflow>::Assoc;
|
LL | type Assoc = <T as Overflow>::Assoc;
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^^
|
| ^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
|
||||||
note: required by a bound in `Overflow::Assoc`
|
|
||||||
--> $DIR/trait_ref_is_knowable-norm-overflow.rs:7:5
|
|
||||||
|
|
|
||||||
LL | type Assoc;
|
|
||||||
| ^^^^^^^^^^^ required by this bound in `Overflow::Assoc`
|
|
||||||
help: consider relaxing the implicit `Sized` restriction
|
|
||||||
|
|
|
||||||
LL | type Assoc: ?Sized;
|
|
||||||
| ++++++++
|
|
||||||
|
|
||||||
error[E0119]: conflicting implementations of trait `Trait`
|
error[E0119]: conflicting implementations of trait `Trait`
|
||||||
--> $DIR/trait_ref_is_knowable-norm-overflow.rs:18:1
|
--> $DIR/trait_ref_is_knowable-norm-overflow.rs:18:1
|
||||||
|
|||||||
16
tests/ui/traits/next-solver/gat-wf.rs
Normal file
16
tests/ui/traits/next-solver/gat-wf.rs
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
//@ compile-flags: -Znext-solver
|
||||||
|
|
||||||
|
// Make sure that, like the old trait solver, we end up requiring that the WC of
|
||||||
|
// impl GAT matches that of the trait. This is not a restriction that we *need*,
|
||||||
|
// but is a side-effect of registering the where clauses when normalizing the GAT
|
||||||
|
// when proving it satisfies its item bounds.
|
||||||
|
|
||||||
|
trait Foo {
|
||||||
|
type T<'a>: Sized where Self: 'a;
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Foo for &() {
|
||||||
|
type T<'a> = (); //~ the type `&()` does not fulfill the required lifetime
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {}
|
||||||
15
tests/ui/traits/next-solver/gat-wf.stderr
Normal file
15
tests/ui/traits/next-solver/gat-wf.stderr
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
error[E0477]: the type `&()` does not fulfill the required lifetime
|
||||||
|
--> $DIR/gat-wf.rs:13:18
|
||||||
|
|
|
||||||
|
LL | type T<'a> = ();
|
||||||
|
| ^^
|
||||||
|
|
|
||||||
|
note: type must outlive the lifetime `'a` as defined here
|
||||||
|
--> $DIR/gat-wf.rs:13:12
|
||||||
|
|
|
||||||
|
LL | type T<'a> = ();
|
||||||
|
| ^^
|
||||||
|
|
||||||
|
error: aborting due to 1 previous error
|
||||||
|
|
||||||
|
For more information about this error, try `rustc --explain E0477`.
|
||||||
Loading…
Reference in New Issue
Block a user