Skip to content

Commit 7dee5f8

Browse files
davidtwcomatthewjasper
davidtwco
and
matthewjasper
committed
hir: introduce lang items for AST lowering
This commit adds new lang items which will be used in AST lowering once `QPath::LangItem` is introduced. Co-authored-by: Matthew Jasper <mjjasper1@gmail.com> Signed-off-by: David Wood <david@davidtw.co>
1 parent 734441c commit 7dee5f8

File tree

13 files changed

+60
-1
lines changed

13 files changed

+60
-1
lines changed

‎library/core/src/convert/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@ pub trait Into<T>: Sized {
385385
))]
386386
pub trait From<T>: Sized {
387387
/// Performs the conversion.
388+
#[cfg_attr(not(bootstrap), lang = "from")]
388389
#[stable(feature = "rust1", since = "1.0.0")]
389390
fn from(_: T) -> Self;
390391
}

‎library/core/src/future/future.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ pub trait Future {
9696
/// [`Context`]: ../task/struct.Context.html
9797
/// [`Waker`]: ../task/struct.Waker.html
9898
/// [`Waker::wake`]: ../task/struct.Waker.html#method.wake
99+
#[cfg_attr(not(bootstrap), lang = "poll")]
99100
#[stable(feature = "futures_api", since = "1.36.0")]
100101
fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output>;
101102
}

‎library/core/src/future/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ unsafe impl Sync for ResumeTy {}
5353
/// This function returns a `GenFuture` underneath, but hides it in `impl Trait` to give
5454
/// better error messages (`impl Future` rather than `GenFuture<[closure.....]>`).
5555
// This is `const` to avoid extra errors after we recover from `const async fn`
56+
#[cfg_attr(not(bootstrap), lang = "from_generator")]
5657
#[doc(hidden)]
5758
#[unstable(feature = "gen_future", issue = "50547")]
5859
#[inline]
@@ -85,6 +86,7 @@ where
8586
GenFuture(gen)
8687
}
8788

89+
#[cfg_attr(not(bootstrap), lang = "get_context")]
8890
#[doc(hidden)]
8991
#[unstable(feature = "gen_future", issue = "50547")]
9092
#[inline]

‎library/core/src/iter/traits/collect.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ pub trait IntoIterator {
235235
/// assert_eq!(Some(3), iter.next());
236236
/// assert_eq!(None, iter.next());
237237
/// ```
238+
#[cfg_attr(not(bootstrap), lang = "into_iter")]
238239
#[stable(feature = "rust1", since = "1.0.0")]
239240
fn into_iter(self) -> Self::IntoIter;
240241
}

‎library/core/src/iter/traits/iterator.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ pub trait Iterator {
129129
/// assert_eq!(None, iter.next());
130130
/// assert_eq!(None, iter.next());
131131
/// ```
132+
#[cfg_attr(not(bootstrap), lang = "next")]
132133
#[stable(feature = "rust1", since = "1.0.0")]
133134
fn next(&mut self) -> Option<Self::Item>;
134135

‎library/core/src/ops/range.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ use crate::hash::Hash;
3838
/// [`IntoIterator`]: ../iter/trait.Iterator.html
3939
/// [`Iterator`]: ../iter/trait.IntoIterator.html
4040
/// [slicing index]: ../slice/trait.SliceIndex.html
41+
#[cfg_attr(not(bootstrap), lang = "RangeFull")]
4142
#[doc(alias = "..")]
4243
#[derive(Copy, Clone, Default, PartialEq, Eq, Hash)]
4344
#[stable(feature = "rust1", since = "1.0.0")]
@@ -70,6 +71,7 @@ impl fmt::Debug for RangeFull {
7071
/// assert_eq!(arr[1.. 3], [ 1,2 ]); // Range
7172
/// assert_eq!(arr[1..=3], [ 1,2,3 ]);
7273
/// ```
74+
#[cfg_attr(not(bootstrap), lang = "Range")]
7375
#[doc(alias = "..")]
7476
#[derive(Clone, Default, PartialEq, Eq, Hash)] // not Copy -- see #27186
7577
#[stable(feature = "rust1", since = "1.0.0")]
@@ -178,6 +180,7 @@ impl<Idx: PartialOrd<Idx>> Range<Idx> {
178180
/// ```
179181
///
180182
/// [`Iterator`]: ../iter/trait.IntoIterator.html
183+
#[cfg_attr(not(bootstrap), lang = "RangeFrom")]
181184
#[doc(alias = "..")]
182185
#[derive(Clone, PartialEq, Eq, Hash)] // not Copy -- see #27186
183186
#[stable(feature = "rust1", since = "1.0.0")]
@@ -260,6 +263,7 @@ impl<Idx: PartialOrd<Idx>> RangeFrom<Idx> {
260263
/// [`IntoIterator`]: ../iter/trait.Iterator.html
261264
/// [`Iterator`]: ../iter/trait.IntoIterator.html
262265
/// [slicing index]: ../slice/trait.SliceIndex.html
266+
#[cfg_attr(not(bootstrap), lang = "RangeTo")]
263267
#[doc(alias = "..")]
264268
#[derive(Copy, Clone, PartialEq, Eq, Hash)]
265269
#[stable(feature = "rust1", since = "1.0.0")]
@@ -328,6 +332,7 @@ impl<Idx: PartialOrd<Idx>> RangeTo<Idx> {
328332
/// assert_eq!(arr[1.. 3], [ 1,2 ]);
329333
/// assert_eq!(arr[1..=3], [ 1,2,3 ]); // RangeInclusive
330334
/// ```
335+
#[cfg_attr(not(bootstrap), lang = "RangeInclusive")]
331336
#[doc(alias = "..=")]
332337
#[derive(Clone, PartialEq, Eq, Hash)] // not Copy -- see #27186
333338
#[stable(feature = "inclusive_range", since = "1.26.0")]
@@ -359,6 +364,7 @@ impl<Idx> RangeInclusive<Idx> {
359364
///
360365
/// assert_eq!(3..=5, RangeInclusive::new(3, 5));
361366
/// ```
367+
#[cfg_attr(not(bootstrap), lang = "range_inclusive_new")]
362368
#[stable(feature = "inclusive_range_methods", since = "1.27.0")]
363369
#[inline]
364370
#[rustc_promotable]
@@ -555,6 +561,7 @@ impl<Idx: PartialOrd<Idx>> RangeInclusive<Idx> {
555561
/// [`IntoIterator`]: ../iter/trait.Iterator.html
556562
/// [`Iterator`]: ../iter/trait.IntoIterator.html
557563
/// [slicing index]: ../slice/trait.SliceIndex.html
564+
#[cfg_attr(not(bootstrap), lang = "RangeToInclusive")]
558565
#[doc(alias = "..=")]
559566
#[derive(Copy, Clone, PartialEq, Eq, Hash)]
560567
#[stable(feature = "inclusive_range", since = "1.26.0")]

‎library/core/src/ops/try.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,19 @@ pub trait Try {
4343
/// in the return type of the enclosing scope (which must itself implement
4444
/// `Try`). Specifically, the value `X::from_error(From::from(e))`
4545
/// is returned, where `X` is the return type of the enclosing function.
46+
#[cfg_attr(not(bootstrap), lang = "into_result")]
4647
#[unstable(feature = "try_trait", issue = "42327")]
4748
fn into_result(self) -> Result<Self::Ok, Self::Error>;
4849

4950
/// Wrap an error value to construct the composite result. For example,
5051
/// `Result::Err(x)` and `Result::from_error(x)` are equivalent.
52+
#[cfg_attr(not(bootstrap), lang = "from_error")]
5153
#[unstable(feature = "try_trait", issue = "42327")]
5254
fn from_error(v: Self::Error) -> Self;
5355

5456
/// Wrap an OK value to construct the composite result. For example,
5557
/// `Result::Ok(x)` and `Result::from_ok(x)` are equivalent.
58+
#[cfg_attr(not(bootstrap), lang = "from_ok")]
5659
#[unstable(feature = "try_trait", issue = "42327")]
5760
fn from_ok(v: Self::Ok) -> Self;
5861
}

‎library/core/src/option.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,11 @@ use crate::{
144144
#[stable(feature = "rust1", since = "1.0.0")]
145145
pub enum Option<T> {
146146
/// No value
147+
#[cfg_attr(not(bootstrap), lang = "None")]
147148
#[stable(feature = "rust1", since = "1.0.0")]
148149
None,
149150
/// Some value `T`
151+
#[cfg_attr(not(bootstrap), lang = "Some")]
150152
#[stable(feature = "rust1", since = "1.0.0")]
151153
Some(#[stable(feature = "rust1", since = "1.0.0")] T),
152154
}

‎library/core/src/pin.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -562,6 +562,7 @@ impl<P: Deref> Pin<P> {
562562
/// ```
563563
///
564564
/// [`mem::swap`]: ../../std/mem/fn.swap.html
565+
#[cfg_attr(not(bootstrap), lang = "new_unchecked")]
565566
#[stable(feature = "pin", since = "1.33.0")]
566567
#[inline(always)]
567568
pub unsafe fn new_unchecked(pointer: P) -> Pin<P> {

‎library/core/src/result.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,12 @@ use crate::{convert, fmt};
246246
#[stable(feature = "rust1", since = "1.0.0")]
247247
pub enum Result<T, E> {
248248
/// Contains the success value
249+
#[cfg_attr(not(bootstrap), lang = "Ok")]
249250
#[stable(feature = "rust1", since = "1.0.0")]
250251
Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
251252

252253
/// Contains the error value
254+
#[cfg_attr(not(bootstrap), lang = "Err")]
253255
#[stable(feature = "rust1", since = "1.0.0")]
254256
Err(#[stable(feature = "rust1", since = "1.0.0")] E),
255257
}

‎library/core/src/task/poll.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use crate::result::Result;
1010
#[stable(feature = "futures_api", since = "1.36.0")]
1111
pub enum Poll<T> {
1212
/// Represents that a value is immediately ready.
13+
#[cfg_attr(not(bootstrap), lang = "Ready")]
1314
#[stable(feature = "futures_api", since = "1.36.0")]
1415
Ready(#[stable(feature = "futures_api", since = "1.36.0")] T),
1516

@@ -18,6 +19,7 @@ pub enum Poll<T> {
1819
/// When a function returns `Pending`, the function *must* also
1920
/// ensure that the current task is scheduled to be awoken when
2021
/// progress can be made.
22+
#[cfg_attr(not(bootstrap), lang = "Pending")]
2123
#[stable(feature = "futures_api", since = "1.36.0")]
2224
Pending,
2325
}

‎src/librustc_hir/lang_items.rs

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
pub use self::LangItem::*;
1111

1212
use crate::def_id::DefId;
13-
use crate::Target;
13+
use crate::{MethodKind, Target};
1414

1515
use rustc_ast::ast;
1616
use rustc_data_structures::fx::FxHashMap;
@@ -307,4 +307,38 @@ language_item_table! {
307307
CountCodeRegionFnLangItem, sym::count_code_region, count_code_region_fn, Target::Fn;
308308
CoverageCounterAddFnLangItem, sym::coverage_counter_add, coverage_counter_add_fn, Target::Fn;
309309
CoverageCounterSubtractFnLangItem, sym::coverage_counter_subtract, coverage_counter_subtract_fn, Target::Fn;
310+
311+
// Language items from AST lowering
312+
TryFromError, sym::from_error, from_error_fn, Target::Method(MethodKind::Trait { body: false });
313+
TryFromOk, sym::from_ok, from_ok_fn, Target::Method(MethodKind::Trait { body: false });
314+
TryIntoResult, sym::into_result, into_result_fn, Target::Method(MethodKind::Trait { body: false });
315+
316+
PollReady, sym::Ready, poll_ready_variant, Target::Variant;
317+
PollPending, sym::Pending, poll_pending_variant, Target::Variant;
318+
319+
FromGenerator, sym::from_generator, from_generator_fn, Target::Fn;
320+
GetContext, sym::get_context, get_context_fn, Target::Fn;
321+
322+
FuturePoll, sym::poll, future_poll_fn, Target::Method(MethodKind::Trait { body: false });
323+
324+
FromFrom, sym::from, from_fn, Target::Method(MethodKind::Trait { body: false });
325+
326+
OptionSome, sym::Some, option_some_variant, Target::Variant;
327+
OptionNone, sym::None, option_none_variant, Target::Variant;
328+
329+
ResultOk, sym::Ok, result_ok_variant, Target::Variant;
330+
ResultErr, sym::Err, result_err_variant, Target::Variant;
331+
332+
IntoIterIntoIter, sym::into_iter, into_iter_fn, Target::Method(MethodKind::Trait { body: false });
333+
IteratorNext, sym::next, next_fn, Target::Method(MethodKind::Trait { body: false});
334+
335+
PinNewUnchecked, sym::new_unchecked, new_unchecked_fn, Target::Method(MethodKind::Inherent);
336+
337+
RangeFrom, sym::RangeFrom, range_from_struct, Target::Struct;
338+
RangeFull, sym::RangeFull, range_full_struct, Target::Struct;
339+
RangeInclusiveStruct, sym::RangeInclusive, range_inclusive_struct, Target::Struct;
340+
RangeInclusiveNew, sym::range_inclusive_new, range_inclusive_new_method, Target::Method(MethodKind::Inherent);
341+
Range, sym::Range, range_struct, Target::Struct;
342+
RangeToInclusive, sym::RangeToInclusive, range_to_inclusive_struct, Target::Struct;
343+
RangeTo, sym::RangeTo, range_to_struct, Target::Struct;
310344
}

‎src/librustc_span/symbol.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,7 @@ symbols! {
706706
never_type,
707707
never_type_fallback,
708708
new,
709+
new_unchecked,
709710
next,
710711
nll,
711712
no,
@@ -828,6 +829,7 @@ symbols! {
828829
quad_precision_float,
829830
question_mark,
830831
quote,
832+
range_inclusive_new,
831833
raw_dylib,
832834
raw_identifiers,
833835
raw_ref_op,

0 commit comments

Comments
 (0)