Skip to content

add TCP_* consts for linux - #24611

Merged
bors merged 1 commit into
rust-lang:masterfrom
dovahcrow:doomsplayer-patch-1
Apr 22, 2015
Merged

add TCP_* consts for linux#24611
bors merged 1 commit into
rust-lang:masterfrom
dovahcrow:doomsplayer-patch-1

Conversation

@dovahcrow

@dovahcrowdovahcrow commented Apr 19, 2015

Copy link
Copy Markdown
Contributor

as dependency for #24594

@dovahcrow

dovahcrow commented Apr 19, 2015

Copy link
Copy Markdown
ContributorAuthor

r? @alexcrichton

@rust-highfive

rust-highfive commented Apr 19, 2015

Copy link
Copy Markdown
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nikomatsakis (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. The way Github handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see CONTRIBUTING.md for more information.

@alexcrichton

alexcrichton commented Apr 20, 2015

Copy link
Copy Markdown
Member

Looks like this needs a rebase but otherwise r=me, thanks!

@dovahcrow

dovahcrow commented Apr 21, 2015

Copy link
Copy Markdown
ContributorAuthor

rebased.

On 2015年4月21日周二 上午12:09 Alex Crichton notifications@github.com wrote:

Looks like this needs a rebase but otherwise r=me, thanks!

—
Reply to this email directly or view it on GitHub
#24611 (comment).

@alexcrichton

alexcrichton commented Apr 21, 2015

Copy link
Copy Markdown
Member

Looks like there's a tidy error unfortunately :(

@dovahcrow

dovahcrow commented Apr 21, 2015

Copy link
Copy Markdown
ContributorAuthor

It's ok for merging now, eventually.

@alexcrichton

alexcrichton commented Apr 21, 2015

Copy link
Copy Markdown
Member

@bors: r+ 7a0df61

@bors

bors commented Apr 21, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 7a0df61 with merge 8ce245d...

@bors

bors commented Apr 21, 2015

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-mac-32-opt

@alexcrichton

alexcrichton commented Apr 21, 2015

Copy link
Copy Markdown
Member

@bors: retry
On Tue, Apr 21, 2015 at 12:48 PM bors notifications@github.com wrote:

[image: 💔] Test failed - auto-mac-32-opt
http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/4633

—
Reply to this email directly or view it on GitHub
#24611 (comment).

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Apr 21, 2015
@alexcrichton
rollup merge ofrust-lang#24611: doomsplayer/doomsplayer-patch-1
6b1ce49
as dependency for rust-lang#24594
@bors
bors merged commit 7a0df61 into rust-lang:masterApr 22, 2015
steveklabnik pushed a commit to steveklabnik/rust that referenced this pull request May 7, 2015
@kevinmehall
Add TCP_* constants for mips/mipsel Linux
6c6b200
PR rust-lang#24611 added these for other architectures, but missed
the `#[cfg(any(target_arch = "mips", target_arch = "mipsel"))]`
version of the module. The values are the same.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichtonalexcrichton

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@dovahcrow@rust-highfive@alexcrichton@bors@nikomatsakis