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 8 pull requests #63194

Merged
merged 18 commits into from
Aug 1, 2019
Merged

Rollup of 8 pull requests #63194

merged 18 commits into from
Aug 1, 2019

Conversation

pietroalbini
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

urandom2 and others added 18 commits July 13, 2019 01:50
The std::io::Write::write method currensly suggests consumers guaranteed
that `0 <= n <= buf.len()`, for `Ok(n)`, however `n` is of type `usize`
causing the compiler to emit a warning:
```
warning: comparison is useless due to type limits
 --> lib.rs:6:18
  |
6 |         Ok(n) => 0 <= n && n <= output.len(),
  |                  ^^^^^^
  |
  = note: #[warn(unused_comparisons)] on by default
```

This PR removes the suggestion to check `0 <= n` since it is moot.

r? @steveklabnik
ignore process-envs.rs and process-remove-from-env.rs as there is no 'env' on vxWorks
A recent commit modified toolstate to only push updated data when the
TOOLSTATE_PUBLISH environment variable is present. This worked fine on
Windows but failed on Linux, since Linux jobs run inside Docker
containers and the variable wasn't forwarded inside it.

This changes the Docker startup code to set the TOOLSTATE_PUBLISH
enviornment variable inside the container if it's present outside.
simplify std::io::Write::write rustdoc

The std::io::Write::write method currensly suggests consumers guaranteed
that `0 <= n <= buf.len()`, for `Ok(n)`, however `n` is of type `usize`
causing the compiler to emit a warning:
```
warning: comparison is useless due to type limits
 --> lib.rs:6:18
  |
6 |         Ok(n) => 0 <= n && n <= output.len(),
  |                  ^^^^^^
  |
  = note: #[warn(unused_comparisons)] on by default
```

This PR removes the suggestion to check `0 <= n` since it is moot.

r? @steveklabnik
Account for `maybe_whole_expr` in range patterns

Fixes rust-lang#63115 (fallout from rust-lang#62550).

r? @petrochenkov
cleanup StringReader fields

reduce visibility and replace `Lrc<SourceFile>` with `start_pos`: the single bit we actually *need* from the file.

r? @petrochenkov
update test cases for vxWorks

issue-2214.rs: lgamma is lgamma on vxWorks
ignore process-envs.rs and process-remove-from-env.rs as there is no 'env' on vxWorks
…xes, r=Centril

Fix typos in release notes.
…r=alexcrichton

ci: fix toolstate not pushing data for Linux

A recent commit modified toolstate to only push updated data when the `TOOLSTATE_PUBLISH` environment variable is present. This worked fine on Windows but failed on Linux, since Linux jobs run inside Docker containers and the variable wasn't forwarded inside it.

This changes the Docker startup code to set the `TOOLSTATE_PUBLISH` enviornment variable inside the container if it's present outside.

r? @alexcrichton
fixes rust-lang#63190
@pietroalbini
Copy link
Member Author

@bors r+ p=101

@bors
Copy link
Contributor

bors commented Aug 1, 2019

📌 Commit b1d5e52 has been approved by pietroalbini

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 1, 2019
@bors
Copy link
Contributor

bors commented Aug 1, 2019

⌛ Testing commit b1d5e52 with merge 435236b...

bors added a commit that referenced this pull request Aug 1, 2019
Rollup of 8 pull requests

Successful merges:

 - #62644 (simplify std::io::Write::write rustdoc)
 - #62971 (Add keywords item into the sidebar)
 - #63122 (Account for `maybe_whole_expr` in range patterns)
 - #63158 (Add test for issue-58951)
 - #63170 (cleanup StringReader fields)
 - #63179 (update test cases for vxWorks)
 - #63188 (Fix typos in release notes.)
 - #63191 (ci: fix toolstate not pushing data for Linux)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Aug 1, 2019

☀️ Test successful - checks-azure
Approved by: pietroalbini
Pushing 435236b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 1, 2019
@bors bors merged commit b1d5e52 into rust-lang:master Aug 1, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #63194!

Tested on commit 435236b.
Direct link to PR: #63194

🎉 clippy-driver on linux: build-fail → test-pass (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
🎉 miri on linux: test-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Aug 1, 2019
Tested on commit rust-lang/rust@435236b.
Direct link to PR: <rust-lang/rust#63194>

🎉 clippy-driver on linux: build-fail → test-pass (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
🎉 miri on linux: test-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
@pietroalbini pietroalbini deleted the rollup-xgnvb1b branch August 13, 2019 16:16
@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
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants