Skip to content

Node-ify lifetimes - #6896

Merged
bors[bot] merged 4 commits into
rust-lang:masterfrom
Veykril:lt-node
Dec 16, 2020
Merged

bors[bot] merged 4 commits into
rust-lang:masterfrom
Veykril:lt-node

Conversation

@Veykril

@Veykril Veykril commented Dec 15, 2020

Copy link
Copy Markdown
Member

Let's see if this passes the tests 🤞

Depends on rust-analyzer/ungrammar#15

Refactors builtin derive support to go through proper name resolution
@matklad

matklad commented Dec 16, 2020

Copy link
Copy Markdown
Contributor

bors d+

here as well

@Veykril feel free to merge this and the correspoinding ungrammar PR as soon as you'll have time!

@bors

bors Bot commented Dec 16, 2020

Copy link
Copy Markdown
Contributor

✌️ Veykril can now approve this pull request. To approve and merge a pull request, simply reply with bors r+. More detailed instructions are available here.

@Veykril

Veykril commented Dec 16, 2020 •

Copy link
Copy Markdown
Member Author

Rebased on top of #6897 as this PR will get conflicts from that for sure(the bors merge commit from that PR shouldn't affect this PR once its merged I think right?) due to Cargo.lock and the generated syntax files.

Comment thread Cargo.toml Outdated

[profile.release]
incremental = true
incremental = true

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

trailing ws?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Oh, for some reason whatever formats that in vscode for me adds that in and I'm not sure why 😅

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

One of these days, I'll make a proper lossless toml library...

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

There actually is a lossless toml library in rust(it even uses rowan) https://github.com/tamasfe/taplo and I just noticed I use the vscode extension of that but it seems the formatter for that doesn't play nicely yet.

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.

Strange, Even Better TOML works fine for me (with some consistent config tweaking).

@jonas-schievink

Copy link
Copy Markdown
Contributor

bors r+

@bors

bors Bot commented Dec 16, 2020

Copy link
Copy Markdown
Contributor

@bors
bors Bot merged commit 067067a into rust-lang:master Dec 16, 2020
@Veykril
Veykril deleted the lt-node branch May 20, 2022 13:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants