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

Add Socket::IPAddress#private? #9517

Merged
merged 2 commits into from
Jan 15, 2021
Merged

Conversation

jgillich
Copy link
Contributor

Ported over from the ruby method with the same name.

@jkthorne
Copy link
Contributor

I really like this method ❤️

@straight-shoota straight-shoota added this to the 1.0.0 milestone Nov 21, 2020
Comment on lines 278 to 300

it "does not break when referencing lib type (#9928)" do
program = semantic("lib LibFoo; BAR = 0; end", wants_doc: true).program
generator = Doc::Generator.new(program, [""])

# TODO: There should not be a link to LibFoo::Bar in the first place
# because LibFoo is undocumented
assert_code_link(generator.type(program), "LibFoo::BAR", %(<a href="LibFoo.html#BAR">LibFoo::BAR</a>))
end
Copy link
Contributor

Choose a reason for hiding this comment

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

@straight-shoota Looks like a botched merge.

Copy link
Member

Choose a reason for hiding this comment

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

Oh, that's messed up

Copy link
Member

Choose a reason for hiding this comment

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

Let's throw all that out with a git rebase -i, leaving only the original commit.

Copy link
Member

Choose a reason for hiding this comment

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

Sorry for the mess. I made a hard reset and a clean merge of master.

@bcardiff
Copy link
Member

This needs a rebase / conflict merge before merging. @jgillich if you prefer to hand off this, since it's been a while, please drop a comment.

@jgillich jgillich force-pushed the ipaddr-private branch 2 times, most recently from 5cfd560 to 19892da Compare January 12, 2021 06:31
@jgillich
Copy link
Contributor Author

@bcardiff rebased

@bcardiff bcardiff merged commit b5e6df6 into crystal-lang:master Jan 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants