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 5 pull requests #42400

Merged
merged 11 commits into from
Jun 3, 2017
Merged

Rollup of 5 pull requests #42400

merged 11 commits into from
Jun 3, 2017

Conversation

estebank and others added 11 commits May 31, 2017 23:48
When suggesting an appropriate mutability for a macro call, use the call
span instead of the expanded macro's span.
This option forwards to each `cargo test` invocation, and applies the
same logic across all test steps to keep going after failures.  At the
end, a brief summary line reports how many commands failed, if any.

Note that if a test program fails to even start at all, or if an
auxiliary build command related to testing fails, these are still left
to stop everything right away.

Fixes rust-lang#40219.
This was added in rust-lang#38072 but I can't recall why and AFAIK Cargo already handles
this. This was discovered through rust-lang#42146 where passing duplicate flags was
causing problems.
…umeGomez

Update various book repos for the next release.
…=alexcrichton

Reduce verbosity of build logs

This does two separate things.
 - Sets sccache logging to warn instead of info.
 - Makes tests when running for a given PR (not on auto branch) quiet. (cc @eddyb)

r? @alexcrichton
rustbuild: Add `./x.py test --no-fail-fast`

This option forwards to each `cargo test` invocation, and applies the
same logic across all test steps to keep going after failures.  At the
end, a brief summary line reports how many commands failed, if any.

Note that if a test program fails to even start at all, or if an
auxiliary build command related to testing fails, these are still left
to stop everything right away.

Fixes rust-lang#40219.
Use callsite's span for macro calls on suggestion

When suggesting an appropriate mutability for a macro call, use the call
span instead of the expanded macro's span.

```
error[E0308]: mismatched types
  --> $DIR/coerce-suggestions.rs:48:9
   |
48 |     s = format!("foo");
   |         ^^^^^^^^^^^^^^ expected mutable reference, found struct `std::string::String`
   |
   = note: expected type `&mut std::string::String`
              found type `std::string::String`
   = help: try with `&mut format!("foo")`
   = note: this error originates in a macro outside of the current crate
```
Fix rust-lang#41858.
…rk-Simulacrum

rustbuild: Remove RUSTFLAGS logic in rustc shim

This was added in rust-lang#38072 but I can't recall why and AFAIK Cargo already handles
this. This was discovered through rust-lang#42146 where passing duplicate flags was
causing problems.
@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nikomatsakis (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@frewsxcv
Copy link
Member Author

frewsxcv commented Jun 3, 2017

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Jun 3, 2017

📌 Commit 4683500 has been approved by frewsxcv

@bors
Copy link
Contributor

bors commented Jun 3, 2017

⌛ Testing commit 4683500 with merge 6165203...

bors added a commit that referenced this pull request Jun 3, 2017
Rollup of 5 pull requests

- Successful merges: #42353, #42354, #42363, #42368, #42382
- Failed merges:
@bors
Copy link
Contributor

bors commented Jun 3, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: frewsxcv
Pushing 6165203 to master...

@bors bors merged commit 4683500 into rust-lang:master Jun 3, 2017
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants