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.

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

use field init shorthand EVERYWHERE #43710

Merged
merged 1 commit into from
Aug 16, 2017

Conversation

zackmdavis
Copy link
Member

Like #43008 (f668999), but (lacking reasons to be more timid) much more aggressive.

r? @Mark-Simulacrum

Copy link
Member

@kennytm kennytm left a comment

Choose a reason for hiding this comment

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

338 files changed? Good luck dealing with merge conflicts.

Could you leave the test cases alone from the refactoring?

@@ -40,7 +40,7 @@ fn main() {

{
struct Bar {
x: x,
x,
Copy link
Member

Choose a reason for hiding this comment

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

Revert this, it is causing an unexpected error.

[00:44:05] ---- [compile-fail] compile-fail/lint-shorthand-field.rs stdout ----
[00:44:05] 	
[00:44:05] error: /checkout/src/test/compile-fail/lint-shorthand-field.rs:43: unexpected "error": '43:14: 43:15: expected `:`, found `,`'
[00:44:05] 
[00:44:05] error: /checkout/src/test/compile-fail/lint-shorthand-field.rs:48: unexpected "error": '48:16: 48:19: cannot find struct, variant or union type `Bar` in this scope [E0422]'
[00:44:05] 
[00:44:05] error: /checkout/src/test/compile-fail/lint-shorthand-field.rs:48: unexpected "error": '48:25: 48:26: cannot find value `x` in this scope [E0425]'
[00:44:05] 
[00:44:05] error: /checkout/src/test/compile-fail/lint-shorthand-field.rs:49: unexpected "error": '49:13: 49:16: cannot find struct, variant or union type `Bar` in this scope [E0422]'
[00:44:05] 
[00:44:05] error: /checkout/src/test/compile-fail/lint-shorthand-field.rs:22: expected error not found: the `x:` in this pattern is redundant
[00:44:05] 
[00:44:05] error: /checkout/src/test/compile-fail/lint-shorthand-field.rs:23: expected error not found: the `y:` in this pattern is redundant
[00:44:05] 
[00:44:05] error: 4 unexpected errors found, 2 expected errors not found
[00:44:05] status: exit code: 101

@@ -11,7 +11,7 @@
// Test that we can do shifts by any integral type.

struct Panolpy {
char: char,
char,
Copy link
Member

Choose a reason for hiding this comment

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

Same.

[00:44:05] ---- [compile-fail] compile-fail/shift-various-bad-types.rs stdout ----
[00:44:05] 	
[00:44:05] error: /checkout/src/test/compile-fail/shift-various-bad-types.rs:14: unexpected "error": '14:9: 14:10: expected `:`, found `,`'
[00:44:05] 
[00:44:05] error: /checkout/src/test/compile-fail/shift-various-bad-types.rs:19: expected error not found: E0277
[00:44:05] 
[00:44:05] error: /checkout/src/test/compile-fail/shift-various-bad-types.rs:22: expected error not found: E0277
[00:44:05] 
[00:44:05] error: /checkout/src/test/compile-fail/shift-various-bad-types.rs:25: expected error not found: E0277
[00:44:05] 
[00:44:05] error: /checkout/src/test/compile-fail/shift-various-bad-types.rs:35: expected error not found: mismatched types
[00:44:05] 
[00:44:05] error: /checkout/src/test/compile-fail/shift-various-bad-types.rs:35: expected message not found: expected i32, found i64
[00:44:05] 
[00:44:05] error: 1 unexpected errors found, 5 expected errors not found

@zackmdavis zackmdavis force-pushed the field_init_shorthand_power_slam branch from f0fd454 to ab2912d Compare August 7, 2017 21:33
@zackmdavis
Copy link
Member Author

Good luck dealing with merge conflicts.

Thanks! (I'm going to need it ...)

(force-push should be better, omits changes to tests)

@Mark-Simulacrum
Copy link
Member

Not opposed myself, but I feel like a change of this magnitude (and probably the other PR, too, but it's fine to wait now) should maybe receive at least some attention from @rust-lang/compiler and @rust-lang/libs -- if they're fine with it, I think I am too. Haven't done a careful review yet though.

@arielb1 arielb1 added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 8, 2017
@aturon
Copy link
Member

aturon commented Aug 8, 2017

I'm OK with this.

@bors
Copy link
Contributor

bors commented Aug 10, 2017

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

@zackmdavis zackmdavis force-pushed the field_init_shorthand_power_slam branch from ab2912d to 3dce848 Compare August 13, 2017 21:36
@zackmdavis
Copy link
Member Author

zackmdavis commented Aug 13, 2017

(rebased)

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 14, 2017

📌 Commit 3dce848 has been approved by Mark-Simulacrum

@Mark-Simulacrum Mark-Simulacrum 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 Aug 14, 2017
@bors
Copy link
Contributor

bors commented Aug 14, 2017

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

@bors
Copy link
Contributor

bors commented Aug 15, 2017

🔒 Merge conflict

@arielb1 arielb1 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 15, 2017
@arielb1
Copy link
Contributor

arielb1 commented Aug 15, 2017

@bors p=10000

Please don't roll this up - it won't work

@bors
Copy link
Contributor

bors commented Aug 15, 2017

🛑 Priority higher than @9001 is ignored.

@arielb1
Copy link
Contributor

arielb1 commented Aug 15, 2017

@bors p=1000

@9001
Copy link

9001 commented Aug 15, 2017 via email

@bors
Copy link
Contributor

bors commented Aug 15, 2017

@9001: 🔑 Insufficient privileges: and not in try users

Like rust-lang#43008 (f668999), but _much more aggressive_.
@zackmdavis zackmdavis force-pushed the field_init_shorthand_power_slam branch from 3dce848 to 1b6c960 Compare August 15, 2017 22:30
@zackmdavis
Copy link
Member Author

(updated)

@Mark-Simulacrum
Copy link
Member

@bors r+ p=100

@bors
Copy link
Contributor

bors commented Aug 16, 2017

📌 Commit 1b6c960 has been approved by Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Aug 16, 2017

⌛ Testing commit 1b6c960 with merge 6f4ab94...

bors added a commit that referenced this pull request Aug 16, 2017
…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
@bors
Copy link
Contributor

bors commented Aug 16, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing 6f4ab94 to master...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants