Skip to content

Conversation

superblaubeere27
Copy link

Currently WIP, please don't merge yet.

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Aug 18, 2022
@rust-highfive
Copy link
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @jackh726 (or someone else) soon.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 18, 2022
@compiler-errors compiler-errors added the A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic label Aug 18, 2022
@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Collaborator

bors commented Aug 20, 2022

☔ The latest upstream changes (presumably #100793) made this pull request unmergeable. Please resolve the merge conflicts.

@davidtwco
Copy link
Member

r? @davidtwco

@rust-highfive rust-highfive assigned davidtwco and unassigned jackh726 Aug 23, 2022
@davidtwco
Copy link
Member

We have a no merge policy, could you remove the merge commits?

@davidtwco davidtwco added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 23, 2022
@davidtwco davidtwco mentioned this pull request Aug 23, 2022
84 tasks
@superblaubeere27
Copy link
Author

We have a no merge policy, could you remove the merge commits?

Sure. I am not that experienced with git though... How do I do that?

@Tarkan-Zarrouk
Copy link

Tarkan-Zarrouk commented Aug 23, 2022

git rebase -i (sha before the branches diverged)

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)

---- [ui] src/test/ui/error-codes/E0374.rs stdout ----
diff of stderr:

- error[E0374]: the trait `CoerceUnsized` may only be implemented for a coercion between structures with one field being coerced, none found
+ error[E0374]: implementing the trait `CoerceUnsized` requires multiple coercions
2   --> $DIR/E0374.rs:8:1
3    |
4 LL | impl<T, U> CoerceUnsized<Foo<U>> for Foo<T>

The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/error-codes/E0374/E0374.stderr
To update references, rerun the tests and pass the `--bless` flag
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args error-codes/E0374.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/error-codes/E0374.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/error-codes/E0374" "-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/error-codes/E0374/auxiliary"
stdout: none
--- stderr -------------------------------
error[E0374]: implementing the trait `CoerceUnsized` requires multiple coercions
Some tests failed in compiletest suite=ui mode=ui host=x86_64-unknown-linux-gnu target=x86_64-unknown-linux-gnu
   |
   |
LL | impl<T, U> CoerceUnsized<Foo<U>> for Foo<T> //~ ERROR E0374

error: aborting due to previous error

For more information about this error, try `rustc --explain E0374`.

@superblaubeere27
Copy link
Author

All of this is a bit more complicated than anticipated... Can I just create a new, fresh PR? 😅

@davidtwco
Copy link
Member

All of this is a bit more complicated than anticipated... Can I just create a new, fresh PR? 😅

Yeah, that's fine too.

@superblaubeere27
Copy link
Author

Closed in favor of #101007

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler 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