diff options
| author | Jubilee <46493976+workingjubilee@users.noreply.github.com> | 2023-12-15 14:08:15 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-15 14:08:15 -0800 |
| commit | 1d54949765e88e70ae9df91d545fc7e5a6dbe016 (patch) | |
| tree | 7b30f4a5466ac6a39e51f8e6035aaf6ef97b5947 /library/std/src/process.rs | |
| parent | a96d57bdb6d2bb6d233d7d5aaefc2995ab99be01 (diff) | |
| parent | bc1ca6b52854d09cfdcb83d0559f3e72720aa41f (diff) | |
Rollup merge of #118396 - compiler-errors:ast-lang-items, r=cjgillot
Collect lang items from AST, get rid of `GenericBound::LangItemTrait` r? `@cjgillot` cc #115178 Looking forward, the work to remove `QPath::LangItem` will also be significantly more difficult, but I plan on doing it as well. Specifically, we have to change: 1. A lot of `rustc_ast_lowering` for things like expr `..` 2. A lot of astconv, since we actually instantiate lang and non-lang paths quite differently. 3. A ton of diagnostics and clippy lints that are special-cased via `QPath::LangItem` Meanwhile, it was pretty easy to remove `GenericBound::LangItemTrait`, so I just did that here.
Diffstat (limited to 'library/std/src/process.rs')
| -rw-r--r-- | library/std/src/process.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/std/src/process.rs b/library/std/src/process.rs index 6004ed51bd1..4a7f5d8e0be 100644 --- a/library/std/src/process.rs +++ b/library/std/src/process.rs @@ -2311,7 +2311,7 @@ pub fn id() -> u32 { /// of the `main` function, this trait is likely to be available only on /// standard library's runtime for convenience. Other runtimes are not required /// to provide similar functionality. -#[cfg_attr(not(test), lang = "termination")] +#[cfg_attr(not(any(test, doctest)), lang = "termination")] #[stable(feature = "termination_trait_lib", since = "1.61.0")] #[rustc_on_unimplemented(on( cause = "MainFunctionType", |