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

Cherry-picking beta-nominated in to beta #24708

Merged
merged 25 commits into from
Apr 23, 2015

Commits on Apr 22, 2015

  1. Check for shadowing between lifetimes and loop labels in function bod…

    …ies.
    
    Note: this Warns rather than error on shadowing problems involving labels.
    We took this more conservative option mostly due to issues with
    hygiene being broken for labels and/or lifetimes.
    
    Add FIXME regarding non-hygienic comparison.
    pnkfelix authored and alexcrichton committed Apr 22, 2015
    Configuration menu
    Copy the full SHA
    f702218 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b2ac06f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f1585ab View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2015

  1. typeck: Do high-level structural/signature checks before function bod…

    …y checks.
    
    This avoids various ICEs, e.g. premature calls to cat_expr that yield
    the dreaded "cat_expr Errd" ICE.
    pnkfelix authored and alexcrichton committed Apr 23, 2015
    Configuration menu
    Copy the full SHA
    dd90a5b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    727b72c View commit details
    Browse the repository at this point in the history
  3. Fallout from this change.

    pnkfelix authored and alexcrichton committed Apr 23, 2015
    Configuration menu
    Copy the full SHA
    399b4cc View commit details
    Browse the repository at this point in the history
  4. factor out useful helper.

    pnkfelix authored and alexcrichton committed Apr 23, 2015
    Configuration menu
    Copy the full SHA
    dca9882 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c343896 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    378fbcd View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    e99cc02 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    be49cb6 View commit details
    Browse the repository at this point in the history
  9. std: Add Default/IntoIterator/ToOwned to the prelude

    This is an implementation of [RFC 1030][rfc] which adds these traits to the
    prelude and additionally removes all inherent `into_iter` methods on collections
    in favor of the trait implementation (which is now accessible by default).
    
    [rfc]: rust-lang/rfcs#1030
    
    This is technically a breaking change due to the prelude additions and removal
    of inherent methods, but it is expected that essentially no code breaks in
    practice.
    
    [breaking-change]
    Closes rust-lang#24538
    alexcrichton committed Apr 23, 2015
    Configuration menu
    Copy the full SHA
    6d4647b View commit details
    Browse the repository at this point in the history
  10. unstabilize Words struct

    Words struct was stabilied by mistake. Unstabilize.
    kwantam authored and alexcrichton committed Apr 23, 2015
    Configuration menu
    Copy the full SHA
    c0d2553 View commit details
    Browse the repository at this point in the history
  11. std: Remove deprecated AsOsStr/Str/AsSlice traits

    Cleaning out more deprecated items
    
    Conflicts:
    	src/libcore/result.rs
    alexcrichton committed Apr 23, 2015
    Configuration menu
    Copy the full SHA
    53dd775 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    fd685ce View commit details
    Browse the repository at this point in the history
  13. std: Remove deprecated/unstable num functionality

    This commit removes all the old casting/generic traits from `std::num` that are
    no longer in use by the standard library. This additionally removes the old
    `strconv` module which has not seen much use in quite a long time. All generic
    functionality has been supplanted with traits in the `num` crate and the
    `strconv` module is supplanted with the [rust-strconv crate][rust-strconv].
    
    [rust-strconv]: https://github.com/lifthrasiir/rust-strconv
    
    This is a breaking change due to the removal of these deprecated crates, and the
    alternative crates are listed above.
    
    [breaking-change]
    
    Conflicts:
    	src/libstd/num/strconv.rs
    alexcrichton committed Apr 23, 2015
    Configuration menu
    Copy the full SHA
    0372484 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    d8b6335 View commit details
    Browse the repository at this point in the history
  15. std: Bring back f32::from_str_radix as an unstable API

    This API was exercised in a few tests and mirrors the `from_str_radix`
    functionality of the integer types.
    
    Conflicts:
    	src/doc/trpl/traits.md
    	src/libstd/sys/windows/fs2.rs
    alexcrichton committed Apr 23, 2015
    Configuration menu
    Copy the full SHA
    1c9aa36 View commit details
    Browse the repository at this point in the history
  16. Make stability attributes an error. rust-lang#22830

    Conflicts:
    	src/librustc_data_structures/lib.rs
    brson authored and alexcrichton committed Apr 23, 2015
    Configuration menu
    Copy the full SHA
    95d02a2 View commit details
    Browse the repository at this point in the history
  17. Test fixes and rebase conflicts, round 1

    Conflicts:
    	src/test/run-pass/task-stderr.rs
    alexcrichton committed Apr 23, 2015
    Configuration menu
    Copy the full SHA
    fc74ba2 View commit details
    Browse the repository at this point in the history
  18. Add Sync to the bounds in io::Error

    This allows `io::Error` values to be stored in `Arc` properly.
    
    Because this requires `Sync` of any value passed to `io::Error::new()`
    and modifies the relevant `convert::From` impls, this is a
    
    [breaking-change]
    
    Fixes rust-lang#24049.
    lilyball authored and alexcrichton committed Apr 23, 2015
    Configuration menu
    Copy the full SHA
    8b5482e View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    c4dae05 View commit details
    Browse the repository at this point in the history
  20. Augment the constrainted parameter check to ensure that all regions

    which get mentioned in an associated type are constrained.  Arguably we
    should just require that all regions are constrained, but that is more
    of a breaking change.
    
    Conflicts:
    	src/librustc_typeck/collect.rs
    nikomatsakis authored and alexcrichton committed Apr 23, 2015
    Configuration menu
    Copy the full SHA
    a4d37bc View commit details
    Browse the repository at this point in the history
  21. Rewrite constrained type params code to operate generically over

    multiple kinds of parameters (regions and types, specifically)
    
    Conflicts:
    	src/librustc_typeck/collect.rs
    nikomatsakis authored and alexcrichton committed Apr 23, 2015
    Configuration menu
    Copy the full SHA
    96d927a View commit details
    Browse the repository at this point in the history
  22. Fix some missing cases

    nikomatsakis authored and alexcrichton committed Apr 23, 2015
    Configuration menu
    Copy the full SHA
    9b1573c View commit details
    Browse the repository at this point in the history