Skip to content

Rollup of 8 pull requests #103420

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

Closed
wants to merge 18 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2618f7a
Don't needless link to `libresolv` on Darwin in libstd
thomcc Oct 7, 2022
7280f3d
Truncate thread names on Linux and Apple targets
cuviper Oct 22, 2022
12e4584
Move truncation next to other thread tests for tidy
cuviper Oct 22, 2022
ed40d46
Properly escape quotes when suggesting switching between char/string …
clubby789 Oct 22, 2022
8762485
Update UI tests
clubby789 Oct 22, 2022
2ac29f6
rustdoc: remove unused CSS class `.result-description`
notriddle Oct 22, 2022
aa8931c
Introduce subst_iter and subst_iter_copied on EarlyBinder
compiler-errors Oct 16, 2022
62b65b5
Change `unknown_lint` applicability to `MaybeIncorrect`
smoelius Oct 22, 2022
94a9ee3
Use functions for headings rustodoc GUI test
GuillaumeGomez Oct 22, 2022
9f0503e
Fix typo in docs of `String::leak`.
finnbear Oct 22, 2022
b1be8bb
Rollup merge of #102766 - thomcc:remove-resolv, r=Mark-Simulacrum
JohnTitor Oct 22, 2022
1d798d3
Rollup merge of #103123 - compiler-errors:early-binder-iter, r=cjgillot
JohnTitor Oct 22, 2022
fafd508
Rollup merge of #103354 - clubby789:escape-string-literals, r=compile…
JohnTitor Oct 22, 2022
ef91fe7
Rollup merge of #103379 - cuviper:truncate-thread-name, r=thomcc
JohnTitor Oct 22, 2022
d850fa4
Rollup merge of #103388 - notriddle:notriddle/result-description, r=G…
JohnTitor Oct 22, 2022
d2fe4ff
Rollup merge of #103399 - smoelius:unknown-lint-maybe-incorrect, r=fe…
JohnTitor Oct 22, 2022
2d69c99
Rollup merge of #103401 - GuillaumeGomez:gui-test-headings-cleanup, r…
JohnTitor Oct 22, 2022
12874e3
Rollup merge of #103412 - finnbear:fix_docs_typo_string_leak, r=thomcc
JohnTitor Oct 22, 2022
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
Next Next commit
Don't needless link to libresolv on Darwin in libstd
  • Loading branch information
thomcc committed Oct 7, 2022
commit 2618f7ae04bb458f53fc8fe4c40b54a9377ce0bb
4 changes: 0 additions & 4 deletions library/std/src/sys/unix/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -352,16 +352,12 @@ cfg_if::cfg_if! {
extern "C" {}
} else if #[cfg(target_os = "macos")] {
#[link(name = "System")]
// res_init and friends require -lresolv on macOS/iOS.
// See #41582 and https://blog.achernya.com/2013/03/os-x-has-silly-libsystem.html
#[link(name = "resolv")]
extern "C" {}
} else if #[cfg(any(target_os = "ios", target_os = "watchos"))] {
#[link(name = "System")]
#[link(name = "objc")]
#[link(name = "Security", kind = "framework")]
#[link(name = "Foundation", kind = "framework")]
#[link(name = "resolv")]
extern "C" {}
} else if #[cfg(target_os = "fuchsia")] {
#[link(name = "zircon")]
Expand Down