Auto merge of #94751 - Dylan-DPC:rollup-zr7viw0, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #94689 (Use impl substs in `#[rustc_on_unimplemented]`) - #94714 (Enable `close_read_wakes_up` test on Windows) - #94723 (Add core::hint::must_use) - #94724 (unix: Avoid name conversions in `remove_dir_all_recursive`) - #94730 (Reverted atomic_mut_ptr feature removal causing compilation break) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This commit is contained in:
commit
803a759304
@ -977,7 +977,6 @@ pub fn from_method(
|
|||||||
substs: SubstsRef<'tcx>,
|
substs: SubstsRef<'tcx>,
|
||||||
) -> ty::TraitRef<'tcx> {
|
) -> ty::TraitRef<'tcx> {
|
||||||
let defs = tcx.generics_of(trait_id);
|
let defs = tcx.generics_of(trait_id);
|
||||||
|
|
||||||
ty::TraitRef { def_id: trait_id, substs: tcx.intern_substs(&substs[..defs.params.len()]) }
|
ty::TraitRef { def_id: trait_id, substs: tcx.intern_substs(&substs[..defs.params.len()]) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
use crate::infer::InferCtxt;
|
use crate::infer::InferCtxt;
|
||||||
use rustc_hir as hir;
|
use rustc_hir as hir;
|
||||||
use rustc_hir::def_id::DefId;
|
use rustc_hir::def_id::DefId;
|
||||||
use rustc_middle::ty::subst::Subst;
|
use rustc_middle::ty::subst::{Subst, SubstsRef};
|
||||||
use rustc_middle::ty::{self, GenericParamDefKind};
|
use rustc_middle::ty::{self, GenericParamDefKind};
|
||||||
use rustc_span::symbol::sym;
|
use rustc_span::symbol::sym;
|
||||||
use std::iter;
|
use std::iter;
|
||||||
@ -17,7 +17,7 @@ fn impl_similar_to(
|
|||||||
&self,
|
&self,
|
||||||
trait_ref: ty::PolyTraitRef<'tcx>,
|
trait_ref: ty::PolyTraitRef<'tcx>,
|
||||||
obligation: &PredicateObligation<'tcx>,
|
obligation: &PredicateObligation<'tcx>,
|
||||||
) -> Option<DefId>;
|
) -> Option<(DefId, SubstsRef<'tcx>)>;
|
||||||
|
|
||||||
/*private*/
|
/*private*/
|
||||||
fn describe_enclosure(&self, hir_id: hir::HirId) -> Option<&'static str>;
|
fn describe_enclosure(&self, hir_id: hir::HirId) -> Option<&'static str>;
|
||||||
@ -34,7 +34,7 @@ fn impl_similar_to(
|
|||||||
&self,
|
&self,
|
||||||
trait_ref: ty::PolyTraitRef<'tcx>,
|
trait_ref: ty::PolyTraitRef<'tcx>,
|
||||||
obligation: &PredicateObligation<'tcx>,
|
obligation: &PredicateObligation<'tcx>,
|
||||||
) -> Option<DefId> {
|
) -> Option<(DefId, SubstsRef<'tcx>)> {
|
||||||
let tcx = self.tcx;
|
let tcx = self.tcx;
|
||||||
let param_env = obligation.param_env;
|
let param_env = obligation.param_env;
|
||||||
let trait_ref = tcx.erase_late_bound_regions(trait_ref);
|
let trait_ref = tcx.erase_late_bound_regions(trait_ref);
|
||||||
@ -50,7 +50,7 @@ fn impl_similar_to(
|
|||||||
let impl_self_ty = impl_trait_ref.self_ty();
|
let impl_self_ty = impl_trait_ref.self_ty();
|
||||||
|
|
||||||
if let Ok(..) = self.can_eq(param_env, trait_self_ty, impl_self_ty) {
|
if let Ok(..) = self.can_eq(param_env, trait_self_ty, impl_self_ty) {
|
||||||
self_match_impls.push(def_id);
|
self_match_impls.push((def_id, impl_substs));
|
||||||
|
|
||||||
if iter::zip(
|
if iter::zip(
|
||||||
trait_ref.substs.types().skip(1),
|
trait_ref.substs.types().skip(1),
|
||||||
@ -58,12 +58,12 @@ fn impl_similar_to(
|
|||||||
)
|
)
|
||||||
.all(|(u, v)| self.fuzzy_match_tys(u, v, false).is_some())
|
.all(|(u, v)| self.fuzzy_match_tys(u, v, false).is_some())
|
||||||
{
|
{
|
||||||
fuzzy_match_impls.push(def_id);
|
fuzzy_match_impls.push((def_id, impl_substs));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
let impl_def_id = if self_match_impls.len() == 1 {
|
let impl_def_id_and_substs = if self_match_impls.len() == 1 {
|
||||||
self_match_impls[0]
|
self_match_impls[0]
|
||||||
} else if fuzzy_match_impls.len() == 1 {
|
} else if fuzzy_match_impls.len() == 1 {
|
||||||
fuzzy_match_impls[0]
|
fuzzy_match_impls[0]
|
||||||
@ -71,7 +71,8 @@ fn impl_similar_to(
|
|||||||
return None;
|
return None;
|
||||||
};
|
};
|
||||||
|
|
||||||
tcx.has_attr(impl_def_id, sym::rustc_on_unimplemented).then_some(impl_def_id)
|
tcx.has_attr(impl_def_id_and_substs.0, sym::rustc_on_unimplemented)
|
||||||
|
.then_some(impl_def_id_and_substs)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Used to set on_unimplemented's `ItemContext`
|
/// Used to set on_unimplemented's `ItemContext`
|
||||||
@ -120,8 +121,9 @@ fn on_unimplemented_note(
|
|||||||
trait_ref: ty::PolyTraitRef<'tcx>,
|
trait_ref: ty::PolyTraitRef<'tcx>,
|
||||||
obligation: &PredicateObligation<'tcx>,
|
obligation: &PredicateObligation<'tcx>,
|
||||||
) -> OnUnimplementedNote {
|
) -> OnUnimplementedNote {
|
||||||
let def_id =
|
let (def_id, substs) = self
|
||||||
self.impl_similar_to(trait_ref, obligation).unwrap_or_else(|| trait_ref.def_id());
|
.impl_similar_to(trait_ref, obligation)
|
||||||
|
.unwrap_or_else(|| (trait_ref.def_id(), trait_ref.skip_binder().substs));
|
||||||
let trait_ref = trait_ref.skip_binder();
|
let trait_ref = trait_ref.skip_binder();
|
||||||
|
|
||||||
let mut flags = vec![(
|
let mut flags = vec![(
|
||||||
@ -176,7 +178,7 @@ fn on_unimplemented_note(
|
|||||||
for param in generics.params.iter() {
|
for param in generics.params.iter() {
|
||||||
let value = match param.kind {
|
let value = match param.kind {
|
||||||
GenericParamDefKind::Type { .. } | GenericParamDefKind::Const { .. } => {
|
GenericParamDefKind::Type { .. } | GenericParamDefKind::Const { .. } => {
|
||||||
trait_ref.substs[param.index as usize].to_string()
|
substs[param.index as usize].to_string()
|
||||||
}
|
}
|
||||||
GenericParamDefKind::Lifetime => continue,
|
GenericParamDefKind::Lifetime => continue,
|
||||||
};
|
};
|
||||||
@ -184,7 +186,7 @@ fn on_unimplemented_note(
|
|||||||
flags.push((name, Some(value)));
|
flags.push((name, Some(value)));
|
||||||
|
|
||||||
if let GenericParamDefKind::Type { .. } = param.kind {
|
if let GenericParamDefKind::Type { .. } = param.kind {
|
||||||
let param_ty = trait_ref.substs[param.index as usize].expect_ty();
|
let param_ty = substs[param.index as usize].expect_ty();
|
||||||
if let Some(def) = param_ty.ty_adt_def() {
|
if let Some(def) = param_ty.ty_adt_def() {
|
||||||
// We also want to be able to select the parameter's
|
// We also want to be able to select the parameter's
|
||||||
// original signature with no type arguments resolved
|
// original signature with no type arguments resolved
|
||||||
@ -229,9 +231,7 @@ fn on_unimplemented_note(
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
if let Ok(Some(command)) =
|
if let Ok(Some(command)) = OnUnimplementedDirective::of_item(self.tcx, def_id) {
|
||||||
OnUnimplementedDirective::of_item(self.tcx, trait_ref.def_id, def_id)
|
|
||||||
{
|
|
||||||
command.evaluate(self.tcx, trait_ref, &flags)
|
command.evaluate(self.tcx, trait_ref, &flags)
|
||||||
} else {
|
} else {
|
||||||
OnUnimplementedNote::default()
|
OnUnimplementedNote::default()
|
||||||
|
@ -54,7 +54,7 @@ fn parse_error(
|
|||||||
impl<'tcx> OnUnimplementedDirective {
|
impl<'tcx> OnUnimplementedDirective {
|
||||||
fn parse(
|
fn parse(
|
||||||
tcx: TyCtxt<'tcx>,
|
tcx: TyCtxt<'tcx>,
|
||||||
trait_def_id: DefId,
|
item_def_id: DefId,
|
||||||
items: &[NestedMetaItem],
|
items: &[NestedMetaItem],
|
||||||
span: Span,
|
span: Span,
|
||||||
is_root: bool,
|
is_root: bool,
|
||||||
@ -63,7 +63,7 @@ fn parse(
|
|||||||
let mut item_iter = items.iter();
|
let mut item_iter = items.iter();
|
||||||
|
|
||||||
let parse_value = |value_str| {
|
let parse_value = |value_str| {
|
||||||
OnUnimplementedFormatString::try_parse(tcx, trait_def_id, value_str, span).map(Some)
|
OnUnimplementedFormatString::try_parse(tcx, item_def_id, value_str, span).map(Some)
|
||||||
};
|
};
|
||||||
|
|
||||||
let condition = if is_root {
|
let condition = if is_root {
|
||||||
@ -135,7 +135,7 @@ fn parse(
|
|||||||
{
|
{
|
||||||
if let Some(items) = item.meta_item_list() {
|
if let Some(items) = item.meta_item_list() {
|
||||||
if let Ok(subcommand) =
|
if let Ok(subcommand) =
|
||||||
Self::parse(tcx, trait_def_id, &items, item.span(), false)
|
Self::parse(tcx, item_def_id, &items, item.span(), false)
|
||||||
{
|
{
|
||||||
subcommands.push(subcommand);
|
subcommands.push(subcommand);
|
||||||
} else {
|
} else {
|
||||||
@ -178,19 +178,15 @@ fn parse(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn of_item(
|
pub fn of_item(tcx: TyCtxt<'tcx>, item_def_id: DefId) -> Result<Option<Self>, ErrorGuaranteed> {
|
||||||
tcx: TyCtxt<'tcx>,
|
let attrs = tcx.get_attrs(item_def_id);
|
||||||
trait_def_id: DefId,
|
|
||||||
impl_def_id: DefId,
|
|
||||||
) -> Result<Option<Self>, ErrorGuaranteed> {
|
|
||||||
let attrs = tcx.get_attrs(impl_def_id);
|
|
||||||
|
|
||||||
let Some(attr) = tcx.sess.find_by_name(&attrs, sym::rustc_on_unimplemented) else {
|
let Some(attr) = tcx.sess.find_by_name(&attrs, sym::rustc_on_unimplemented) else {
|
||||||
return Ok(None);
|
return Ok(None);
|
||||||
};
|
};
|
||||||
|
|
||||||
let result = if let Some(items) = attr.meta_item_list() {
|
let result = if let Some(items) = attr.meta_item_list() {
|
||||||
Self::parse(tcx, trait_def_id, &items, attr.span, true).map(Some)
|
Self::parse(tcx, item_def_id, &items, attr.span, true).map(Some)
|
||||||
} else if let Some(value) = attr.value_str() {
|
} else if let Some(value) = attr.value_str() {
|
||||||
Ok(Some(OnUnimplementedDirective {
|
Ok(Some(OnUnimplementedDirective {
|
||||||
condition: None,
|
condition: None,
|
||||||
@ -198,7 +194,7 @@ pub fn of_item(
|
|||||||
subcommands: vec![],
|
subcommands: vec![],
|
||||||
label: Some(OnUnimplementedFormatString::try_parse(
|
label: Some(OnUnimplementedFormatString::try_parse(
|
||||||
tcx,
|
tcx,
|
||||||
trait_def_id,
|
item_def_id,
|
||||||
value,
|
value,
|
||||||
attr.span,
|
attr.span,
|
||||||
)?),
|
)?),
|
||||||
@ -209,7 +205,7 @@ pub fn of_item(
|
|||||||
} else {
|
} else {
|
||||||
return Err(ErrorGuaranteed);
|
return Err(ErrorGuaranteed);
|
||||||
};
|
};
|
||||||
debug!("of_item({:?}/{:?}) = {:?}", trait_def_id, impl_def_id, result);
|
debug!("of_item({:?}) = {:?}", item_def_id, result);
|
||||||
result
|
result
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -280,23 +276,29 @@ pub fn evaluate(
|
|||||||
impl<'tcx> OnUnimplementedFormatString {
|
impl<'tcx> OnUnimplementedFormatString {
|
||||||
fn try_parse(
|
fn try_parse(
|
||||||
tcx: TyCtxt<'tcx>,
|
tcx: TyCtxt<'tcx>,
|
||||||
trait_def_id: DefId,
|
item_def_id: DefId,
|
||||||
from: Symbol,
|
from: Symbol,
|
||||||
err_sp: Span,
|
err_sp: Span,
|
||||||
) -> Result<Self, ErrorGuaranteed> {
|
) -> Result<Self, ErrorGuaranteed> {
|
||||||
let result = OnUnimplementedFormatString(from);
|
let result = OnUnimplementedFormatString(from);
|
||||||
result.verify(tcx, trait_def_id, err_sp)?;
|
result.verify(tcx, item_def_id, err_sp)?;
|
||||||
Ok(result)
|
Ok(result)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn verify(
|
fn verify(
|
||||||
&self,
|
&self,
|
||||||
tcx: TyCtxt<'tcx>,
|
tcx: TyCtxt<'tcx>,
|
||||||
trait_def_id: DefId,
|
item_def_id: DefId,
|
||||||
span: Span,
|
span: Span,
|
||||||
) -> Result<(), ErrorGuaranteed> {
|
) -> Result<(), ErrorGuaranteed> {
|
||||||
let name = tcx.item_name(trait_def_id);
|
let trait_def_id = if tcx.is_trait(item_def_id) {
|
||||||
let generics = tcx.generics_of(trait_def_id);
|
item_def_id
|
||||||
|
} else {
|
||||||
|
tcx.trait_id_of_impl(item_def_id)
|
||||||
|
.expect("expected `on_unimplemented` to correspond to a trait")
|
||||||
|
};
|
||||||
|
let trait_name = tcx.item_name(trait_def_id);
|
||||||
|
let generics = tcx.generics_of(item_def_id);
|
||||||
let s = self.0.as_str();
|
let s = self.0.as_str();
|
||||||
let parser = Parser::new(s, None, None, false, ParseMode::Format);
|
let parser = Parser::new(s, None, None, false, ParseMode::Format);
|
||||||
let mut result = Ok(());
|
let mut result = Ok(());
|
||||||
@ -307,7 +309,7 @@ fn verify(
|
|||||||
// `{Self}` is allowed
|
// `{Self}` is allowed
|
||||||
Position::ArgumentNamed(s, _) if s == kw::SelfUpper => (),
|
Position::ArgumentNamed(s, _) if s == kw::SelfUpper => (),
|
||||||
// `{ThisTraitsName}` is allowed
|
// `{ThisTraitsName}` is allowed
|
||||||
Position::ArgumentNamed(s, _) if s == name => (),
|
Position::ArgumentNamed(s, _) if s == trait_name => (),
|
||||||
// `{from_method}` is allowed
|
// `{from_method}` is allowed
|
||||||
Position::ArgumentNamed(s, _) if s == sym::from_method => (),
|
Position::ArgumentNamed(s, _) if s == sym::from_method => (),
|
||||||
// `{from_desugaring}` is allowed
|
// `{from_desugaring}` is allowed
|
||||||
@ -329,9 +331,13 @@ fn verify(
|
|||||||
tcx.sess,
|
tcx.sess,
|
||||||
span,
|
span,
|
||||||
E0230,
|
E0230,
|
||||||
"there is no parameter `{}` on trait `{}`",
|
"there is no parameter `{}` on {}",
|
||||||
s,
|
s,
|
||||||
name
|
if trait_def_id == item_def_id {
|
||||||
|
format!("trait `{}`", trait_name)
|
||||||
|
} else {
|
||||||
|
"impl".to_string()
|
||||||
|
}
|
||||||
)
|
)
|
||||||
.emit();
|
.emit();
|
||||||
result = Err(ErrorGuaranteed);
|
result = Err(ErrorGuaranteed);
|
||||||
|
@ -742,12 +742,11 @@ pub fn check_item_type<'tcx>(tcx: TyCtxt<'tcx>, it: &'tcx hir::Item<'tcx>) {
|
|||||||
impl_trait_ref,
|
impl_trait_ref,
|
||||||
&impl_.items,
|
&impl_.items,
|
||||||
);
|
);
|
||||||
let trait_def_id = impl_trait_ref.def_id;
|
check_on_unimplemented(tcx, it);
|
||||||
check_on_unimplemented(tcx, trait_def_id, it);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
hir::ItemKind::Trait(_, _, _, _, ref items) => {
|
hir::ItemKind::Trait(_, _, _, _, ref items) => {
|
||||||
check_on_unimplemented(tcx, it.def_id.to_def_id(), it);
|
check_on_unimplemented(tcx, it);
|
||||||
|
|
||||||
for item in items.iter() {
|
for item in items.iter() {
|
||||||
let item = tcx.hir().trait_item(item.id);
|
let item = tcx.hir().trait_item(item.id);
|
||||||
@ -857,9 +856,9 @@ pub fn check_item_type<'tcx>(tcx: TyCtxt<'tcx>, it: &'tcx hir::Item<'tcx>) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(super) fn check_on_unimplemented(tcx: TyCtxt<'_>, trait_def_id: DefId, item: &hir::Item<'_>) {
|
pub(super) fn check_on_unimplemented(tcx: TyCtxt<'_>, item: &hir::Item<'_>) {
|
||||||
// an error would be reported if this fails.
|
// an error would be reported if this fails.
|
||||||
let _ = traits::OnUnimplementedDirective::of_item(tcx, trait_def_id, item.def_id.to_def_id());
|
let _ = traits::OnUnimplementedDirective::of_item(tcx, item.def_id.to_def_id());
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(super) fn check_specialization_validity<'tcx>(
|
pub(super) fn check_specialization_validity<'tcx>(
|
||||||
|
@ -173,3 +173,126 @@ pub fn spin_loop() {
|
|||||||
pub const fn black_box<T>(dummy: T) -> T {
|
pub const fn black_box<T>(dummy: T) -> T {
|
||||||
crate::intrinsics::black_box(dummy)
|
crate::intrinsics::black_box(dummy)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// An identity function that causes an `unused_must_use` warning to be
|
||||||
|
/// triggered if the given value is not used (returned, stored in a variable,
|
||||||
|
/// etc) by the caller.
|
||||||
|
///
|
||||||
|
/// This is primarily intended for use in macro-generated code, in which a
|
||||||
|
/// [`#[must_use]` attribute][must_use] either on a type or a function would not
|
||||||
|
/// be convenient.
|
||||||
|
///
|
||||||
|
/// [must_use]: https://doc.rust-lang.org/reference/attributes/diagnostics.html#the-must_use-attribute
|
||||||
|
///
|
||||||
|
/// # Example
|
||||||
|
///
|
||||||
|
/// ```
|
||||||
|
/// #![feature(hint_must_use)]
|
||||||
|
///
|
||||||
|
/// use core::fmt;
|
||||||
|
///
|
||||||
|
/// pub struct Error(/* ... */);
|
||||||
|
///
|
||||||
|
/// #[macro_export]
|
||||||
|
/// macro_rules! make_error {
|
||||||
|
/// ($($args:expr),*) => {
|
||||||
|
/// core::hint::must_use({
|
||||||
|
/// let error = $crate::make_error(core::format_args!($($args),*));
|
||||||
|
/// error
|
||||||
|
/// })
|
||||||
|
/// };
|
||||||
|
/// }
|
||||||
|
///
|
||||||
|
/// // Implementation detail of make_error! macro.
|
||||||
|
/// #[doc(hidden)]
|
||||||
|
/// pub fn make_error(args: fmt::Arguments<'_>) -> Error {
|
||||||
|
/// Error(/* ... */)
|
||||||
|
/// }
|
||||||
|
///
|
||||||
|
/// fn demo() -> Option<Error> {
|
||||||
|
/// if true {
|
||||||
|
/// // Oops, meant to write `return Some(make_error!("..."));`
|
||||||
|
/// Some(make_error!("..."));
|
||||||
|
/// }
|
||||||
|
/// None
|
||||||
|
/// }
|
||||||
|
/// #
|
||||||
|
/// # // Make rustdoc not wrap the whole snippet in fn main, so that $crate::make_error works
|
||||||
|
/// # fn main() {}
|
||||||
|
/// ```
|
||||||
|
///
|
||||||
|
/// In the above example, we'd like an `unused_must_use` lint to apply to the
|
||||||
|
/// value created by `make_error!`. However, neither `#[must_use]` on a struct
|
||||||
|
/// nor `#[must_use]` on a function is appropriate here, so the macro expands
|
||||||
|
/// using `core::hint::must_use` instead.
|
||||||
|
///
|
||||||
|
/// - We wouldn't want `#[must_use]` on the `struct Error` because that would
|
||||||
|
/// make the following unproblematic code trigger a warning:
|
||||||
|
///
|
||||||
|
/// ```
|
||||||
|
/// # struct Error;
|
||||||
|
/// #
|
||||||
|
/// fn f(arg: &str) -> Result<(), Error>
|
||||||
|
/// # { Ok(()) }
|
||||||
|
///
|
||||||
|
/// #[test]
|
||||||
|
/// fn t() {
|
||||||
|
/// // Assert that `f` returns error if passed an empty string.
|
||||||
|
/// // A value of type `Error` is unused here but that's not a problem.
|
||||||
|
/// f("").unwrap_err();
|
||||||
|
/// }
|
||||||
|
/// ```
|
||||||
|
///
|
||||||
|
/// - Using `#[must_use]` on `fn make_error` can't help because the return value
|
||||||
|
/// *is* used, as the right-hand side of a `let` statement. The `let`
|
||||||
|
/// statement looks useless but is in fact necessary for ensuring that
|
||||||
|
/// temporaries within the `format_args` expansion are not kept alive past the
|
||||||
|
/// creation of the `Error`, as keeping them alive past that point can cause
|
||||||
|
/// autotrait issues in async code:
|
||||||
|
///
|
||||||
|
/// ```
|
||||||
|
/// # #![feature(hint_must_use)]
|
||||||
|
/// #
|
||||||
|
/// # struct Error;
|
||||||
|
/// #
|
||||||
|
/// # macro_rules! make_error {
|
||||||
|
/// # ($($args:expr),*) => {
|
||||||
|
/// # core::hint::must_use({
|
||||||
|
/// # // If `let` isn't used, then `f()` produces a non-Send future.
|
||||||
|
/// # let error = make_error(core::format_args!($($args),*));
|
||||||
|
/// # error
|
||||||
|
/// # })
|
||||||
|
/// # };
|
||||||
|
/// # }
|
||||||
|
/// #
|
||||||
|
/// # fn make_error(args: core::fmt::Arguments<'_>) -> Error {
|
||||||
|
/// # Error
|
||||||
|
/// # }
|
||||||
|
/// #
|
||||||
|
/// async fn f() {
|
||||||
|
/// // Using `let` inside the make_error expansion causes temporaries like
|
||||||
|
/// // `unsync()` to drop at the semicolon of that `let` statement, which
|
||||||
|
/// // is prior to the await point. They would otherwise stay around until
|
||||||
|
/// // the semicolon on *this* statement, which is after the await point,
|
||||||
|
/// // and the enclosing Future would not implement Send.
|
||||||
|
/// log(make_error!("look: {:p}", unsync())).await;
|
||||||
|
/// }
|
||||||
|
///
|
||||||
|
/// async fn log(error: Error) {/* ... */}
|
||||||
|
///
|
||||||
|
/// // Returns something without a Sync impl.
|
||||||
|
/// fn unsync() -> *const () {
|
||||||
|
/// 0 as *const ()
|
||||||
|
/// }
|
||||||
|
/// #
|
||||||
|
/// # fn test() {
|
||||||
|
/// # fn assert_send(_: impl Send) {}
|
||||||
|
/// # assert_send(f());
|
||||||
|
/// # }
|
||||||
|
/// ```
|
||||||
|
#[unstable(feature = "hint_must_use", issue = "94745")]
|
||||||
|
#[rustc_const_unstable(feature = "hint_must_use", issue = "94745")]
|
||||||
|
#[must_use] // <-- :)
|
||||||
|
pub const fn must_use<T>(value: T) -> T {
|
||||||
|
value
|
||||||
|
}
|
||||||
|
@ -231,6 +231,7 @@
|
|||||||
#![feature(assert_matches)]
|
#![feature(assert_matches)]
|
||||||
#![feature(associated_type_bounds)]
|
#![feature(associated_type_bounds)]
|
||||||
#![feature(async_iterator)]
|
#![feature(async_iterator)]
|
||||||
|
#![feature(atomic_mut_ptr)]
|
||||||
#![feature(bench_black_box)]
|
#![feature(bench_black_box)]
|
||||||
#![feature(box_syntax)]
|
#![feature(box_syntax)]
|
||||||
#![feature(c_unwind)]
|
#![feature(c_unwind)]
|
||||||
|
@ -508,7 +508,6 @@ fn close_readwrite_smoke() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
#[cfg(unix)] // test doesn't work on Windows, see #31657
|
|
||||||
fn close_read_wakes_up() {
|
fn close_read_wakes_up() {
|
||||||
each_ip(&mut |addr| {
|
each_ip(&mut |addr| {
|
||||||
let a = t!(TcpListener::bind(&addr));
|
let a = t!(TcpListener::bind(&addr));
|
||||||
|
@ -1604,17 +1604,15 @@ fn is_dir(ent: &DirEntry) -> Option<bool> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn remove_dir_all_recursive(parent_fd: Option<RawFd>, p: &Path) -> io::Result<()> {
|
fn remove_dir_all_recursive(parent_fd: Option<RawFd>, path: &CStr) -> io::Result<()> {
|
||||||
let pcstr = cstr(p)?;
|
|
||||||
|
|
||||||
// try opening as directory
|
// try opening as directory
|
||||||
let fd = match openat_nofollow_dironly(parent_fd, &pcstr) {
|
let fd = match openat_nofollow_dironly(parent_fd, &path) {
|
||||||
Err(err) if err.raw_os_error() == Some(libc::ENOTDIR) => {
|
Err(err) if err.raw_os_error() == Some(libc::ENOTDIR) => {
|
||||||
// not a directory - don't traverse further
|
// not a directory - don't traverse further
|
||||||
return match parent_fd {
|
return match parent_fd {
|
||||||
// unlink...
|
// unlink...
|
||||||
Some(parent_fd) => {
|
Some(parent_fd) => {
|
||||||
cvt(unsafe { unlinkat(parent_fd, pcstr.as_ptr(), 0) }).map(drop)
|
cvt(unsafe { unlinkat(parent_fd, path.as_ptr(), 0) }).map(drop)
|
||||||
}
|
}
|
||||||
// ...unless this was supposed to be the deletion root directory
|
// ...unless this was supposed to be the deletion root directory
|
||||||
None => Err(err),
|
None => Err(err),
|
||||||
@ -1627,26 +1625,27 @@ fn remove_dir_all_recursive(parent_fd: Option<RawFd>, p: &Path) -> io::Result<()
|
|||||||
let (dir, fd) = fdreaddir(fd)?;
|
let (dir, fd) = fdreaddir(fd)?;
|
||||||
for child in dir {
|
for child in dir {
|
||||||
let child = child?;
|
let child = child?;
|
||||||
|
let child_name = child.name_cstr();
|
||||||
match is_dir(&child) {
|
match is_dir(&child) {
|
||||||
Some(true) => {
|
Some(true) => {
|
||||||
remove_dir_all_recursive(Some(fd), Path::new(&child.file_name()))?;
|
remove_dir_all_recursive(Some(fd), child_name)?;
|
||||||
}
|
}
|
||||||
Some(false) => {
|
Some(false) => {
|
||||||
cvt(unsafe { unlinkat(fd, child.name_cstr().as_ptr(), 0) })?;
|
cvt(unsafe { unlinkat(fd, child_name.as_ptr(), 0) })?;
|
||||||
}
|
}
|
||||||
None => {
|
None => {
|
||||||
// POSIX specifies that calling unlink()/unlinkat(..., 0) on a directory can succeed
|
// POSIX specifies that calling unlink()/unlinkat(..., 0) on a directory can succeed
|
||||||
// if the process has the appropriate privileges. This however can causing orphaned
|
// if the process has the appropriate privileges. This however can causing orphaned
|
||||||
// directories requiring an fsck e.g. on Solaris and Illumos. So we try recursing
|
// directories requiring an fsck e.g. on Solaris and Illumos. So we try recursing
|
||||||
// into it first instead of trying to unlink() it.
|
// into it first instead of trying to unlink() it.
|
||||||
remove_dir_all_recursive(Some(fd), Path::new(&child.file_name()))?;
|
remove_dir_all_recursive(Some(fd), child_name)?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// unlink the directory after removing its contents
|
// unlink the directory after removing its contents
|
||||||
cvt(unsafe {
|
cvt(unsafe {
|
||||||
unlinkat(parent_fd.unwrap_or(libc::AT_FDCWD), pcstr.as_ptr(), libc::AT_REMOVEDIR)
|
unlinkat(parent_fd.unwrap_or(libc::AT_FDCWD), path.as_ptr(), libc::AT_REMOVEDIR)
|
||||||
})?;
|
})?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@ -1659,7 +1658,7 @@ fn remove_dir_all_modern(p: &Path) -> io::Result<()> {
|
|||||||
if attr.file_type().is_symlink() {
|
if attr.file_type().is_symlink() {
|
||||||
crate::fs::remove_file(p)
|
crate::fs::remove_file(p)
|
||||||
} else {
|
} else {
|
||||||
remove_dir_all_recursive(None, p)
|
remove_dir_all_recursive(None, &cstr(p)?)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
16
src/test/ui/consts/issue-94675.rs
Normal file
16
src/test/ui/consts/issue-94675.rs
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
#![feature(const_trait_impl, const_mut_refs)]
|
||||||
|
|
||||||
|
struct Foo<'a> {
|
||||||
|
bar: &'a mut Vec<usize>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a> Foo<'a> {
|
||||||
|
const fn spam(&mut self, baz: &mut Vec<u32>) {
|
||||||
|
self.bar[0] = baz.len();
|
||||||
|
//~^ ERROR cannot call non-const fn `Vec::<u32>::len` in constant functions
|
||||||
|
//~| ERROR the trait bound `Vec<usize>: ~const IndexMut<usize>` is not satisfied
|
||||||
|
//~| ERROR cannot call non-const operator in constant functions
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {}
|
38
src/test/ui/consts/issue-94675.stderr
Normal file
38
src/test/ui/consts/issue-94675.stderr
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
error[E0015]: cannot call non-const fn `Vec::<u32>::len` in constant functions
|
||||||
|
--> $DIR/issue-94675.rs:9:27
|
||||||
|
|
|
||||||
|
LL | self.bar[0] = baz.len();
|
||||||
|
| ^^^^^
|
||||||
|
|
|
||||||
|
= note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
|
||||||
|
|
||||||
|
error[E0277]: the trait bound `Vec<usize>: ~const IndexMut<usize>` is not satisfied
|
||||||
|
--> $DIR/issue-94675.rs:9:9
|
||||||
|
|
|
||||||
|
LL | self.bar[0] = baz.len();
|
||||||
|
| ^^^^^^^^^^^ vector indices are of type `usize` or ranges of `usize`
|
||||||
|
|
|
||||||
|
= help: the trait `~const IndexMut<usize>` is not implemented for `Vec<usize>`
|
||||||
|
note: the trait `IndexMut<usize>` is implemented for `Vec<usize>`, but that implementation is not `const`
|
||||||
|
--> $DIR/issue-94675.rs:9:9
|
||||||
|
|
|
||||||
|
LL | self.bar[0] = baz.len();
|
||||||
|
| ^^^^^^^^^^^
|
||||||
|
|
||||||
|
error[E0015]: cannot call non-const operator in constant functions
|
||||||
|
--> $DIR/issue-94675.rs:9:9
|
||||||
|
|
|
||||||
|
LL | self.bar[0] = baz.len();
|
||||||
|
| ^^^^^^^^^^^
|
||||||
|
|
|
||||||
|
note: impl defined here, but it is not `const`
|
||||||
|
--> $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
|
||||||
|
|
|
||||||
|
LL | impl<T, I: SliceIndex<[T]>, A: Allocator> IndexMut<I> for Vec<T, A> {
|
||||||
|
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
= note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
|
||||||
|
|
||||||
|
error: aborting due to 3 previous errors
|
||||||
|
|
||||||
|
Some errors have detailed explanations: E0015, E0277.
|
||||||
|
For more information about an error, try `rustc --explain E0015`.
|
@ -1,6 +1,7 @@
|
|||||||
// test for #87707
|
// test for #87707
|
||||||
// edition:2018
|
// edition:2018
|
||||||
// run-fail
|
// run-fail
|
||||||
|
// exec-env:RUST_BACKTRACE=0
|
||||||
// check-run-results
|
// check-run-results
|
||||||
|
|
||||||
use std::sync::Once;
|
use std::sync::Once;
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
thread 'main' panicked at 'Here Once instance is poisoned.', $DIR/issue-87707.rs:12:24
|
thread 'main' panicked at 'Here Once instance is poisoned.', $DIR/issue-87707.rs:13:24
|
||||||
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
|
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
|
||||||
thread 'main' panicked at 'Once instance has previously been poisoned', $DIR/issue-87707.rs:14:7
|
thread 'main' panicked at 'Once instance has previously been poisoned', $DIR/issue-87707.rs:15:7
|
||||||
|
15
src/test/ui/on-unimplemented/impl-substs.rs
Normal file
15
src/test/ui/on-unimplemented/impl-substs.rs
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
#![feature(rustc_attrs)]
|
||||||
|
|
||||||
|
trait Foo<A> {
|
||||||
|
fn foo(self);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[rustc_on_unimplemented = "an impl did not match: {A} {B} {C}"]
|
||||||
|
impl<A, B, C> Foo<A> for (A, B, C) {
|
||||||
|
fn foo(self) {}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
Foo::<usize>::foo((1i32, 1i32, 1i32));
|
||||||
|
//~^ ERROR the trait bound `(i32, i32, i32): Foo<usize>` is not satisfied
|
||||||
|
}
|
13
src/test/ui/on-unimplemented/impl-substs.stderr
Normal file
13
src/test/ui/on-unimplemented/impl-substs.stderr
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
error[E0277]: the trait bound `(i32, i32, i32): Foo<usize>` is not satisfied
|
||||||
|
--> $DIR/impl-substs.rs:13:23
|
||||||
|
|
|
||||||
|
LL | Foo::<usize>::foo((1i32, 1i32, 1i32));
|
||||||
|
| ----------------- ^^^^^^^^^^^^^^^^^^ an impl did not match: usize _ _
|
||||||
|
| |
|
||||||
|
| required by a bound introduced by this call
|
||||||
|
|
|
||||||
|
= help: the trait `Foo<usize>` is not implemented for `(i32, i32, i32)`
|
||||||
|
|
||||||
|
error: aborting due to previous error
|
||||||
|
|
||||||
|
For more information about this error, try `rustc --explain E0277`.
|
Loading…
Reference in New Issue
Block a user