use field init shorthand in src/librustc/ by zackmdavis · Pull Request #43008 · rust-lang/rust

zackmdavis · 2017-07-01T19:41:18Z

Commentary on #37340 suggested using the new field init syntax in the compiler. Do we care about this? If so, here's a pull request for the librustc/ directory. While rustfmt might do this in the future, in the meantime, some simple Python will do:

#!/usr/bin/env python3importos, re, sysOPPORTUNITY=re.compile(r" (\w+): \1,?\n")
deffield_init_shorthand_substitution(filename):
withopen(filename) asf:
text=f.read()
revised=OPPORTUNITY.sub(r" \1,\n", text)
withopen(filename, 'w') asf:
f.write(revised)
defsubstitute_in_directory(path):
fordirname, _subdirs, basenamesinos.walk(path):
forbasenameinbasenames:
field_init_shorthand_substitution(os.path.join(dirname, basename))
if__name__=="__main__":
substitute_in_directory(sys.argv[1])

Update 3 July: edited the search (respectively replace) regex to (\w+): \1,?\n ( \1,\n) from (\w+): \1, ( \1,)

rust-highfive · 2017-07-01T19:41:28Z

r? @pnkfelix

(rust_highfive has picked a reviewer for you, use r? to override)

zackmdavis · 2017-07-01T19:41:56Z

(haven't built this locally, it being convenient to just let our friend Travis decide if this actually works)

TimNN · 2017-07-01T20:41:39Z

This can also be shortened.

hm, yes, regex should've probably been (\w+): \1,?\n rather than (\w+): \1,

Mark-Simulacrum · 2017-07-02T00:39:37Z

Is there a reason this is limited to just librustc? It seems appropriate to either run this everywhere or nowhere.

zackmdavis · 2017-07-02T16:28:27Z

Is there a reason this is limited to just librustc?

It seemed less "dramatic", and less likely to collide with other PRs? Maybe that's not very compelling.

Mark-Simulacrum · 2017-07-02T18:52:02Z

I'm happy with starting with just librustc and then expanding to others.

zackmdavis · 2017-07-03T18:30:05Z

(Travis passed on the initial submission; I've added a newline to the regex (to catch cases like the one Tim points out), reapplied (on master), and force-pushed.)

PlasmaPower · 2017-07-04T18:56:21Z

Quick shell command to do the same thing as the Python version:

find -type f -print0 | xargs -0 sed -E -i 's/ (\w+): *\1,?$/ \1,/'

If you want to specify a directory, put it right after the find.

estebank · 2017-07-05T23:55:08Z

@bors try

bors · 2017-07-05T23:55:19Z

⌛ Trying commit 83d5fbf with merge 3c86755...

…=<try> use field init shorthand in src/librustc/ Commentary on #37340 [suggested](#37340 (comment)) using the new field init syntax in the compiler. Do we care about this? If so, here's a pull request for the librustc/ directory. While [`rustfmt` might do this in the future](#37340 (comment)), in the meantime, some simple Python will do: ```python #!/usr/bin/env python3 import os, re, sys OPPORTUNITY = re.compile(r" (\w+): \1,?\n") def field_init_shorthand_substitution(filename): with open(filename) as f: text = f.read() revised = OPPORTUNITY.sub(r" \1,\n", text) with open(filename, 'w') as f: f.write(revised) def substitute_in_directory(path): for dirname, _subdirs, basenames in os.walk(path): for basename in basenames: field_init_shorthand_substitution(os.path.join(dirname, basename)) if __name__ == "__main__": substitute_in_directory(sys.argv[1]) ``` **Update 3 July**: edited the search (respectively replace) regex to ` (\w+): \1,?\n` (` \1,\n`) from ` (\w+): \1,` (` \1,`)

bors · 2017-07-06T01:21:26Z

☀️ Test successful - status-travis
State: approved= try=True

estebank · 2017-07-06T01:28:46Z

@bors r+

bors · 2017-07-06T01:28:47Z

📌 Commit 83d5fbf has been approved by estebank

Mark-Simulacrum · 2017-07-06T01:32:42Z

For the record, try builds should not be used except to obtain artifacts for cargobomb -- they don't actually test much more than the standard PR builder (just dist, I think).

estebank · 2017-07-06T04:15:41Z

@Mark-Simulacrum thanks for the clarification! Going forward, should I just r+ and let travis catch any issues then?

alexcrichton · 2017-07-06T05:22:57Z

@bors: retry

alexcrichton · 2017-07-06T05:25:10Z

@bors: retry

bors · 2017-07-06T05:26:00Z

🔒 Merge conflict

The field init shorthand syntax was stabilized in 1.17.0 (aebd94f); we are now free to use it in the compiler.

zackmdavis · 2017-07-06T05:45:12Z

I don't understand why Git seems to think master's deletion of the libcompiler_builtins directory is a merge conflict?

$ git log --oneline | head -1
8cab2c7 Auto merge of #42899 - alexcrichton:compiler-builtins, r=nikomatsakis
zmd@ExpectedReturn:~/Code/rust$ git merge 83d5fbf
Auto-merging src/librustc/session/mod.rs
Auto-merging src/librustc/middle/stability.rs
Auto-merging src/librustc/middle/dead.rs
CONFLICT (file/directory): There is a directory with name src/libcompiler_builtins in 83d5fbf. Adding src/libcompiler_builtins as src/libcompiler_builtins~HEAD
Automatic merge failed; fix conflicts and then commit the result.

Anyway, rebased and force-pushed.

estebank · 2017-07-06T05:58:27Z

@bors r+

bors · 2017-07-06T05:58:28Z

📌 Commit f668999 has been approved by estebank

bors · 2017-07-06T07:49:50Z

⌛ Testing commit f668999 with merge afb853a...

…=estebank use field init shorthand in src/librustc/ Commentary on #37340 [suggested](#37340 (comment)) using the new field init syntax in the compiler. Do we care about this? If so, here's a pull request for the librustc/ directory. While [`rustfmt` might do this in the future](#37340 (comment)), in the meantime, some simple Python will do: ```python #!/usr/bin/env python3 import os, re, sys OPPORTUNITY = re.compile(r" (\w+): \1,?\n") def field_init_shorthand_substitution(filename): with open(filename) as f: text = f.read() revised = OPPORTUNITY.sub(r" \1,\n", text) with open(filename, 'w') as f: f.write(revised) def substitute_in_directory(path): for dirname, _subdirs, basenames in os.walk(path): for basename in basenames: field_init_shorthand_substitution(os.path.join(dirname, basename)) if __name__ == "__main__": substitute_in_directory(sys.argv[1]) ``` **Update 3 July**: edited the search (respectively replace) regex to ` (\w+): \1,?\n` (` \1,\n`) from ` (\w+): \1,` (` \1,`)

bors · 2017-07-06T10:19:47Z

☀️ Test successful - status-appveyor, status-travis
Approved by: estebank
Pushing afb853a to master...

Like rust-lang#43008 (f668999), but _much more aggressive_.

@Mark-Simulacrum

…Mark-Simulacrum use field init shorthand EVERYWHERE Like #43008 (f668999), but [(lacking reasons to be more timid)](#43008 (comment)) _much more aggressive_. r? @Mark-Simulacrum

@Mark-Simulacrum

…Mark-Simulacrum use field init shorthand EVERYWHERE Like #43008 (f668999), but [(lacking reasons to be more timid)](rust-lang/rust#43008 (comment)) _much more aggressive_. r? @Mark-Simulacrum

rust-highfive assigned pnkfelix Jul 1, 2017

TimNN reviewed Jul 1, 2017
View reviewed changes

Mark-Simulacrum added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 2, 2017

zackmdavis force-pushed the field_init_shorthand_in_librustc branch from 377425d to 83d5fbfCompare July 3, 2017 18:28

use field init shorthand in src/librustc
f668999
The field init shorthand syntax was stabilized in 1.17.0 (aebd94f); we are now free to use it in the compiler.

zackmdavis force-pushed the field_init_shorthand_in_librustc branch from 83d5fbf to f668999Compare July 6, 2017 05:45

bors merged commit f668999 into rust-lang:masterJul 6, 2017

This was referenced Jul 6, 2017
Replace the global fulfillment cache with the evaluation cache #42840
Merged
Downgrade ProjectionTy's TraitRef to its substs #42388
Merged

zackmdavis mentioned this pull request Aug 7, 2017
use field init shorthand EVERYWHERE #43710
Merged

zackmdavis added a commit to zackmdavis/rust that referenced this pull request Aug 15, 2017
use field init shorthand EVERYWHERE
1b6c960
Like rust-lang#43008 (f668999), but _much more aggressive_.

zackmdavis deleted the field_init_shorthand_in_librustc branch January 13, 2018 07:43

Uh oh!

Uh oh!

Conversation

zackmdavis commented Jul 1, 2017• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented Jul 1, 2017

Uh oh!

zackmdavis commented Jul 1, 2017

Uh oh!

TimNNJul 1, 2017

Choose a reason for hiding this comment

Uh oh!

zackmdavisJul 1, 2017

Choose a reason for hiding this comment

Uh oh!

Mark-Simulacrum commented Jul 2, 2017

Uh oh!

zackmdavis commented Jul 2, 2017

Uh oh!

Mark-Simulacrum commented Jul 2, 2017

Uh oh!

zackmdavis commented Jul 3, 2017

Uh oh!

PlasmaPower commented Jul 4, 2017

Uh oh!

estebank commented Jul 5, 2017

Uh oh!

bors commented Jul 5, 2017

Uh oh!

bors commented Jul 6, 2017

Uh oh!

estebank commented Jul 6, 2017

Uh oh!

bors commented Jul 6, 2017

Uh oh!

Mark-Simulacrum commented Jul 6, 2017

Uh oh!

estebank commented Jul 6, 2017

Uh oh!

alexcrichton commented Jul 6, 2017

Uh oh!

alexcrichton commented Jul 6, 2017

Uh oh!

bors commented Jul 6, 2017

Uh oh!

zackmdavis commented Jul 6, 2017

Uh oh!

estebank commented Jul 6, 2017

Uh oh!

bors commented Jul 6, 2017

Uh oh!

bors commented Jul 6, 2017

Uh oh!

bors commented Jul 6, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

zackmdavis commented Jul 1, 2017•
edited
Loading