Skip to content

Make objc-related expectations compile #1026

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

Merged

Conversation

alexeyzab
Copy link
Contributor

@alexeyzab alexeyzab commented Sep 23, 2017

Fixes #1004.

After looking at how msg_send! is supposed to be used, I realized that
we were erroneously passing type signatures to it.

The expectations compile now, but some of them are not formatted properly.
My guess is that rustfmt does not know how to format the following:

msg_send!(obj, arg1:1 arg2:2 arg3:3)

Notice the lack of separatros between the args.

Any advice on how to proceed here is appreciated.

r? @fitzgen

WIP, fixes rust-lang#1004.

After looking at how `msg_send!` is supposed to be used, I realized that
we were erroneously passing type signatures to it.

The expectations compile now, but some of them are not formatted properly.
My guess is that `rustfmt` does not know how to format the following:

```
msg_send!(obj, arg1:1 arg2:2 arg3:3)
```

Notice the lack of separatros between `arg`s.
Copy link
Member

@fitzgen fitzgen left a comment

Choose a reason for hiding this comment

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

👍

@fitzgen
Copy link
Member

fitzgen commented Sep 25, 2017

The expectations compile now, but some of them are not formatted properly.
My guess is that rustfmt does not know how to format the following:

This isn't the biggest issue in the worldh; there are places where rustfmt fails to nicely format assert_eq! macros in layout tests too.

That said, we could manually insert newlines after each name: arg pair and it might handle it a little bettter.

I'm going to go ahead and merge this PR as it is now, and leave exploring newlines for a follow up, since this gets the tests passing on macOS again, which is pretty important.

Thanks!

@bors-servo r+

@bors-servo
Copy link

📌 Commit ca0aa04 has been approved by fitzgen

@bors-servo
Copy link

⌛ Testing commit ca0aa04 with merge 053fb1d...

bors-servo pushed a commit that referenced this pull request Sep 25, 2017
…itzgen

Make objc-related expectations compile

Fixes #1004.

After looking at how `msg_send!` is supposed to be used, I realized that
we were erroneously passing type signatures to it.

The expectations compile now, but some of them are not formatted properly.
My guess is that `rustfmt` does not know how to format the following:

```
msg_send!(obj, arg1:1 arg2:2 arg3:3)
```

Notice the lack of separatros between the `arg`s.

Any advice on how to proceed here is appreciated.

r? @fitzgen
@bors-servo
Copy link

☀️ Test successful - status-travis
Approved by: fitzgen
Pushing 053fb1d to master...

@bors-servo bors-servo merged commit ca0aa04 into rust-lang:master Sep 25, 2017
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