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 14 pull requests #33376

Merged
merged 23 commits into from
May 5, 2016
Merged

Rollup of 14 pull requests #33376

merged 23 commits into from
May 5, 2016

Commits on Apr 29, 2016

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

Commits on May 1, 2016

  1. Configuration menu
    Copy the full SHA
    538098c View commit details
    Browse the repository at this point in the history
  2. Add error explanation for E0501

    Timothy McRoy committed May 1, 2016
    Configuration menu
    Copy the full SHA
    3f49920 View commit details
    Browse the repository at this point in the history
  3. doc/book/getting-started.md: Removed references to creating a new exe…

    …cutable from 'Converting to Cargo'.
    justsostephen committed May 1, 2016
    Configuration menu
    Copy the full SHA
    018c595 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2016

  1. Configuration menu
    Copy the full SHA
    12c4a19 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bf51eaf View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    98d991f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    10737a5 View commit details
    Browse the repository at this point in the history
  5. tests

    oli-obk committed May 2, 2016
    Configuration menu
    Copy the full SHA
    f080b13 View commit details
    Browse the repository at this point in the history
  6. refactor infer function

    There was no span available in the cast function, but we need to infer the `x` in `x as char` to `u8`.
    The spans are now removed from all functions using `infer` and instead added in `eval_const_expr_partial`
    oli-obk committed May 2, 2016
    Configuration menu
    Copy the full SHA
    ce6ea47 View commit details
    Browse the repository at this point in the history
  7. resolve: print location of static for "static in pattern" error

    The implementation mirrors the one for "constant defined here" annotation
    used for constant patterns in the irrefutable-pattern case.
    
    Fixes: rust-lang#23716
    birkenfeld committed May 2, 2016
    Configuration menu
    Copy the full SHA
    4ba6bf4 View commit details
    Browse the repository at this point in the history
  8. libcore: Inline mem::forget().

    Was causing severe performance problems in WebRender.
    pcwalton committed May 2, 2016
    Configuration menu
    Copy the full SHA
    237eb72 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2016

  1. rustdoc: fix inserting source code spans for constant values

    This will go wrong when the constants partially result from macro expansion.
    Instead, use the expressions and pretty-print them as Rust code.
    
    Fixes: rust-lang#33302
    birkenfeld committed May 3, 2016
    Configuration menu
    Copy the full SHA
    24117f3 View commit details
    Browse the repository at this point in the history
  2. rustdoc: HTML-escape Rust code (from constants)

    Especially in cases like the one in the test file, this can blow
    up the docs big time if string constants in the code contain HTML.
    
    But also other constants can contain special chars (e.g. `&` as an
    operator in constant expressions).
    birkenfeld committed May 3, 2016
    Configuration menu
    Copy the full SHA
    1bcf41e View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#33277 - birkenfeld:fmt-named-dollar-args, r…

    …=steveklabnik
    
    Fix std::fmt format spec: named args are allowed with "$" syntax
    Manishearth committed May 3, 2016
    Configuration menu
    Copy the full SHA
    af05b56 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#33294 - timothy-mcroy:E0501, r=GuillaumeGomez

    Add detailed error explanation for E0501
    
    r? @GuillaumeGomez
    
    Bring on the nits!
    Manishearth committed May 3, 2016
    Configuration menu
    Copy the full SHA
    5bac8cb View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#33322 - justsostephen:master, r=steveklabnik

    doc/book/getting-started.md: Spelling correction and revised wording.
    
    The word 'Internet' was spelt with both an uppercase and a lowercase 'I'. The correct spelling seems to be a matter of some debate these days, however the first occurrence in the file has an uppercase 'I', so I've changed the second occurrence to suit for consistency.
    
    Under the section titled 'Converting to Cargo', there's mention of creating a new executable. This, however, is not part of the process described. I've revised the wording to reflect as much.
    
    Small changes, but I hope they are of benefit! :-)
    
    r? @steveklabnik
    Manishearth committed May 3, 2016
    Configuration menu
    Copy the full SHA
    2e4474f View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#33339 - oli-obk:fix/const_eval, r=japaric

    fix various const eval errors
    
    These were found after const_evaluating arbitrary expressions and linting if the const evaluator failed
    
    fixes rust-lang#33275 (int -> float casts for negative ints)
    fixes rust-lang#33291 (int -> char casts (new! wasn't allowed in constants until this PR))
    
    r? @eddyb
    
    cc @bluss @japaric
    Manishearth committed May 3, 2016
    Configuration menu
    Copy the full SHA
    041a269 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#33340 - birkenfeld:issue-23716, r=Manishearth

    resolve: print location of static for "static in pattern" error
    
    The implementation mirrors the one for "constant defined here" annotation used for constant patterns in the irrefutable-pattern case.
    
    Fixes: rust-lang#23716
    Manishearth committed May 3, 2016
    Configuration menu
    Copy the full SHA
    52c97f2 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#33343 - birkenfeld:issue-32214, r=Manishearth

    parser: change warning into an error on `T<A=B, C>`
    
    part of rust-lang#32214
    
    This seems to be the obvious fix, and the error message is consistent with all the other parser errors ("expected x, found y").
    Manishearth committed May 3, 2016
    Configuration menu
    Copy the full SHA
    51a3a8f View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#33357 - pcwalton:inline-mem-forget, r=brson

    libcore: Inline `mem::forget()`.
    
    Was causing severe performance problems in WebRender.
    
    r? @brson
    Manishearth committed May 3, 2016
    Configuration menu
    Copy the full SHA
    676fd36 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#33371 - birkenfeld:issue-33302, r=cmr

    rustdoc: fix inserting source code spans for constant values
    
    This will go wrong when the constants partially result from macro expansion.
    Instead, use the expressions and pretty-print them as Rust code.
    
    Fixes: rust-lang#33302
    Manishearth committed May 3, 2016
    Configuration menu
    Copy the full SHA
    1ab0195 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#33372 - birkenfeld:rustdoc-escape-code, r=cmr

    rustdoc: HTML-escape Rust code (from constants)
    
    Especially in cases like the one in the test file, this can blow up the rendering big time if string constants in the code contain HTML.
    
    But also other constants can contain special chars (e.g. `&` as an operator in constant expressions).
    Manishearth committed May 3, 2016
    Configuration menu
    Copy the full SHA
    631e7b4 View commit details
    Browse the repository at this point in the history