Skip to content

Use revisions instead of nll compare mode for /self/ ui tests - #96148

Merged
bors merged 1 commit into
rust-lang:masterfrom
marmeladema:nll-revisions-self
Apr 18, 2022
Merged

Use revisions instead of nll compare mode for /self/ ui tests#96148
bors merged 1 commit into
rust-lang:masterfrom
marmeladema:nll-revisions-self

Conversation

@marmeladema

Copy link
Copy Markdown
Contributor

@rustbotrustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Apr 17, 2022
@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 17, 2022

@jackh726jackh726 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, other than needing to file an issue for the note and suggestion (it happens in several of these tests).

r=me after that

@@ -13,7 +13,7 @@ LL | fn a<'a>(self: Pin<&'a Foo>, f: &'a Foo) -> &Foo { f }
| ++++ ++ ++

error[E0623]: lifetime mismatch
--> $DIR/arbitrary_self_types_pin_lifetime_mismatch.rs:8:76

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We lose the suggestion above. Can you file an issue for this?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Filed #96157

@marmeladema

Copy link
Copy Markdown
ContributorAuthor

@jackh726 done!

@jackh726

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Apr 17, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit e818f45 has been approved by jackh726

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 17, 2022
@jackh726

Copy link
Copy Markdown
Member

@bors rollup

Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Apr 18, 2022
…ackh726
Use revisions instead of nll compare mode for `/self/` ui tests
r? `@jackh726`
@Dylan-DPCDylan-DPC mentioned this pull request Apr 18, 2022
@Dylan-DPCDylan-DPC mentioned this pull request Apr 18, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 18, 2022
Rollup of 5 pull requests
Successful merges:
- rust-lang#96032 (Update books)
- rust-lang#96136 (Reword clarification on lifetime for ptr->ref safety docs)
- rust-lang#96143 (Fix snapshot --bless not working anymore in htmldocck)
- rust-lang#96148 (Use revisions instead of nll compare mode for `/self/` ui tests)
- rust-lang#96156 (Replace u8to64_le macro with u64::from_le_bytes)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 97d016e into rust-lang:masterApr 18, 2022
@rustbotrustbot added this to the 1.62.0 milestone Apr 18, 2022
@marmeladema
marmeladema deleted the nll-revisions-self branch April 19, 2022 10:54
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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.

5 participants

@marmeladema@jackh726@bors@rust-highfive@rustbot