Skip to content

Rolling up PRs in the queue #23654

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
merged 131 commits into from
Mar 24, 2015
Merged
Changes from 1 commit
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
9c906da
std: Fix create_dir_all for empty paths
alexcrichton Mar 15, 2015
a7f00cb
Fix a bug in inline assembly codegen where host clobbers were always …
woehr Mar 18, 2015
b92fee9
Remove unnecessary vector creation.
woehr Mar 18, 2015
959a0e6
std: Stabilize marker::MarkerTrait
alexcrichton Mar 18, 2015
f945190
rustc: Remove some long deprecated features:
alexcrichton Mar 18, 2015
6f693e9
Stabilize Entry types
aturon Mar 19, 2015
a848ce4
Adding sys/socket.h constants for iOS/Mac, particularly for SO_SOCKET…
drewcrawford Mar 15, 2015
6f09dfc
Socket options constants for *BSD/Linux/Windows
vhbit Mar 19, 2015
6a5148b
Introduce rsplit
shepmaster Mar 14, 2015
c6ca220
StrExt::splitn should not require a DoubleEndedSearcher
shepmaster Mar 15, 2015
19fef72
Added panic-on-overflow for rhs of left and right shift expressions.
pnkfelix Mar 19, 2015
61ff823
Test suite for overflowing shift operators.
pnkfelix Mar 19, 2015
9ae144f
Add default impls for Send/Sync
flaper87 Mar 9, 2015
01d2429
Feature gate defaulted traits
flaper87 Mar 11, 2015
38dbcb2
Check trait unsafety for defaulted traits
flaper87 Mar 11, 2015
04d5772
fix fallout
flaper87 Mar 20, 2015
0c040b0
guide: minor copy edits
ches Mar 2, 2015
92294e7
guide: Improvements to language covering enums
ches Mar 2, 2015
c175b35
fix the attributes sytax
FuGangqiang Mar 21, 2015
bc9d9f2
add lifetime for `while` and `for` expression
FuGangqiang Mar 21, 2015
5e47c66
workaround bugs in pretty-printer so that we can pass check-stage2-pr…
pnkfelix Mar 21, 2015
e24fe5b
std: Remove deprecated ptr functions
alexcrichton Mar 19, 2015
1381249
implement `Clone` for `btree` iterators
apasel422 Mar 22, 2015
90c8592
Refine Cursor docstring
nagisa Mar 22, 2015
cfe7a8d
Reduce code bloat in closure
dotdash Mar 22, 2015
5321d22
Remove bad reference to std::io
steveklabnik Mar 22, 2015
fbc823d
Document how to document macros
steveklabnik Mar 22, 2015
29aca83
Remove an unsafe function definition in __thread_local_inner.
Ms2ger Mar 21, 2015
81801f2
Re-word explanation on closures in intro
steveklabnik Mar 22, 2015
8a500de
book: some Crates and Modules nits
tshepang Mar 14, 2015
4dfec6c
placate check-pretty and pretty-printer bug; see also issue 23623.
pnkfelix Mar 22, 2015
0090e01
Get __pthread_get_minstack at runtime with dlsym
andersk Mar 23, 2015
b6641c1
min_stack_size: update non-Linux implementation comment
andersk Mar 23, 2015
737bb30
min_stack_size: clarify both reasons to use dlsym
andersk Mar 23, 2015
50ea6f6
Remove incorrect subtyping for `&mut Trait` and introduce coercion
nikomatsakis Mar 19, 2015
45fae88
When matching against a pattern (either via `match` or `let`) that
nikomatsakis Mar 6, 2015
d944689
Fix dead link for std::sync::mpsc.
WiSaGaN Mar 23, 2015
64532f7
implement `Clone` for various iterators
apasel422 Mar 23, 2015
7934d52
implement `ExactSizeIterator` for `linked_list::IntoIter`
apasel422 Mar 23, 2015
88edf97
document iteration order for `vec_deque::IntoIter`
apasel422 Mar 23, 2015
bb9d210
Fix shift-overflow in very old run-pass test.
pnkfelix Mar 23, 2015
2750e3c
Add note about pointer state after the call.
steveklabnik Mar 20, 2015
d6fb7e9
derive missing trait implementations for cursor
mahkoh Mar 22, 2015
2625bf9
Fix regression in -C rpath that causes failures with symlinks
brson Mar 10, 2015
9ec9bc6
Clarify behavior of Path::relative_from
brson Mar 11, 2015
a5e1cbe
Beef up BufRead::consume documentation.
steveklabnik Mar 22, 2015
d52c362
Clarify that slices don't just point to arrays
steveklabnik Mar 23, 2015
d29d554
prctl instead of pthread on linux for name setup
nagisa Mar 23, 2015
9231ceb
Stabilize the Error trait
aturon Mar 19, 2015
6bd3ab0
Implement RFC 909: move thread_local into thread
aturon Mar 20, 2015
05c9728
Don't conflate regions and affine types
steveklabnik Mar 23, 2015
1be8fcb
Make note of str in 'more strings' chapter
steveklabnik Mar 23, 2015
bc1dde4
Compiler and trait changes to make indexing by value.
nikomatsakis Mar 21, 2015
b4d4daf
Adjust Index/IndexMut impls. For generic collections, we take
nikomatsakis Mar 21, 2015
8e58af4
Fallout in stdlib, rustdoc, rustc, etc. For most maps, converted uses of
nikomatsakis Mar 22, 2015
57cf2de
Update borrowck tests to test that index is by-move now
nikomatsakis Mar 22, 2015
2df8830
rustdoc: Support for "array" primitive
tomjakubowski Mar 23, 2015
4a81e66
Rollup merge of #22954 - ches:docs, r=steveklabnik
steveklabnik Mar 23, 2015
f788159
Rollup merge of #23119 - nikomatsakis:issue-23116-ref-mut, r=pnkfelix
steveklabnik Mar 23, 2015
84f760b
Rollup merge of #23509 - aturon:stab-entry, r=Gankro
steveklabnik Mar 23, 2015
61e6904
Rollup merge of #23561 - steveklabnik:gh23422, r=alexcrichton
steveklabnik Mar 23, 2015
73b30db
Rollup merge of #23590 - FuGangqiang:attr, r=alexcrichton
steveklabnik Mar 23, 2015
9299446
Rollup merge of #23607 - mahkoh:cursor, r=alexcrichton
steveklabnik Mar 23, 2015
8b6c0fd
Rollup merge of #23608 - nagisa:refine-cursor-docstring, r=steveklabnik
steveklabnik Mar 23, 2015
71b9ba1
Rollup merge of #23618 - steveklabnik:gh23571, r=alexcrichton
steveklabnik Mar 23, 2015
1c25aec
Rollup merge of #23622 - steveklabnik:gh23196, r=alexcrichton
steveklabnik Mar 23, 2015
68af512
Rollup merge of #23639 - steveklabnik:gh21305, r=alexcrichton
steveklabnik Mar 23, 2015
6a5b1e9
Rollup merge of #23641 - steveklabnik:gh23632, r=alexcrichton
steveklabnik Mar 23, 2015
1aa75ce
configure: Fix detection of 32-bit Linux userspace
brson Mar 23, 2015
3d365f6
rustdoc: interpret all leading feature attributes in examples as crat…
brson Mar 12, 2015
7770ea7
rustdoc: Add #[doc(test(no_inject_crate))] attribute
brson Mar 16, 2015
df290f1
Require feature attributes, and add them where necessary
brson Mar 6, 2015
e901910
Add #![feature] attributes to doctests
brson Mar 13, 2015
8c93a79
rustdoc: Replace no-pretty-expanded with pretty-expanded
brson Mar 22, 2015
8389253
Add generic conversion traits
aturon Mar 18, 2015
d97d538
std: Stabilize the `Hasher::finish` method
alexcrichton Mar 23, 2015
8bd8466
Refactor how we handle overflow so that it is a fatal error that aborts
nikomatsakis Mar 20, 2015
76ead08
Remove auto-deref'ing Pattern impl because it conflicts with other
nikomatsakis Mar 21, 2015
d6054e4
rollup merge of #22954: ches/docs
alexcrichton Mar 23, 2015
ad41e7c
rollup merge of #23119: nikomatsakis/issue-23116-ref-mut
alexcrichton Mar 23, 2015
ec1a85a
rollup merge of #23211: FlaPer87/oibit-send-and-friends
alexcrichton Mar 23, 2015
67e516c
rollup merge of #23269: shepmaster/split-not-double-ended
alexcrichton Mar 23, 2015
e98d4d9
rollup merge of #23283: brson/rpathfix
alexcrichton Mar 23, 2015
d3fbc14
rollup merge of #23401: tshepang/crates-and-modules-doc-nits
alexcrichton Mar 23, 2015
4f74376
rollup merge of #23466: woehr/master
alexcrichton Mar 23, 2015
0678f0b
rollup merge of #23515: nikomatsakis/issue-14985-trait-subtyping
alexcrichton Mar 23, 2015
68cf9e0
rollup merge of #23517: vhbit/ext-socket-options
alexcrichton Mar 23, 2015
c77af69
rollup merge of #23536: pnkfelix/arith-oflo-shifts
alexcrichton Mar 23, 2015
fd13400
rollup merge of #23538: aturon/conversion
alexcrichton Mar 23, 2015
b97e1cc
rollup merge of #23541: aturon/stab-error
alexcrichton Mar 23, 2015
2153c58
rollup merge of #23557: aturon/rfc-909
alexcrichton Mar 23, 2015
88ae218
rollup merge of #23561: steveklabnik/gh23422
alexcrichton Mar 23, 2015
9e347b3
rollup merge of #23579: Ms2ger/thread_local-unsafe
alexcrichton Mar 23, 2015
bed7740
rollup merge of #23580: nikomatsakis/pattern-and-overflow
alexcrichton Mar 23, 2015
388e5ae
rollup merge of #23590: FuGangqiang/attr
alexcrichton Mar 23, 2015
753efb5
rollup merge of #23601: nikomatsakis/by-value-index
alexcrichton Mar 23, 2015
68fb3ac
rollup merge of #23604: apasel422/btree
alexcrichton Mar 23, 2015
71c705d
rollup merge of #23607: mahkoh/cursor
alexcrichton Mar 23, 2015
c999707
rollup merge of #23608: nagisa/refine-cursor-docstring
alexcrichton Mar 23, 2015
010895e
rollup merge of #23612: dotdash/closure_bloat
alexcrichton Mar 23, 2015
5a6a905
rollup merge of #23615: steveklabnik/gh23540
alexcrichton Mar 23, 2015
a78eb53
rollup merge of #23618: steveklabnik/gh23571
alexcrichton Mar 23, 2015
b03939b
rollup merge of #23619: steveklabnik/gh23220
alexcrichton Mar 23, 2015
ef07e07
rollup merge of #23622: steveklabnik/gh23196
alexcrichton Mar 23, 2015
28fcdc0
rollup merge of #23631: andersk/minstack-dlsym
alexcrichton Mar 23, 2015
19510ac
rollup merge of #23633: tomjakubowski/rustdoc-array-prim
alexcrichton Mar 23, 2015
c7509bb
rollup merge of #23634: WiSaGaN/bugfix/fix_dead_link
alexcrichton Mar 23, 2015
ca7f7cf
rollup merge of #23637: apasel422/iter
alexcrichton Mar 23, 2015
5e06ebb
rollup merge of #23639: steveklabnik/gh21305
alexcrichton Mar 23, 2015
8a15868
rollup merge of #23640: nagisa/thread-less-weak
alexcrichton Mar 23, 2015
fcf2ba7
rollup merge of #23641: steveklabnik/gh23632
alexcrichton Mar 23, 2015
7101ff4
rollup merge of #23648: steveklabnik/rollup
alexcrichton Mar 23, 2015
d8b0628
rollup merge of #23650: brson/32-bit-userspace
alexcrichton Mar 23, 2015
c608084
rollup merge of #23598: brson/gate
alexcrichton Mar 23, 2015
7d07f70
rollup merge of #23383: alexcrichton/fs-create-dir-all
alexcrichton Mar 23, 2015
04e667a
Test fixes and rebase conflicts, round 1
alexcrichton Mar 23, 2015
6e0f1d3
rollup merge of #23484: alexcrichton/marker-trait-stable
alexcrichton Mar 23, 2015
aea8226
rollup merge of #23503: alexcrichton/fix-ptr-docs
alexcrichton Mar 23, 2015
3112716
rollup merge of #23506: alexcrichton/remove-some-deprecated-things
alexcrichton Mar 23, 2015
28a0b25
Auto merge of #23536 - pnkfelix:arith-oflo-shifts, r=nikomatsakis
bors Mar 23, 2015
248b2ec
Stabilize Entry types
aturon Mar 19, 2015
3f52d71
Update docs for ptr module.
mbrubeck Mar 23, 2015
29b5438
Test fixes and rebase conflicts, round 2
alexcrichton Mar 23, 2015
690ee16
rollup merge of #23509: aturon/stab-entry
alexcrichton Mar 24, 2015
6a44f24
rollup merge of #23644: mbrubeck/doc-edit
alexcrichton Mar 24, 2015
7380b6f
rollup merge of #23645: steveklabnik/gh23642
alexcrichton Mar 24, 2015
1588cac
rollup merge of #23652: alexcrichton/stabilize-hasher-finish
alexcrichton Mar 24, 2015
253992e
rollup merge of #23653: dhuseby/bitrig-stage0-c64d671
alexcrichton Mar 24, 2015
c5c3de0
Test fixes and rebase conflicts, round 3
alexcrichton Mar 24, 2015
a7e2049
Merge remote-tracking branch 'origin/master' into rollup
alexcrichton Mar 24, 2015
d252d0a
Test fixes and rebase conflicts, round 4
alexcrichton Mar 24, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Socket options constants for *BSD/Linux/Windows
  • Loading branch information
vhbit committed Mar 19, 2015
commit 6f09dfc23a330b2992b6ee16fe36433944f8e95c
103 changes: 91 additions & 12 deletions src/liblibc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2495,10 +2495,24 @@ pub mod consts {

pub const TCP_NODELAY: c_int = 0x0001;
pub const SOL_SOCKET: c_int = 0xffff;
pub const SO_KEEPALIVE: c_int = 8;
pub const SO_BROADCAST: c_int = 32;
pub const SO_REUSEADDR: c_int = 4;

pub const SO_DEBUG: c_int = 0x0001;
pub const SO_ACCEPTCONN: c_int = 0x0002;
pub const SO_REUSEADDR: c_int = 0x0004;
pub const SO_KEEPALIVE: c_int = 0x0008;
pub const SO_DONTROUTE: c_int = 0x0010;
pub const SO_BROADCAST: c_int = 0x0020;
pub const SO_USELOOPBACK: c_int = 0x0040;
pub const SO_LINGER: c_int = 0x0080;
pub const SO_OOBINLINE: c_int = 0x0100;
pub const SO_SNDBUF: c_int = 0x1001;
pub const SO_RCVBUF: c_int = 0x1002;
pub const SO_SNDLOWAT: c_int = 0x1003;
pub const SO_RCVLOWAT: c_int = 0x1004;
pub const SO_SNDTIMEO: c_int = 0x1005;
pub const SO_RCVTIMEO: c_int = 0x1006;
pub const SO_ERROR: c_int = 0x1007;
pub const SO_TYPE: c_int = 0x1008;

pub const IFF_LOOPBACK: c_int = 4;

Expand Down Expand Up @@ -3441,10 +3455,24 @@ pub mod consts {

pub const TCP_NODELAY: c_int = 1;
pub const SOL_SOCKET: c_int = 1;
pub const SO_KEEPALIVE: c_int = 9;
pub const SO_BROADCAST: c_int = 6;

pub const SO_DEBUG: c_int = 1;
pub const SO_REUSEADDR: c_int = 2;
pub const SO_TYPE: c_int = 3;
pub const SO_ERROR: c_int = 4;
pub const SO_DONTROUTE: c_int = 5;
pub const SO_BROADCAST: c_int = 6;
pub const SO_SNDBUF: c_int = 7;
pub const SO_RCVBUF: c_int = 8;
pub const SO_KEEPALIVE: c_int = 9;
pub const SO_OOBINLINE: c_int = 10;
pub const SO_LINGER: c_int = 13;
pub const SO_REUSEPORT: c_int = 15;
pub const SO_RCVLOWAT: c_int = 18;
pub const SO_SNDLOWAT: c_int = 19;
pub const SO_RCVTIMEO: c_int = 20;
pub const SO_SNDTIMEO: c_int = 21;
pub const SO_ACCEPTCONN: c_int = 30;

pub const SHUT_RD: c_int = 0;
pub const SHUT_WR: c_int = 1;
Expand Down Expand Up @@ -3487,10 +3515,24 @@ pub mod consts {

pub const TCP_NODELAY: c_int = 1;
pub const SOL_SOCKET: c_int = 65535;
pub const SO_KEEPALIVE: c_int = 8;
pub const SO_BROADCAST: c_int = 32;
pub const SO_REUSEADDR: c_int = 4;
pub const SO_ERROR: c_int = 4103;

pub const SO_DEBUG: c_int = 0x0001;
pub const SO_REUSEADDR: c_int = 0x0004;
pub const SO_KEEPALIVE: c_int = 0x0008;
pub const SO_DONTROUTE: c_int = 0x0010;
pub const SO_BROADCAST: c_int = 0x0020;
pub const SO_LINGER: c_int = 0x0080;
pub const SO_OOBINLINE: c_int = 0x100;
pub const SO_REUSEPORT: c_int = 0x0200;
pub const SO_SNDBUF: c_int = 0x1001;
pub const SO_RCVBUF: c_int = 0x1002;
pub const SO_SNDLOWAT: c_int = 0x1003;
pub const SO_RCVLOWAT: c_int = 0x1004;
pub const SO_SNDTIMEO: c_int = 0x1005;
pub const SO_RCVTIMEO: c_int = 0x1006;
pub const SO_ERROR: c_int = 0x1007;
pub const SO_TYPE: c_int = 0x1008;
pub const SO_ACCEPTCONN: c_int = 0x1009;

pub const SHUT_RD: c_int = 0;
pub const SHUT_WR: c_int = 1;
Expand Down Expand Up @@ -4002,10 +4044,24 @@ pub mod consts {
pub const TCP_NODELAY: c_int = 1;
pub const TCP_KEEPIDLE: c_int = 256;
pub const SOL_SOCKET: c_int = 0xffff;
pub const SO_DEBUG: c_int = 0x01;
pub const SO_ACCEPTCONN: c_int = 0x0002;
pub const SO_REUSEADDR: c_int = 0x0004;
pub const SO_KEEPALIVE: c_int = 0x0008;
pub const SO_DONTROUTE: c_int = 0x0010;
pub const SO_BROADCAST: c_int = 0x0020;
pub const SO_REUSEADDR: c_int = 0x0004;
pub const SO_USELOOPBACK: c_int = 0x0040;
pub const SO_LINGER: c_int = 0x0080;
pub const SO_OOBINLINE: c_int = 0x0100;
pub const SO_REUSEPORT: c_int = 0x0200;
pub const SO_SNDBUF: c_int = 0x1001;
pub const SO_RCVBUF: c_int = 0x1002;
pub const SO_SNDLOWAT: c_int = 0x1003;
pub const SO_RCVLOWAT: c_int = 0x1004;
pub const SO_SNDTIMEO: c_int = 0x1005;
pub const SO_RCVTIMEO: c_int = 0x1006;
pub const SO_ERROR: c_int = 0x1007;
pub const SO_TYPE: c_int = 0x1008;

pub const IFF_LOOPBACK: c_int = 0x8;

Expand Down Expand Up @@ -4403,10 +4459,24 @@ pub mod consts {

pub const TCP_NODELAY: c_int = 0x01;
pub const SOL_SOCKET: c_int = 0xffff;
pub const SO_DEBUG: c_int = 0x01;
pub const SO_ACCEPTCONN: c_int = 0x0002;
pub const SO_REUSEADDR: c_int = 0x0004;
pub const SO_KEEPALIVE: c_int = 0x0008;
pub const SO_DONTROUTE: c_int = 0x0010;
pub const SO_BROADCAST: c_int = 0x0020;
pub const SO_REUSEADDR: c_int = 0x0004;
pub const SO_USELOOPBACK: c_int = 0x0040;
pub const SO_LINGER: c_int = 0x0080;
pub const SO_OOBINLINE: c_int = 0x0100;
pub const SO_REUSEPORT: c_int = 0x0200;
pub const SO_SNDBUF: c_int = 0x1001;
pub const SO_RCVBUF: c_int = 0x1002;
pub const SO_SNDLOWAT: c_int = 0x1003;
pub const SO_RCVLOWAT: c_int = 0x1004;
pub const SO_SNDTIMEO: c_int = 0x1005;
pub const SO_RCVTIMEO: c_int = 0x1006;
pub const SO_ERROR: c_int = 0x1007;
pub const SO_TYPE: c_int = 0x1008;

pub const IFF_LOOPBACK: c_int = 0x8;

Expand Down Expand Up @@ -4820,7 +4890,7 @@ pub mod consts {
pub const TCP_NODELAY: c_int = 0x01;
pub const TCP_KEEPALIVE: c_int = 0x10;
pub const SOL_SOCKET: c_int = 0xffff;

pub const SO_DEBUG: c_int = 0x01;
pub const SO_ACCEPTCONN: c_int = 0x0002;
pub const SO_REUSEADDR: c_int = 0x0004;
Expand Down Expand Up @@ -4864,6 +4934,15 @@ pub mod consts {
pub const MAP_STACK : c_int = 0;

pub const IPPROTO_RAW : c_int = 255;

pub const SO_NREAD: c_int = 0x1020;
pub const SO_NKE: c_int = 0x1021;
pub const SO_NOSIGPIPE: c_int = 0x1022;
pub const SO_NOADDRERR: c_int = 0x1023;
pub const SO_NWRITE: c_int = 0x1024;
pub const SO_DONTTRUNC: c_int = 0x2000;
pub const SO_WANTMORE: c_int = 0x4000;
pub const SO_WANTOOBFLAG: c_int = 0x8000;
}
pub mod sysconf {
use types::os::arch::c95::c_int;
Expand Down