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 9 pull requests #47644

Merged
merged 24 commits into from
Jan 22, 2018
Merged

Rollup of 9 pull requests #47644

merged 24 commits into from
Jan 22, 2018

Commits on Jan 15, 2018

  1. Configuration menu
    Copy the full SHA
    aec1623 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    af91d99 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    509ea8e View commit details
    Browse the repository at this point in the history
  4. Use s::u::p::expr_precedence and fix message

     - Use `syntax::util::parser::expr_precedence` to determine wether
       parenthesis are needed around the casting target.
     - Update message to not incorrectly mention rounding on `.into()`
       suggestions, as those types that do have that implemented will never
       round.
    estebank committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    09efaaf View commit details
    Browse the repository at this point in the history
  5. Use single source of truth for expr precedence

    Introduce a new unified type that holds the expression precedence for
    both AST and HIR nodes.
    estebank committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    afe8d13 View commit details
    Browse the repository at this point in the history
  6. 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
  7. Configuration menu
    Copy the full SHA
    71c0873 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2018

  1. Configuration menu
    Copy the full SHA
    f66e711 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2018

  1. Small improvements to the documentation of VecDeque.

    Pieter Penninckx authored and Pieter Penninckx committed Jan 19, 2018
    Configuration menu
    Copy the full SHA
    81e6840 View commit details
    Browse the repository at this point in the history
  2. Automaticaly calculate beta prerelease numbers

    This is a forward-port of:
    
    * 9426dda
    * cbfb985
    
    from the beta branch which is used to automatically calculate the beta number
    based on the number of merges to the beta branch so far.
    alexcrichton committed Jan 19, 2018
    Configuration menu
    Copy the full SHA
    06913a5 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2018

  1. Configuration menu
    Copy the full SHA
    4d08d05 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2018

  1. Configuration menu
    Copy the full SHA
    1756f68 View commit details
    Browse the repository at this point in the history
  2. Fix ICE with use self;

    pietroalbini committed Jan 21, 2018
    Configuration menu
    Copy the full SHA
    e9d0141 View commit details
    Browse the repository at this point in the history
  3. Revert change to docs in panic section of VecDeque::split_off

    Pieter Penninckx authored and Pieter Penninckx committed Jan 21, 2018
    Configuration menu
    Copy the full SHA
    ea814b8 View commit details
    Browse the repository at this point in the history
  4. Fix mailmap duplicates, Carol and Brian.

    Russell Mackenzie committed Jan 21, 2018
    Configuration menu
    Copy the full SHA
    9a56286 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#47247 - estebank:suggest-cast, r=petrochenkov

    Suggest casting on numeric type error
    
    Re rust-lang#47168.
    GuillaumeGomez committed Jan 21, 2018
    Configuration menu
    Copy the full SHA
    6bb1b0d View commit details
    Browse the repository at this point in the history
  6. 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 committed Jan 21, 2018
    Configuration menu
    Copy the full SHA
    ab54a9c View commit details
    Browse the repository at this point in the history
  7. 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 committed Jan 21, 2018
    Configuration menu
    Copy the full SHA
    a1c3449 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#47582 - alexcrichton:auto-beta, r=kennytm

    Automaticaly calculate beta prerelease numbers
    
    This is a forward-port of:
    
    * 9426dda
    * cbfb985
    
    from the beta branch which is used to automatically calculate the beta number
    based on the number of merges to the beta branch so far.
    GuillaumeGomez committed Jan 21, 2018
    Configuration menu
    Copy the full SHA
    35221d8 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#47595 - PieterPenninckx:master, r=shepmaster

    Small improvements to the documentation of VecDeque.
    
    Some small improvements to the documentation of `VecDeque`.
    GuillaumeGomez committed Jan 21, 2018
    Configuration menu
    Copy the full SHA
    c354bb8 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#47625 - astraw:btreeset-doctest-fix, r=kennytm

    fix doctests for BTreeSet to use BTreeSet (not BTreeMap)
    
    This fixes rust-lang#47624
    GuillaumeGomez committed Jan 21, 2018
    Configuration menu
    Copy the full SHA
    50e3836 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#47632 - sdroege:exact-chunks-docs-broken-li…

    …nks, r=kennytm
    
    Fix broken links to other slice functions in chunks/chunks_mut/exact_…
    
    …chunk/exact_chunks_mut docs
    
    See rust-lang#47126 (comment)
    GuillaumeGomez committed Jan 21, 2018
    Configuration menu
    Copy the full SHA
    6e6ab1e View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#47633 - pietroalbini:fix-ice-use-self, r=na…

    …gisa
    
    Fix ICE with `use self;`
    
    Closes rust-lang#47623
    GuillaumeGomez committed Jan 21, 2018
    Configuration menu
    Copy the full SHA
    05f77ac View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#47637 - russmack:fix-mailmap-dupes, r=steve…

    …klabnik
    
    Fix mailmap duplicates, Carol and Brian.
    
    This fix corrects the .mailmap file so that Carol (Nichols || Goulding) appears only once, and Brian Anderson also appears only once.
    GuillaumeGomez committed Jan 21, 2018
    Configuration menu
    Copy the full SHA
    dcbf0bf View commit details
    Browse the repository at this point in the history