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

Rollup of 8 pull requests #47572

Closed
wants to merge 26 commits into from
Closed

Commits on Dec 22, 2017

  1. Configuration menu
    Copy the full SHA
    176624f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6e741df View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2018

  1. extended dt with kbd tags

    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
    hellow554 committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    38e5d30 View commit details
    Browse the repository at this point in the history
  2. 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.
    etaoins committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    090a968 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2018

  1. Configuration menu
    Copy the full SHA
    0e1ecbe View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    839ff6f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    13f8c82 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b7228c8 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ee606c0 View commit details
    Browse the repository at this point in the history
  6. Replaced multi-byte character handling in end_point with potentially …

    …more performant variant.
    davidtwco committed Jan 17, 2018
    Configuration menu
    Copy the full SHA
    e1c927b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    9d4ca01 View commit details
    Browse the repository at this point in the history
  8. Fix new test from rebase.

    davidtwco committed Jan 17, 2018
    Configuration menu
    Copy the full SHA
    2161c3f View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    a1b72f7 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2018

  1. Deprecate std::net::lookup_host

    We intended to do this quite a while ago but it snuck through.
    sfackler committed Jan 18, 2018
    Configuration menu
    Copy the full SHA
    908aa38 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0c946c0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f66e711 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    005791b View commit details
    Browse the repository at this point in the history
  5. Update CONTRIBUTING.md

    walinga authored Jan 18, 2018
    Configuration menu
    Copy the full SHA
    9a4287d View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2018

  1. Rollup merge of rust-lang#46938 - hellow554:rustdoc-kbd-style, r=Guil…

    …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 .
    GuillaumeGomez authored Jan 19, 2018
    Configuration menu
    Copy the full SHA
    6e9cbac View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#47334 - etaoins:only-call-res-init-on-gnu-u…

    …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
    GuillaumeGomez authored Jan 19, 2018
    Configuration menu
    Copy the full SHA
    df40c4a View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#47420 - davidtwco:issue-46885, r=estebank

    Fix off-by-one spans in MIR borrowck errors
    
    Fixes rust-lang#46885.
    
    r? @nikomatsakis
    GuillaumeGomez authored Jan 19, 2018
    Configuration menu
    Copy the full SHA
    ac75587 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#47508 - QuietMisdreavus:rbe-bookshelf, r=st…

    …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.
    GuillaumeGomez authored Jan 19, 2018
    Configuration menu
    Copy the full SHA
    c71ea45 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#47510 - sfackler:deprecate-dns, r=alexcrichton

    Deprecate std::net::lookup_host
    
    We intended to do this quite a while ago but it snuck through.
    
    r? @alexcrichton
    GuillaumeGomez authored Jan 19, 2018
    Configuration menu
    Copy the full SHA
    c71bc78 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#47512 - GuillaumeGomez:e0659, r=petrochenkov

    Add E0659 for ambiguous names
    
    Still on the tracks of the "no error without error code" road.
    GuillaumeGomez authored Jan 19, 2018
    Configuration menu
    Copy the full SHA
    223b474 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#47535 - Manishearth:ignore-target, r=kennytm

    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.
    GuillaumeGomez authored Jan 19, 2018
    Configuration menu
    Copy the full SHA
    3171cdf View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#47559 - walinga:pr-link-fix, r=kennytm

    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).
    GuillaumeGomez authored Jan 19, 2018
    Configuration menu
    Copy the full SHA
    ce797d5 View commit details
    Browse the repository at this point in the history