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.

Sign up for GitHub

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

Jump to bottom

Rollup of 4 pull requests #32628

Merged
merged 10 commits into from
Mar 31, 2016
Merged

Rollup of 4 pull requests #32628

merged 10 commits into from
Mar 31, 2016

Commits on Mar 30, 2016

  1. rename rustc_const_eval to rustc_const_math

    @oli-obk
    oli-obk committed Mar 30, 2016
    Configuration menu
    Copy the full SHA
    6cc449a View commit details
    Browse the repository at this point in the history

  2. move const_eval and check_match out of librustc

    @oli-obk
    oli-obk committed Mar 30, 2016
    Configuration menu
    Copy the full SHA
    3eac647 View commit details
    Browse the repository at this point in the history

  3. Remove no longer necessary coercions to fn pointer types. 

    Originally added in 8fe9e4d.

Everything appears to build fine without the coercions, so they can
presumably be removed.
    @frewsxcv
    frewsxcv committed Mar 30, 2016
    Configuration menu
    Copy the full SHA
    99501e6 View commit details
    Browse the repository at this point in the history

  4. Book: Fix phrasing: “an associated type” → “a trait with an associate… 

    …d type”.
    @progval
    progval committed Mar 30, 2016
    Configuration menu
    Copy the full SHA
    b1b3738 View commit details
    Browse the repository at this point in the history

  5. Put in -Z continue-parse-after-error 

    This works by adding a boolean flag, `continue_after_error`, to
`syntax::errors::Handler` that can be imperatively set to `true` or
`false` via a new `fn set_continue_after_error`.

The flag starts off true (since we generally try to recover from
compiler errors, and `Handler` is shared across all phases).

Then, during the `phase_1_parse_input`, we consult the setting of the
`-Z continue-parse-after-error` debug flag to determine whether we
should leave the flag set to `true` or should change it to `false`.

----

(We might consider adding a debugflag to do such aborts in other
places where we are currently attempting recovery, such as resolve,
but I think the parser is the really important case to handle in the
face of rust-lang#31994 and the parser bugs of varying degrees that were
injected by parse error recovery.)
    @pnkfelix
    pnkfelix committed Mar 30, 2016
    Configuration menu
    Copy the full SHA
    2646663 View commit details
    Browse the repository at this point in the history

  6. fix compile-fail and parse-fail tests by blindly opting back into 

    parser recovery (so that expected errors match up)

I'm opting into parser recovery in all these cases out of expediency,
not because the error messages you get with recovery enabled are
actually all that usable in all cases listed.
    @pnkfelix
    pnkfelix committed Mar 30, 2016
    Configuration menu
    Copy the full SHA
    e1d8ad3 View commit details
    Browse the repository at this point in the history

  7. Rollup merge of rust-lang#32259 - oli-obk:move_const_eval, r=alexcric… 

    …hton

move `const_eval` and `check_match` out of `librustc` into their own crate

r? @arielb1
    @Manishearth
    Manishearth committed Mar 30, 2016
    Configuration menu
    Copy the full SHA
    9957081 View commit details
    Browse the repository at this point in the history

  8. Rollup merge of rust-lang#32494 - pnkfelix:gate-parser-recovery-via-d… 

    …ebugflag, r=nrc

Gate parser recovery via debugflag

Gate parser recovery via debugflag

Put in `-Z continue_parse_after_error`

This works by adding a method, `fn abort_if_no_parse_recovery`, to the
diagnostic handler in `syntax::errors`, and calling it after each
error is emitted in the parser.

(We might consider adding a debugflag to do such aborts in other
places where we are currently attempting recovery, such as resolve,
but I think the parser is the really important case to handle in the
face of rust-lang#31994 and the parser bugs of varying degrees that were
injected by parse error recovery.)

r? @nikomatsakis
    @Manishearth
    Manishearth committed Mar 30, 2016
    Configuration menu
    Copy the full SHA
    74546e8 View commit details
    Browse the repository at this point in the history

  9. Rollup merge of rust-lang#32612 - frewsxcv:unnecessary-coercions, r=a… 

    …lexcrichton

Remove no longer necessary coercions to fn pointer types.

Originally added in 8fe9e4d.

Everything appears to build fine without the coercions, so they can
presumably be removed.
    @Manishearth
    Manishearth committed Mar 30, 2016
    Configuration menu
    Copy the full SHA
    cb5af89 View commit details
    Browse the repository at this point in the history

  10. Rollup merge of rust-lang#32618 - ProgVal:patch-1, r=steveklabnik 

    Book: Fix phrasing: “an associated type” → “an object with an associated type”.

From what I understood, `graph` is the object from which we create a trait object, and the associated types are `Graph::N` and `Graph::E`.
    @Manishearth
    Manishearth committed Mar 30, 2016
    Configuration menu
    Copy the full SHA
    458fae7 View commit details
    Browse the repository at this point in the history