Skip to content

Rollup of 5 pull requests #94328

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Closed
wants to merge 15 commits into from

Conversation

Manishearth
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 15 commits February 20, 2022 10:03
- Test the combinations of --check-cfg with partial values() and --cfg
- Test that we detect unexpected value when none are expected
…r=cjgillot

Remove in band lifetimes

As discussed in t-lang backlog bonanza, the `in_band_lifetimes` FCP closed in favor for the feature not being stabilized. This PR removes `#![feature(in_band_lifetimes)]` in its entirety.

Let me know if this PR is too hasty, and if we should instead do something intermediate for deprecate the feature first.

r? `@scottmcm` (or feel free to reassign, just saw your last comment on rust-lang#44524)
Closes rust-lang#44524
…rochenkov

Improve `--check-cfg` implementation

This pull-request is a mix of improvements regarding the `--check-cfg` implementation:

- Simpler internal representation (usage of `Option` instead of separate bool)
- Add --check-cfg to the unstable book (based on the RFC)
- Improved diagnostics:
    * List possible values when the value is unexpected
    * Suggest if possible a name or value that is similar
- Add more tests (well known names, mix of combinations, ...)

r? `@petrochenkov`
…ointer, r=michaelwoerister

properly handle fat pointers to uninhabitable types

Calculate the pointee metadata size by using `tcx.struct_tail_erasing_lifetimes` instead of duplicating the logic in `fat_pointer_kind`. Open to alternatively suggestions on how to fix this.

Fixes rust-lang#94149

r? `@michaelwoerister` since you touched this code last, I think!
…i-obk

Normalize main return type during mono item collection & codegen

The issue can be observed with `-Zprint-mono-items=lazy` in:

```rust
#![feature(termination_trait_lib)]
fn main() -> impl std::process::Termination { }
```
```
BEFORE: MONO_ITEM fn std::rt::lang_start::<impl std::process::Termination> `@@` t.93933fa2-cgu.2[External]
AFTER:  MONO_ITEM fn std::rt::lang_start::<()> `@@` t.df56e625-cgu.1[External]
```
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Feb 24, 2022
@Manishearth
Copy link
Member Author

@bors r+ p=5 rollup=never

@bors
Copy link
Collaborator

bors commented Feb 24, 2022

📌 Commit 2c801e8 has been approved by Manishearth

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 24, 2022
@bors
Copy link
Collaborator

bors commented Feb 24, 2022

⌛ Testing commit 2c801e8 with merge 4324cfa36c1a79a026dd9ac71d914f1e85a69bb0...

@bors
Copy link
Collaborator

bors commented Feb 24, 2022

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 24, 2022
@Dylan-DPC
Copy link
Member

failed due to #93845

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-nopt failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
test [ui] ui/cycle-trait/cycle-trait-supertrait-indirect.rs ... ok
test [ui] ui/debuginfo/debuginfo-emit-llvm-ir-and-split-debuginfo.rs ... ok
test [ui] ui/deduplicate-diagnostics.rs#duplicate ... ok
test [ui] ui/deduplicate-diagnostics.rs#deduplicate ... ok
test [ui] ui/debuginfo/debuginfo_with_uninhabitable_field_and_unsized.rs ... ok
test [ui] ui/definition-reachable/private-types.rs ... ok
test [ui] ui/definition-reachable/private-non-types.rs ... ok
test [ui] ui/custom-test-frameworks-simple.rs ... ok
test [ui] ui/cross-crate/xcrate-associated-type-defaults.rs ... ok
---
test [ui (nll)] ui/cycle-trait/cycle-trait-default-type-trait.rs ... ok
test [ui (nll)] ui/cross-crate/issue-64872/issue-64872.rs ... ok
test [ui (nll)] ui/cycle-trait/cycle-trait-supertrait-direct.rs ... ok
test [ui (nll)] ui/cycle-trait/cycle-trait-supertrait-indirect.rs ... ok
test [ui (nll)] ui/debuginfo/debuginfo_with_uninhabitable_field_and_unsized.rs ... ok
test [ui (nll)] ui/deduplicate-diagnostics.rs#deduplicate ... ok
test [ui (nll)] ui/debuginfo/debuginfo-emit-llvm-ir-and-split-debuginfo.rs ... ok
test [ui (nll)] ui/deduplicate-diagnostics.rs#duplicate ... ok
test [ui (nll)] ui/custom-test-frameworks-simple.rs ... ok
---
1 error: lifetime may not live long enough
-   --> $DIR/issue-52742.rs:14:9
+   --> $DIR/issue-52742.rs:12:9
3    |
4 LL |     fn take_bar(&mut self, b: Bar<'_>) {
5    |                 ---------         -- let's call this `'1`

The actual stderr differed from the expected stderr.
The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/nll/issue-52742.nll/issue-52742.nll.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args nll/issue-52742.rs`
error: 1 errors occurred comparing output.
status: exit status: 1
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/nll/issue-52742.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/nll/issue-52742.nll" "-Zborrowck=mir" "-A" "unused" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/nll/issue-52742.nll/auxiliary"
stdout: none
--- stderr -------------------------------
error: lifetime may not live long enough
   |
   |
LL |     fn take_bar(&mut self, b: Bar<'_>) {
   |                 ---------         -- let's call this `'1`
   |                 has type `&mut Foo<'_, '2>`
   |                 has type `&mut Foo<'_, '2>`
LL |         self.y = b.z
   |         ^^^^^^^^^^^^ assignment requires that `'1` must outlive `'2`
error: aborting due to previous error
------------------------------------------




failures:
    [ui (nll)] ui/nll/issue-52742.rs

test result: FAILED. 12486 passed; 1 failed; 165 ignored; 0 measured; 0 filtered out; finished in 99.31s

Some tests failed in compiletest suite=ui compare_mode=Nll mode=ui host=x86_64-unknown-linux-gnu target=x86_64-unknown-linux-gnu

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants