Rollup of 8 pull requests#47572
Closed
GuillaumeGomez wants to merge 26 commits intorust-lang:masterfrom
Closed
Conversation
Member
GuillaumeGomez
commented
Jan 19, 2018
GuillaumeGomez
commented
- Successful merges: add kbd style tag to main.css in rustdoc #46938, Only link res_init() on GNU/*nix #47334, Fix off-by-one spans in MIR borrowck errors #47420, add Rust By Example to the bookshelf #47508, Deprecate std::net::lookup_host #47510, Add E0659 for ambiguous names #47512, add target/ to ignored tidy dirs #47535, Fix the "Github - About Pull Requests" link in CONTRIBUTING.md #47559
- Failed merges:
removed styling of dt tages, which would make them look like keys and added <kbd> tag inside of dt tag. Added css style for kbd and removed some stylings for dt
To workaround a bug in glibc <= 2.26 lookup_host() calls res_init() based on the glibc version detected at runtime. While this avoids calling res_init() on platforms where it's not required we will still end up linking against the symbol. This causes an issue on macOS where res_init() is implemented in a separate library (libresolv.9.dylib) from the main libc. While this is harmless for standalone programs it becomes a problem if Rust code is statically linked against another program. If the linked program doesn't already specify -lresolv it will cause the link to fail. This is captured in issue rust-lang#46797 Fix this by hooking in to the glibc workaround in `cvt_gai` and only activating it for the "gnu" environment on Unix This should include all glibc platforms while excluding musl, windows-gnu, macOS, FreeBSD, etc. This has the side benefit of removing the #[cfg] in sys_common; only unix.rs has code related to the workaround now.
…more performant variant.
We intended to do this quite a while ago but it snuck through.
…laumeGomez add kbd style tag to main.css in rustdoc Added css style for kbd tags so they actually look like keys. Result preview and discussion was going on in rust-lang#46900 .
…nix, r=alexcrichton Only link res_init() on GNU/*nix To workaround a bug in glibc <= 2.26 lookup_host() calls res_init() based on the glibc version detected at runtime. While this avoids calling res_init() on platforms where it's not required we will still end up linking against the symbol. This causes an issue on macOS where res_init() is implemented in a separate library (libresolv.9.dylib) from the main libc. While this is harmless for standalone programs it becomes a problem if Rust code is statically linked against another program. If the linked program doesn't already specify -lresolv it will cause the link to fail. This is captured in issue rust-lang#46797 Fix this by hooking in to the glibc workaround in `cvt_gai` and only activating it for the "gnu" environment on Unix This should include all glibc platforms while excluding musl, windows-gnu, macOS, FreeBSD, etc. This has the side benefit of removing the #[cfg] in sys_common; only unix.rs has code related to the workaround now. Before this commit: ```shell > cat main.rs use std::net::ToSocketAddrs; #[no_mangle] pub extern "C" fn resolve_test() -> () { let addr_list = ("google.com.au", 0).to_socket_addrs().unwrap(); println!("{:?}", addr_list); } > rustc --crate-type=staticlib main.rs > clang libmain.a test.c -o combined Undefined symbols for architecture x86_64: "_res_9_init", referenced from: std::net::lookup_host::h93c17fe9ad38464a in libmain.a(std-826c8d3b356e180c.std0.rcgu.o) ld: symbol(s) not found for architecture x86_64 clang-5.0: error: linker command failed with exit code 1 (use -v to see invocation) ``` Afterwards: ```shell > rustc --crate-type=staticlib main.rs > clang libmain.a test.c -o combined > ./combined IntoIter([V4(172.217.25.131:0)]) ``` Fixes rust-lang#46797
Fix off-by-one spans in MIR borrowck errors Fixes rust-lang#46885. r? @nikomatsakis
…eveklabnik add Rust By Example to the bookshelf cc rust-lang#46194 With rust-lang#46196 freshly merged, we should add a link to the main docs distribution so people can find it! We discussed this at the docs team meeting today and decided to go ahead with adding it to the bookshelf.
Deprecate std::net::lookup_host We intended to do this quite a while ago but it snuck through. r? @alexcrichton
Add E0659 for ambiguous names Still on the tracks of the "no error without error code" road.
add target/ to ignored tidy dirs Sometimes you get a target directory from running cargo in the rust repo (the root is `src/`), and it contains generated files. Just whitelist it since it causes tidy to spew warnings uncontrollably.
Fix the "Github - About Pull Requests" link in CONTRIBUTING.md Previously the text that is supposed to link to the Github Pull Requests page, instead linked to the same file (CONTRIBUTING.md).
Contributor
|
Some changes occurred in HTML/CSS. |
Contributor
|
(rust_highfive has picked a reviewer for you, use r? to override) |
Member
Author
|
@bors: r+ p=1 |
Collaborator
|
📌 Commit ce797d5 has been approved by |
petrochenkov
added
the
S-waiting-on-bors
Collaborator
bors
added a commit
that referenced
this pull request
Jan 19, 2018
Collaborator
|
💔 Test failed - status-travis |
Contributor
|
https://travis-ci.org/rust-lang/rust/jobs/330886192#L7274 👀 |
Member
Author
|
Let's retry I suppose... @bors: retry |
Collaborator
|
⌛ Testing commit ce797d5 with merge abe7ad89c834d6952cefaa3171e3548cfbbbdb6e... |
Collaborator
|
💔 Test failed - status-travis |
Contributor
|
same error @bors retry |
Member
|
@bors: r- this is a legitimate error: |
Member
Author
|
Then I close this PR. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
14 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
