Fix cstring literals construct &CStr not &str
This commit is contained in:
Lukas Wirth
parent
eab295cc73
commit
3e528b85f9
@ -199,7 +199,7 @@ pub enum GenericRequirement {
|
|||||||
|
|
||||||
macro_rules! language_item_table {
|
macro_rules! language_item_table {
|
||||||
(
|
(
|
||||||
$( $(#[$attr:meta])* $variant:ident, $name:ident, $method:ident, $target:expr, $generics:expr; )*
|
$( $(#[$attr:meta])* $variant:ident, $module:ident :: $name:ident, $method:ident, $target:expr, $generics:expr; )*
|
||||||
) => {
|
) => {
|
||||||
|
|
||||||
/// A representation of all the valid language items in Rust.
|
/// A representation of all the valid language items in Rust.
|
||||||
@ -244,82 +244,86 @@ pub fn path(&self, db: &dyn DefDatabase, start_crate: CrateId) -> Option<Path> {
|
|||||||
|
|
||||||
language_item_table! {
|
language_item_table! {
|
||||||
// Variant name, Name, Getter method name, Target Generic requirements;
|
// Variant name, Name, Getter method name, Target Generic requirements;
|
||||||
Sized, sized, sized_trait, Target::Trait, GenericRequirement::Exact(0);
|
Sized, sym::sized, sized_trait, Target::Trait, GenericRequirement::Exact(0);
|
||||||
Unsize, unsize, unsize_trait, Target::Trait, GenericRequirement::Minimum(1);
|
Unsize, sym::unsize, unsize_trait, Target::Trait, GenericRequirement::Minimum(1);
|
||||||
/// Trait injected by `#[derive(PartialEq)]`, (i.e. "Partial EQ").
|
/// Trait injected by `#[derive(PartialEq)]`, (i.e. "Partial EQ").
|
||||||
StructuralPeq, structural_peq, structural_peq_trait, Target::Trait, GenericRequirement::None;
|
StructuralPeq, sym::structural_peq, structural_peq_trait, Target::Trait, GenericRequirement::None;
|
||||||
/// Trait injected by `#[derive(Eq)]`, (i.e. "Total EQ"; no, I will not apologize).
|
/// Trait injected by `#[derive(Eq)]`, (i.e. "Total EQ"; no, I will not apologize).
|
||||||
StructuralTeq, structural_teq, structural_teq_trait, Target::Trait, GenericRequirement::None;
|
StructuralTeq, sym::structural_teq, structural_teq_trait, Target::Trait, GenericRequirement::None;
|
||||||
Copy, copy, copy_trait, Target::Trait, GenericRequirement::Exact(0);
|
Copy, sym::copy, copy_trait, Target::Trait, GenericRequirement::Exact(0);
|
||||||
Clone, clone, clone_trait, Target::Trait, GenericRequirement::None;
|
Clone, sym::clone, clone_trait, Target::Trait, GenericRequirement::None;
|
||||||
Sync, sync, sync_trait, Target::Trait, GenericRequirement::Exact(0);
|
Sync, sym::sync, sync_trait, Target::Trait, GenericRequirement::Exact(0);
|
||||||
DiscriminantKind, discriminant_kind, discriminant_kind_trait, Target::Trait, GenericRequirement::None;
|
DiscriminantKind, sym::discriminant_kind, discriminant_kind_trait, Target::Trait, GenericRequirement::None;
|
||||||
/// The associated item of the [`DiscriminantKind`] trait.
|
/// The associated item of the [`DiscriminantKind`] trait.
|
||||||
Discriminant, discriminant_type, discriminant_type, Target::AssocTy, GenericRequirement::None;
|
Discriminant, sym::discriminant_type, discriminant_type, Target::AssocTy, GenericRequirement::None;
|
||||||
|
|
||||||
PointeeTrait, pointee_trait, pointee_trait, Target::Trait, GenericRequirement::None;
|
PointeeTrait, sym::pointee_trait, pointee_trait, Target::Trait, GenericRequirement::None;
|
||||||
Metadata, metadata_type, metadata_type, Target::AssocTy, GenericRequirement::None;
|
Metadata, sym::metadata_type, metadata_type, Target::AssocTy, GenericRequirement::None;
|
||||||
DynMetadata, dyn_metadata, dyn_metadata, Target::Struct, GenericRequirement::None;
|
DynMetadata, sym::dyn_metadata, dyn_metadata, Target::Struct, GenericRequirement::None;
|
||||||
|
|
||||||
Freeze, freeze, freeze_trait, Target::Trait, GenericRequirement::Exact(0);
|
Freeze, sym::freeze, freeze_trait, Target::Trait, GenericRequirement::Exact(0);
|
||||||
|
|
||||||
Drop, drop, drop_trait, Target::Trait, GenericRequirement::None;
|
FnPtrTrait, sym::fn_ptr_trait, fn_ptr_trait, Target::Trait, GenericRequirement::Exact(0);
|
||||||
Destruct, destruct, destruct_trait, Target::Trait, GenericRequirement::None;
|
FnPtrAddr, sym::fn_ptr_addr, fn_ptr_addr, Target::Method(MethodKind::Trait { body: false }), GenericRequirement::None;
|
||||||
|
|
||||||
CoerceUnsized, coerce_unsized, coerce_unsized_trait, Target::Trait, GenericRequirement::Minimum(1);
|
Drop, sym::drop, drop_trait, Target::Trait, GenericRequirement::None;
|
||||||
DispatchFromDyn, dispatch_from_dyn, dispatch_from_dyn_trait, Target::Trait, GenericRequirement::Minimum(1);
|
Destruct, sym::destruct, destruct_trait, Target::Trait, GenericRequirement::None;
|
||||||
|
|
||||||
|
CoerceUnsized, sym::coerce_unsized, coerce_unsized_trait, Target::Trait, GenericRequirement::Minimum(1);
|
||||||
|
DispatchFromDyn, sym::dispatch_from_dyn, dispatch_from_dyn_trait, Target::Trait, GenericRequirement::Minimum(1);
|
||||||
|
|
||||||
// language items relating to transmutability
|
// language items relating to transmutability
|
||||||
TransmuteOpts, transmute_opts, transmute_opts, Target::Struct, GenericRequirement::Exact(0);
|
TransmuteOpts, sym::transmute_opts, transmute_opts, Target::Struct, GenericRequirement::Exact(0);
|
||||||
TransmuteTrait, transmute_trait, transmute_trait, Target::Trait, GenericRequirement::Exact(3);
|
TransmuteTrait, sym::transmute_trait, transmute_trait, Target::Trait, GenericRequirement::Exact(3);
|
||||||
|
|
||||||
Add, add, add_trait, Target::Trait, GenericRequirement::Exact(1);
|
Add, sym::add, add_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
Sub, sub, sub_trait, Target::Trait, GenericRequirement::Exact(1);
|
Sub, sym::sub, sub_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
Mul, mul, mul_trait, Target::Trait, GenericRequirement::Exact(1);
|
Mul, sym::mul, mul_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
Div, div, div_trait, Target::Trait, GenericRequirement::Exact(1);
|
Div, sym::div, div_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
Rem, rem, rem_trait, Target::Trait, GenericRequirement::Exact(1);
|
Rem, sym::rem, rem_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
Neg, neg, neg_trait, Target::Trait, GenericRequirement::Exact(0);
|
Neg, sym::neg, neg_trait, Target::Trait, GenericRequirement::Exact(0);
|
||||||
Not, not, not_trait, Target::Trait, GenericRequirement::Exact(0);
|
Not, sym::not, not_trait, Target::Trait, GenericRequirement::Exact(0);
|
||||||
BitXor, bitxor, bitxor_trait, Target::Trait, GenericRequirement::Exact(1);
|
BitXor, sym::bitxor, bitxor_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
BitAnd, bitand, bitand_trait, Target::Trait, GenericRequirement::Exact(1);
|
BitAnd, sym::bitand, bitand_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
BitOr, bitor, bitor_trait, Target::Trait, GenericRequirement::Exact(1);
|
BitOr, sym::bitor, bitor_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
Shl, shl, shl_trait, Target::Trait, GenericRequirement::Exact(1);
|
Shl, sym::shl, shl_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
Shr, shr, shr_trait, Target::Trait, GenericRequirement::Exact(1);
|
Shr, sym::shr, shr_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
AddAssign, add_assign, add_assign_trait, Target::Trait, GenericRequirement::Exact(1);
|
AddAssign, sym::add_assign, add_assign_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
SubAssign, sub_assign, sub_assign_trait, Target::Trait, GenericRequirement::Exact(1);
|
SubAssign, sym::sub_assign, sub_assign_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
MulAssign, mul_assign, mul_assign_trait, Target::Trait, GenericRequirement::Exact(1);
|
MulAssign, sym::mul_assign, mul_assign_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
DivAssign, div_assign, div_assign_trait, Target::Trait, GenericRequirement::Exact(1);
|
DivAssign, sym::div_assign, div_assign_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
RemAssign, rem_assign, rem_assign_trait, Target::Trait, GenericRequirement::Exact(1);
|
RemAssign, sym::rem_assign, rem_assign_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
BitXorAssign, bitxor_assign, bitxor_assign_trait, Target::Trait, GenericRequirement::Exact(1);
|
BitXorAssign, sym::bitxor_assign, bitxor_assign_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
BitAndAssign, bitand_assign, bitand_assign_trait, Target::Trait, GenericRequirement::Exact(1);
|
BitAndAssign, sym::bitand_assign, bitand_assign_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
BitOrAssign, bitor_assign, bitor_assign_trait, Target::Trait, GenericRequirement::Exact(1);
|
BitOrAssign, sym::bitor_assign, bitor_assign_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
ShlAssign, shl_assign, shl_assign_trait, Target::Trait, GenericRequirement::Exact(1);
|
ShlAssign, sym::shl_assign, shl_assign_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
ShrAssign, shr_assign, shr_assign_trait, Target::Trait, GenericRequirement::Exact(1);
|
ShrAssign, sym::shr_assign, shr_assign_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
Index, index, index_trait, Target::Trait, GenericRequirement::Exact(1);
|
Index, sym::index, index_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
IndexMut, index_mut, index_mut_trait, Target::Trait, GenericRequirement::Exact(1);
|
IndexMut, sym::index_mut, index_mut_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
|
|
||||||
UnsafeCell, unsafe_cell, unsafe_cell_type, Target::Struct, GenericRequirement::None;
|
UnsafeCell, sym::unsafe_cell, unsafe_cell_type, Target::Struct, GenericRequirement::None;
|
||||||
VaList, va_list, va_list, Target::Struct, GenericRequirement::None;
|
VaList, sym::va_list, va_list, Target::Struct, GenericRequirement::None;
|
||||||
|
|
||||||
Deref, deref, deref_trait, Target::Trait, GenericRequirement::Exact(0);
|
Deref, sym::deref, deref_trait, Target::Trait, GenericRequirement::Exact(0);
|
||||||
DerefMut, deref_mut, deref_mut_trait, Target::Trait, GenericRequirement::Exact(0);
|
DerefMut, sym::deref_mut, deref_mut_trait, Target::Trait, GenericRequirement::Exact(0);
|
||||||
DerefTarget, deref_target, deref_target, Target::AssocTy, GenericRequirement::None;
|
DerefTarget, sym::deref_target, deref_target, Target::AssocTy, GenericRequirement::None;
|
||||||
Receiver, receiver, receiver_trait, Target::Trait, GenericRequirement::None;
|
Receiver, sym::receiver, receiver_trait, Target::Trait, GenericRequirement::None;
|
||||||
|
|
||||||
Fn, fn, fn_trait, Target::Trait, GenericRequirement::Exact(1);
|
Fn, kw::fn, fn_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
FnMut, fn_mut, fn_mut_trait, Target::Trait, GenericRequirement::Exact(1);
|
FnMut, sym::fn_mut, fn_mut_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
FnOnce, fn_once, fn_once_trait, Target::Trait, GenericRequirement::Exact(1);
|
FnOnce, sym::fn_once, fn_once_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
|
|
||||||
FnOnceOutput, fn_once_output, fn_once_output, Target::AssocTy, GenericRequirement::None;
|
FnOnceOutput, sym::fn_once_output, fn_once_output, Target::AssocTy, GenericRequirement::None;
|
||||||
|
|
||||||
Future, future_trait, future_trait, Target::Trait, GenericRequirement::Exact(0);
|
Future, sym::future_trait, future_trait, Target::Trait, GenericRequirement::Exact(0);
|
||||||
GeneratorState, generator_state, gen_state, Target::Enum, GenericRequirement::None;
|
GeneratorState, sym::generator_state, gen_state, Target::Enum, GenericRequirement::None;
|
||||||
Generator, generator, gen_trait, Target::Trait, GenericRequirement::Minimum(1);
|
Generator, sym::generator, gen_trait, Target::Trait, GenericRequirement::Minimum(1);
|
||||||
Unpin, unpin, unpin_trait, Target::Trait, GenericRequirement::None;
|
Unpin, sym::unpin, unpin_trait, Target::Trait, GenericRequirement::None;
|
||||||
Pin, pin, pin_type, Target::Struct, GenericRequirement::None;
|
Pin, sym::pin, pin_type, Target::Struct, GenericRequirement::None;
|
||||||
|
|
||||||
PartialEq, eq, eq_trait, Target::Trait, GenericRequirement::Exact(1);
|
PartialEq, sym::eq, eq_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
PartialOrd, partial_ord, partial_ord_trait, Target::Trait, GenericRequirement::Exact(1);
|
PartialOrd, sym::partial_ord, partial_ord_trait, Target::Trait, GenericRequirement::Exact(1);
|
||||||
|
CVoid, sym::c_void, c_void, Target::Enum, GenericRequirement::None;
|
||||||
|
|
||||||
// A number of panic-related lang items. The `panic` item corresponds to divide-by-zero and
|
// A number of panic-related lang items. The `panic` item corresponds to divide-by-zero and
|
||||||
// various panic cases with `match`. The `panic_bounds_check` item is for indexing arrays.
|
// various panic cases with `match`. The `panic_bounds_check` item is for indexing arrays.
|
||||||
@ -328,93 +332,103 @@ pub fn path(&self, db: &dyn DefDatabase, start_crate: CrateId) -> Option<Path> {
|
|||||||
// in the sense that a crate is not required to have it defined to use it, but a final product
|
// in the sense that a crate is not required to have it defined to use it, but a final product
|
||||||
// is required to define it somewhere. Additionally, there are restrictions on crates that use
|
// is required to define it somewhere. Additionally, there are restrictions on crates that use
|
||||||
// a weak lang item, but do not have it defined.
|
// a weak lang item, but do not have it defined.
|
||||||
Panic, panic, panic_fn, Target::Fn, GenericRequirement::Exact(0);
|
Panic, sym::panic, panic_fn, Target::Fn, GenericRequirement::Exact(0);
|
||||||
PanicNounwind, panic_nounwind, panic_nounwind, Target::Fn, GenericRequirement::Exact(0);
|
PanicNounwind, sym::panic_nounwind, panic_nounwind, Target::Fn, GenericRequirement::Exact(0);
|
||||||
PanicFmt, panic_fmt, panic_fmt, Target::Fn, GenericRequirement::None;
|
PanicFmt, sym::panic_fmt, panic_fmt, Target::Fn, GenericRequirement::None;
|
||||||
PanicDisplay, panic_display, panic_display, Target::Fn, GenericRequirement::None;
|
PanicDisplay, sym::panic_display, panic_display, Target::Fn, GenericRequirement::None;
|
||||||
ConstPanicFmt, const_panic_fmt, const_panic_fmt, Target::Fn, GenericRequirement::None;
|
ConstPanicFmt, sym::const_panic_fmt, const_panic_fmt, Target::Fn, GenericRequirement::None;
|
||||||
PanicBoundsCheck, panic_bounds_check, panic_bounds_check_fn, Target::Fn, GenericRequirement::Exact(0);
|
PanicBoundsCheck, sym::panic_bounds_check, panic_bounds_check_fn, Target::Fn, GenericRequirement::Exact(0);
|
||||||
PanicInfo, panic_info, panic_info, Target::Struct, GenericRequirement::None;
|
PanicMisalignedPointerDereference, sym::panic_misaligned_pointer_dereference, panic_misaligned_pointer_dereference_fn, Target::Fn, GenericRequirement::Exact(0);
|
||||||
PanicLocation, panic_location, panic_location, Target::Struct, GenericRequirement::None;
|
PanicInfo, sym::panic_info, panic_info, Target::Struct, GenericRequirement::None;
|
||||||
PanicImpl, panic_impl, panic_impl, Target::Fn, GenericRequirement::None;
|
PanicLocation, sym::panic_location, panic_location, Target::Struct, GenericRequirement::None;
|
||||||
PanicCannotUnwind, panic_cannot_unwind, panic_cannot_unwind, Target::Fn, GenericRequirement::Exact(0);
|
PanicImpl, sym::panic_impl, panic_impl, Target::Fn, GenericRequirement::None;
|
||||||
|
PanicCannotUnwind, sym::panic_cannot_unwind, panic_cannot_unwind, Target::Fn, GenericRequirement::Exact(0);
|
||||||
/// libstd panic entry point. Necessary for const eval to be able to catch it
|
/// libstd panic entry point. Necessary for const eval to be able to catch it
|
||||||
BeginPanic, begin_panic, begin_panic_fn, Target::Fn, GenericRequirement::None;
|
BeginPanic, sym::begin_panic, begin_panic_fn, Target::Fn, GenericRequirement::None;
|
||||||
|
|
||||||
ExchangeMalloc, exchange_malloc, exchange_malloc_fn, Target::Fn, GenericRequirement::None;
|
// Lang items needed for `format_args!()`.
|
||||||
BoxFree, box_free, box_free_fn, Target::Fn, GenericRequirement::Minimum(1);
|
FormatAlignment, sym::format_alignment, format_alignment, Target::Enum, GenericRequirement::None;
|
||||||
DropInPlace, drop_in_place, drop_in_place_fn, Target::Fn, GenericRequirement::Minimum(1);
|
FormatArgument, sym::format_argument, format_argument, Target::Struct, GenericRequirement::None;
|
||||||
AllocLayout, alloc_layout, alloc_layout, Target::Struct, GenericRequirement::None;
|
FormatArguments, sym::format_arguments, format_arguments, Target::Struct, GenericRequirement::None;
|
||||||
|
FormatCount, sym::format_count, format_count, Target::Enum, GenericRequirement::None;
|
||||||
|
FormatPlaceholder, sym::format_placeholder, format_placeholder, Target::Struct, GenericRequirement::None;
|
||||||
|
FormatUnsafeArg, sym::format_unsafe_arg, format_unsafe_arg, Target::Struct, GenericRequirement::None;
|
||||||
|
|
||||||
Start, start, start_fn, Target::Fn, GenericRequirement::Exact(1);
|
ExchangeMalloc, sym::exchange_malloc, exchange_malloc_fn, Target::Fn, GenericRequirement::None;
|
||||||
|
BoxFree, sym::box_free, box_free_fn, Target::Fn, GenericRequirement::Minimum(1);
|
||||||
|
DropInPlace, sym::drop_in_place, drop_in_place_fn, Target::Fn, GenericRequirement::Minimum(1);
|
||||||
|
AllocLayout, sym::alloc_layout, alloc_layout, Target::Struct, GenericRequirement::None;
|
||||||
|
|
||||||
EhPersonality, eh_personality, eh_personality, Target::Fn, GenericRequirement::None;
|
Start, sym::start, start_fn, Target::Fn, GenericRequirement::Exact(1);
|
||||||
EhCatchTypeinfo, eh_catch_typeinfo, eh_catch_typeinfo, Target::Static, GenericRequirement::None;
|
|
||||||
|
|
||||||
OwnedBox, owned_box, owned_box, Target::Struct, GenericRequirement::Minimum(1);
|
EhPersonality, sym::eh_personality, eh_personality, Target::Fn, GenericRequirement::None;
|
||||||
|
EhCatchTypeinfo, sym::eh_catch_typeinfo, eh_catch_typeinfo, Target::Static, GenericRequirement::None;
|
||||||
|
|
||||||
PhantomData, phantom_data, phantom_data, Target::Struct, GenericRequirement::Exact(1);
|
OwnedBox, sym::owned_box, owned_box, Target::Struct, GenericRequirement::Minimum(1);
|
||||||
|
|
||||||
ManuallyDrop, manually_drop, manually_drop, Target::Struct, GenericRequirement::None;
|
PhantomData, sym::phantom_data, phantom_data, Target::Struct, GenericRequirement::Exact(1);
|
||||||
|
|
||||||
MaybeUninit, maybe_uninit, maybe_uninit, Target::Union, GenericRequirement::None;
|
ManuallyDrop, sym::manually_drop, manually_drop, Target::Struct, GenericRequirement::None;
|
||||||
|
|
||||||
|
MaybeUninit, sym::maybe_uninit, maybe_uninit, Target::Union, GenericRequirement::None;
|
||||||
|
|
||||||
/// Align offset for stride != 1; must not panic.
|
/// Align offset for stride != 1; must not panic.
|
||||||
AlignOffset, align_offset, align_offset_fn, Target::Fn, GenericRequirement::None;
|
AlignOffset, sym::align_offset, align_offset_fn, Target::Fn, GenericRequirement::None;
|
||||||
|
|
||||||
Termination, termination, termination, Target::Trait, GenericRequirement::None;
|
Termination, sym::termination, termination, Target::Trait, GenericRequirement::None;
|
||||||
|
|
||||||
Try, Try, try_trait, Target::Trait, GenericRequirement::None;
|
Try, sym::Try, try_trait, Target::Trait, GenericRequirement::None;
|
||||||
|
|
||||||
Tuple, tuple_trait, tuple_trait, Target::Trait, GenericRequirement::Exact(0);
|
Tuple, sym::tuple_trait, tuple_trait, Target::Trait, GenericRequirement::Exact(0);
|
||||||
|
|
||||||
SliceLen, slice_len_fn, slice_len_fn, Target::Method(MethodKind::Inherent), GenericRequirement::None;
|
SliceLen, sym::slice_len_fn, slice_len_fn, Target::Method(MethodKind::Inherent), GenericRequirement::None;
|
||||||
|
|
||||||
// Language items from AST lowering
|
// Language items from AST lowering
|
||||||
TryTraitFromResidual, from_residual, from_residual_fn, Target::Method(MethodKind::Trait { body: false }), GenericRequirement::None;
|
TryTraitFromResidual, sym::from_residual, from_residual_fn, Target::Method(MethodKind::Trait { body: false }), GenericRequirement::None;
|
||||||
TryTraitFromOutput, from_output, from_output_fn, Target::Method(MethodKind::Trait { body: false }), GenericRequirement::None;
|
TryTraitFromOutput, sym::from_output, from_output_fn, Target::Method(MethodKind::Trait { body: false }), GenericRequirement::None;
|
||||||
TryTraitBranch, branch, branch_fn, Target::Method(MethodKind::Trait { body: false }), GenericRequirement::None;
|
TryTraitBranch, sym::branch, branch_fn, Target::Method(MethodKind::Trait { body: false }), GenericRequirement::None;
|
||||||
TryTraitFromYeet, from_yeet, from_yeet_fn, Target::Fn, GenericRequirement::None;
|
TryTraitFromYeet, sym::from_yeet, from_yeet_fn, Target::Fn, GenericRequirement::None;
|
||||||
|
|
||||||
PointerSized, pointer_sized, pointer_sized, Target::Trait, GenericRequirement::Exact(0);
|
PointerLike, sym::pointer_like, pointer_like, Target::Trait, GenericRequirement::Exact(0);
|
||||||
|
|
||||||
Poll, Poll, poll, Target::Enum, GenericRequirement::None;
|
ConstParamTy, sym::const_param_ty, const_param_ty_trait, Target::Trait, GenericRequirement::Exact(0);
|
||||||
PollReady, Ready, poll_ready_variant, Target::Variant, GenericRequirement::None;
|
|
||||||
PollPending, Pending, poll_pending_variant, Target::Variant, GenericRequirement::None;
|
Poll, sym::Poll, poll, Target::Enum, GenericRequirement::None;
|
||||||
|
PollReady, sym::Ready, poll_ready_variant, Target::Variant, GenericRequirement::None;
|
||||||
|
PollPending, sym::Pending, poll_pending_variant, Target::Variant, GenericRequirement::None;
|
||||||
|
|
||||||
// FIXME(swatinem): the following lang items are used for async lowering and
|
// FIXME(swatinem): the following lang items are used for async lowering and
|
||||||
// should become obsolete eventually.
|
// should become obsolete eventually.
|
||||||
ResumeTy, ResumeTy, resume_ty, Target::Struct, GenericRequirement::None;
|
ResumeTy, sym::ResumeTy, resume_ty, Target::Struct, GenericRequirement::None;
|
||||||
IdentityFuture, identity_future, identity_future_fn, Target::Fn, GenericRequirement::None;
|
GetContext, sym::get_context, get_context_fn, Target::Fn, GenericRequirement::None;
|
||||||
GetContext, get_context, get_context_fn, Target::Fn, GenericRequirement::None;
|
|
||||||
|
|
||||||
Context, Context, context, Target::Struct, GenericRequirement::None;
|
Context, sym::Context, context, Target::Struct, GenericRequirement::None;
|
||||||
FuturePoll, poll, future_poll_fn, Target::Method(MethodKind::Trait { body: false }), GenericRequirement::None;
|
FuturePoll, sym::poll, future_poll_fn, Target::Method(MethodKind::Trait { body: false }), GenericRequirement::None;
|
||||||
|
|
||||||
FromFrom, from, from_fn, Target::Method(MethodKind::Trait { body: false }), GenericRequirement::None;
|
Option, sym::Option, option_type, Target::Enum, GenericRequirement::None;
|
||||||
|
OptionSome, sym::Some, option_some_variant, Target::Variant, GenericRequirement::None;
|
||||||
|
OptionNone, sym::None, option_none_variant, Target::Variant, GenericRequirement::None;
|
||||||
|
|
||||||
OptionSome, Some, option_some_variant, Target::Variant, GenericRequirement::None;
|
ResultOk, sym::Ok, result_ok_variant, Target::Variant, GenericRequirement::None;
|
||||||
OptionNone, None, option_none_variant, Target::Variant, GenericRequirement::None;
|
ResultErr, sym::Err, result_err_variant, Target::Variant, GenericRequirement::None;
|
||||||
|
|
||||||
ResultOk, Ok, result_ok_variant, Target::Variant, GenericRequirement::None;
|
ControlFlowContinue, sym::Continue, cf_continue_variant, Target::Variant, GenericRequirement::None;
|
||||||
ResultErr, Err, result_err_variant, Target::Variant, GenericRequirement::None;
|
ControlFlowBreak, sym::Break, cf_break_variant, Target::Variant, GenericRequirement::None;
|
||||||
|
|
||||||
ControlFlowContinue, Continue, cf_continue_variant, Target::Variant, GenericRequirement::None;
|
IntoFutureIntoFuture, sym::into_future, into_future_fn, Target::Method(MethodKind::Trait { body: false }), GenericRequirement::None;
|
||||||
ControlFlowBreak, Break, cf_break_variant, Target::Variant, GenericRequirement::None;
|
IntoIterIntoIter, sym::into_iter, into_iter_fn, Target::Method(MethodKind::Trait { body: false }), GenericRequirement::None;
|
||||||
|
IteratorNext, sym::next, next_fn, Target::Method(MethodKind::Trait { body: false}), GenericRequirement::None;
|
||||||
|
|
||||||
IntoFutureIntoFuture, into_future, into_future_fn, Target::Method(MethodKind::Trait { body: false }), GenericRequirement::None;
|
PinNewUnchecked, sym::new_unchecked, new_unchecked_fn, Target::Method(MethodKind::Inherent), GenericRequirement::None;
|
||||||
IntoIterIntoIter, into_iter, into_iter_fn, Target::Method(MethodKind::Trait { body: false }), GenericRequirement::None;
|
|
||||||
IteratorNext, next, next_fn, Target::Method(MethodKind::Trait { body: false}), GenericRequirement::None;
|
|
||||||
|
|
||||||
PinNewUnchecked, new_unchecked, new_unchecked_fn, Target::Method(MethodKind::Inherent), GenericRequirement::None;
|
RangeFrom, sym::RangeFrom, range_from_struct, Target::Struct, GenericRequirement::None;
|
||||||
|
RangeFull, sym::RangeFull, range_full_struct, Target::Struct, GenericRequirement::None;
|
||||||
|
RangeInclusiveStruct, sym::RangeInclusive, range_inclusive_struct, Target::Struct, GenericRequirement::None;
|
||||||
|
RangeInclusiveNew, sym::range_inclusive_new, range_inclusive_new_method, Target::Method(MethodKind::Inherent), GenericRequirement::None;
|
||||||
|
Range, sym::Range, range_struct, Target::Struct, GenericRequirement::None;
|
||||||
|
RangeToInclusive, sym::RangeToInclusive, range_to_inclusive_struct, Target::Struct, GenericRequirement::None;
|
||||||
|
RangeTo, sym::RangeTo, range_to_struct, Target::Struct, GenericRequirement::None;
|
||||||
|
|
||||||
RangeFrom, RangeFrom, range_from_struct, Target::Struct, GenericRequirement::None;
|
String, sym::String, string, Target::Struct, GenericRequirement::None;
|
||||||
RangeFull, RangeFull, range_full_struct, Target::Struct, GenericRequirement::None;
|
CStr, sym::CStr, c_str, Target::Struct, GenericRequirement::None;
|
||||||
RangeInclusiveStruct, RangeInclusive, range_inclusive_struct, Target::Struct, GenericRequirement::None;
|
|
||||||
RangeInclusiveNew, range_inclusive_new, range_inclusive_new_method, Target::Method(MethodKind::Inherent), GenericRequirement::None;
|
|
||||||
Range, Range, range_struct, Target::Struct, GenericRequirement::None;
|
|
||||||
RangeToInclusive, RangeToInclusive, range_to_inclusive_struct, Target::Struct, GenericRequirement::None;
|
|
||||||
RangeTo, RangeTo, range_to_struct, Target::Struct, GenericRequirement::None;
|
|
||||||
|
|
||||||
String, String, string, Target::Struct, GenericRequirement::None;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1829,6 +1829,38 @@ fn byte_string() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn c_string() {
|
||||||
|
check_number(
|
||||||
|
r#"
|
||||||
|
//- minicore: index, slice
|
||||||
|
#[lang = "CStr"]
|
||||||
|
pub struct CStr {
|
||||||
|
inner: [u8]
|
||||||
|
}
|
||||||
|
const GOAL: u8 = {
|
||||||
|
let a = c"hello";
|
||||||
|
a.inner[0]
|
||||||
|
};
|
||||||
|
"#,
|
||||||
|
104,
|
||||||
|
);
|
||||||
|
check_number(
|
||||||
|
r#"
|
||||||
|
//- minicore: index, slice
|
||||||
|
#[lang = "CStr"]
|
||||||
|
pub struct CStr {
|
||||||
|
inner: [u8]
|
||||||
|
}
|
||||||
|
const GOAL: u8 = {
|
||||||
|
let a = c"hello";
|
||||||
|
a.inner[6]
|
||||||
|
};
|
||||||
|
"#,
|
||||||
|
0,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn consts() {
|
fn consts() {
|
||||||
check_number(
|
check_number(
|
||||||
|
|||||||
@ -13,7 +13,7 @@
|
|||||||
hir::{
|
hir::{
|
||||||
ArithOp, Array, BinaryOp, ClosureKind, Expr, ExprId, LabelId, Literal, Statement, UnaryOp,
|
ArithOp, Array, BinaryOp, ClosureKind, Expr, ExprId, LabelId, Literal, Statement, UnaryOp,
|
||||||
},
|
},
|
||||||
lang_item::LangItem,
|
lang_item::{LangItem, LangItemTarget},
|
||||||
path::{GenericArg, GenericArgs},
|
path::{GenericArg, GenericArgs},
|
||||||
BlockId, ConstParamId, FieldId, ItemContainerId, Lookup,
|
BlockId, ConstParamId, FieldId, ItemContainerId, Lookup,
|
||||||
};
|
};
|
||||||
@ -815,7 +815,7 @@ fn infer_expr_inner(&mut self, tgt_expr: ExprId, expected: &Expectation) -> Ty {
|
|||||||
Expr::Array(array) => self.infer_expr_array(array, expected),
|
Expr::Array(array) => self.infer_expr_array(array, expected),
|
||||||
Expr::Literal(lit) => match lit {
|
Expr::Literal(lit) => match lit {
|
||||||
Literal::Bool(..) => self.result.standard_types.bool_.clone(),
|
Literal::Bool(..) => self.result.standard_types.bool_.clone(),
|
||||||
Literal::String(..) | Literal::CString(..) => {
|
Literal::String(..) => {
|
||||||
TyKind::Ref(Mutability::Not, static_lifetime(), TyKind::Str.intern(Interner))
|
TyKind::Ref(Mutability::Not, static_lifetime(), TyKind::Str.intern(Interner))
|
||||||
.intern(Interner)
|
.intern(Interner)
|
||||||
}
|
}
|
||||||
@ -831,6 +831,20 @@ fn infer_expr_inner(&mut self, tgt_expr: ExprId, expected: &Expectation) -> Ty {
|
|||||||
let array_type = TyKind::Array(byte_type, len).intern(Interner);
|
let array_type = TyKind::Array(byte_type, len).intern(Interner);
|
||||||
TyKind::Ref(Mutability::Not, static_lifetime(), array_type).intern(Interner)
|
TyKind::Ref(Mutability::Not, static_lifetime(), array_type).intern(Interner)
|
||||||
}
|
}
|
||||||
|
Literal::CString(..) => TyKind::Ref(
|
||||||
|
Mutability::Not,
|
||||||
|
static_lifetime(),
|
||||||
|
self.resolve_lang_item(LangItem::CStr)
|
||||||
|
.and_then(LangItemTarget::as_struct)
|
||||||
|
.map_or_else(
|
||||||
|
|| self.err_ty(),
|
||||||
|
|strukt| {
|
||||||
|
TyKind::Adt(AdtId(strukt.into()), Substitution::empty(Interner))
|
||||||
|
.intern(Interner)
|
||||||
|
},
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.intern(Interner),
|
||||||
Literal::Char(..) => TyKind::Scalar(Scalar::Char).intern(Interner),
|
Literal::Char(..) => TyKind::Scalar(Scalar::Char).intern(Interner),
|
||||||
Literal::Int(_v, ty) => match ty {
|
Literal::Int(_v, ty) => match ty {
|
||||||
Some(int_ty) => {
|
Some(int_ty) => {
|
||||||
|
|||||||
@ -3557,3 +3557,18 @@ fn main() {
|
|||||||
"#,
|
"#,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn cstring_literals() {
|
||||||
|
check_types(
|
||||||
|
r#"
|
||||||
|
#[lang = "CStr"]
|
||||||
|
pub struct CStr;
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
c"ello";
|
||||||
|
//^^^^^^^ &CStr
|
||||||
|
}
|
||||||
|
"#,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user