Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Move jointness censoring to proc_macro #76285

Merged
merged 2 commits into from
Sep 5, 2020
Merged

Move jointness censoring to proc_macro #76285

merged 2 commits into from
Sep 5, 2020

Conversation

matklad
Copy link
Member

@matklad matklad commented Sep 3, 2020

Proc-macro API currently exposes jointness in Punct tokens. That is,
+ in +one is non joint.

Our lexer produces jointness info for all tokens, so we need to censor
it somewhere

Previously we did this in a lexer, but it makes more sense to do this
in a proc-macro server.

r? @petrochenkov

@matklad
Move jointness censoring to proc_macro
850c321 
Proc-macro API currently exposes jointness in `Punct` tokens. That is,
`+` in `+one` is **non** joint.

Our lexer produces jointness info for all tokens, so we need to censor
it *somewhere*

Previously we did this in a lexer, but it makes more sense to do this
in a proc-macro server.
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 3, 2020
@matklad matklad mentioned this pull request Sep 3, 2020
Merged
@petrochenkov petrochenkov 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 Sep 3, 2020
@matklad
Optimize Cursor::look_ahead
09d3db2 
Cloning a tt is cheap, but not free (there's Arc inside).
@matklad matklad added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 3, 2020
@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Sep 3, 2020

📌 Commit 09d3db2 has been approved by petrochenkov

@bors bors 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 Sep 3, 2020
matklad added a commit to matklad/rust that referenced this pull request Sep 4, 2020
@matklad
Rollup merge of rust-lang#76291 - matklad:spacing, r=petrochenkov
3ea07a3 
Rename IsJoint -> Spacing

Builds on rust-lang#76286 and might conflict with rust-lang#76285

r? @petrochenkov
matklad added a commit to matklad/rust that referenced this pull request Sep 4, 2020
@matklad
Rollup merge of rust-lang#76291 - matklad:spacing, r=petrochenkov
ca0210b 
Rename IsJoint -> Spacing

Builds on rust-lang#76286 and might conflict with rust-lang#76285

r? @petrochenkov
matklad added a commit to matklad/rust that referenced this pull request Sep 4, 2020
@matklad
Rollup merge of rust-lang#76291 - matklad:spacing, r=petrochenkov
15d37ea 
Rename IsJoint -> Spacing

Builds on rust-lang#76286 and might conflict with rust-lang#76285

r? @petrochenkov
matklad added a commit to matklad/rust that referenced this pull request Sep 4, 2020
@matklad
Rollup merge of rust-lang#76291 - matklad:spacing, r=petrochenkov
8e70471 
Rename IsJoint -> Spacing

Builds on rust-lang#76286 and might conflict with rust-lang#76285

r? @petrochenkov
matklad added a commit to matklad/rust that referenced this pull request Sep 4, 2020
@matklad
Rollup merge of rust-lang#76291 - matklad:spacing, r=petrochenkov
b1101dc 
Rename IsJoint -> Spacing

Builds on rust-lang#76286 and might conflict with rust-lang#76285

r? @petrochenkov
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Sep 5, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 5, 2020
@bors
Auto merge of rust-lang#76376 - Dylan-DPC:rollup-8chsbw9, r=Dylan-DPC
7d289ae 
Rollup of 11 pull requests

Successful merges:

 - rust-lang#75695 (Add a regression test for issue-72793)
 - rust-lang#75741 (Refactor byteorder to std in rustc_middle)
 - rust-lang#75954 (Unstable Book: add links to tracking issues for FFI features)
 - rust-lang#75994 (`impl Rc::new_cyclic`)
 - rust-lang#76060 (Link vec doc to & reference)
 - rust-lang#76078 (Remove disambiguators from intra doc link text)
 - rust-lang#76082 (Fix intra-doc links on pub re-exports)
 - rust-lang#76254 (Fold length constant in Rvalue::Repeat)
 - rust-lang#76258 (x.py check checks tests/examples/benches)
 - rust-lang#76263 (inliner: Check for codegen fn attributes compatibility)
 - rust-lang#76285 (Move jointness censoring to proc_macro)

Failed merges:

r? @ghost
@bors bors merged commit 85cee57 into rust-lang:master Sep 5, 2020
@rustbot rustbot added this to the 1.48.0 milestone Sep 5, 2020
@dtolnay dtolnay mentioned this pull request Sep 6, 2020
Closed
tmandry added a commit to tmandry/rust that referenced this pull request Sep 10, 2020
@tmandry
Revert "Rollup merge of rust-lang#76285 - matklad:censor-spacing, r=p…
fdff7de 
…etrochenkov"

This reverts commit 85cee57, reversing
changes made to b4d3873.
tmandry added a commit to tmandry/rust that referenced this pull request Sep 10, 2020
@tmandry
Rollup merge of rust-lang#76556 - tmandry:revert-76285, r=tmandry
2fc404f 
Revert rust-lang#76285

Fixes rust-lang#76399. Reverting because the issue is P-critical and there are no PRs up to fix it.

r? @Mark-Simulacrum
cc @matklad @dtolnay
@tmandry tmandry mentioned this pull request Sep 10, 2020
Closed
tmandry added a commit to tmandry/rust that referenced this pull request Sep 10, 2020
@tmandry
Rollup merge of rust-lang#76556 - tmandry:revert-76285, r=tmandry
193503e 
Revert rust-lang#76285

Fixes rust-lang#76399. Reverting because the issue is P-critical and there are no PRs up to fix it.

r? @Mark-Simulacrum
cc @matklad @dtolnay
@tmandry tmandry mentioned this pull request Sep 10, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 10, 2020
@bors
Auto merge of rust-lang#76558 - tmandry:rollup-bskim2r, r=tmandry
a1894e4 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#74787 (Move `rustllvm` into `compiler/rustc_llvm`)
 - rust-lang#76458 (Add drain_filter method to HashMap and HashSet)
 - rust-lang#76472 (rustbuild: don't set PYTHON_EXECUTABLE and WITH_POLLY cmake vars since they are no longer supported by llvm)
 - rust-lang#76497 (Use intra-doc links in `core::ptr`)
 - rust-lang#76500 (Add -Zgraphviz_dark_mode and monospace font fix)
 - rust-lang#76543 (Document btree's unwrap_unchecked)
 - rust-lang#76556 (Revert rust-lang#76285)

Failed merges:

r? `@ghost`
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 10, 2020
@bors
Auto merge of rust-lang#76291 - matklad:spacing, r=petrochenkov
a18b34d 
Rename IsJoint -> Spacing

Builds on rust-lang#76286 and might conflict with rust-lang#76285

r? `@petrochenkov`
@petrochenkov petrochenkov mentioned this pull request Oct 19, 2020
Merged
@petrochenkov petrochenkov mentioned this pull request May 15, 2021
Merged
@petrochenkov petrochenkov mentioned this pull request May 24, 2022
Closed
@petrochenkov petrochenkov mentioned this pull request Jul 29, 2022
Merged
@petrochenkov petrochenkov mentioned this pull request Aug 8, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

Assignees

@petrochenkov petrochenkov

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.48.0
Development

Successfully merging this pull request may close these issues.
5 participants
@matklad @petrochenkov @bors @rust-highfive @rustbot