Skip to content

Rollup of 8 pull requests - #82249

Merged
bors merged 19 commits into
rust-lang:masterfrom
JohnTitor:rollup-3jbqija
Feb 18, 2021
Merged

Rollup of 8 pull requests#82249
bors merged 19 commits into
rust-lang:masterfrom
JohnTitor:rollup-3jbqija

Conversation

@JohnTitor

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

JulianKnodtand others added 19 commits February 13, 2021 20:37
The `rustc_data_structures::sync::OnceCell` is thread-safe when building
a parallel compiler. This is unnecessary for the purposes of pattern
usefulness checking. Use `!Sync` `std::lazy::OnceCell` instead.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Example code:
```
fn opts() -> Option<String> {
let s: Option<String> = Some(String::new());
Some(s?) // this can just be "s"
}
```
Add diagnostics for specific cases for const/type mismatch err
For now, this adds at least more information so better diagnostics can be emitted for const mismatch errors.
I'm not sure what exactly we want to emit, so I've left notes there temporarily, also to see if this is the right approach
r? ```@lcnr```
cc: ```@estebank```
Use !Sync std::lazy::OnceCell in usefulness checking
The `rustc_data_structures::sync::OnceCell` is thread-safe when building
a parallel compiler. This is unnecessary for the purposes of pattern
usefulness checking. Use `!Sync` `std::lazy::OnceCell` instead.
add specs for riscv32/riscv64 musl targets
Signed-off-by: Khem Raj <raj.khem@gmail.com>
…-DPC
Move some tests to more reasonable directories - 4
cc rust-lang#81941
…ter, r=jyn514
make `suggest_setup` help messages better
When I first built the compiler and didn't create a `config.toml.example`, the following was emitted:
```
help: consider running `x.py setup` or copying `config.toml.example`
```
I ran `x.py setup` but got an error so in this PR I made the help messages a little clearer.
Remove redundant rustc_data_structures path component
remove useless ?s (clippy::needless_question_marks)
Example code:
```rust
fn opts() -> Option<String> {
let s: Option<String> = Some(String::new());
Some(s?) // this can just be "s"
}
```
@rustbotrustbot added the rollup A PR which is a rollup label Feb 18, 2021
@JohnTitor

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=8 rollup=never

@bors

bors commented Feb 18, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 21283da has been approved by JohnTitor

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 18, 2021
@bors

bors commented Feb 18, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 21283da with merge 25a2c13...

@bors

bors commented Feb 18, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing 25a2c13 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Feb 18, 2021
@bors
bors merged commit 25a2c13 into rust-lang:masterFeb 18, 2021
@rustbotrustbot added this to the 1.52.0 milestone Feb 18, 2021
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

A job failed! Check out the build log: (web)(plain)

Click to see the possible cause of the failure (guessed by this bot)
 git switch -
Turn off this advice by setting config variable advice.detachedHead to false
HEAD is now at 25a2c13e9 Auto merge of #82249 - JohnTitor:rollup-3jbqija, r=JohnTitor
##[group]Run src/ci/publish_toolstate.sh
src/ci/publish_toolstate.sh
env:
SCCACHE_BUCKET: rust-lang-ci-sccache2
DEPLOY_BUCKET: rust-lang-ci2
TOOLSTATE_REPO: https://github.com/rust-lang-nursery/rust-toolstate
---
CACHE_DOMAIN: ci-caches.rust-lang.org
TOOLSTATE_REPO_ACCESS_TOKEN: ***
##[endgroup]
Cloning into 'rust-toolstate'...
/home/runner/work/rust/rust/src/tools/publish_toolstate.py:121: DeprecationWarning: 'U' mode is deprecated
📣 Toolstate changed by rust-lang/rust#82249!
with open(path, 'rU') as f:
Tested on commit rust-lang/rust@25a2c13e9d19c18d5f3c2656e3d2dda086cb023b.
Direct link to PR: <https://github.com/rust-lang/rust/pull/82249>
💔 miri on windows: test-fail → build-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-fail → build-fail (cc @oli-obk @eddyb @RalfJung).
Traceback (most recent call last):
Traceback (most recent call last):
File "/home/runner/work/rust/rust/src/tools/publish_toolstate.py", line 338, in <module>
response = urllib2.urlopen(urllib2.Request(
File "/usr/lib/python3.8/urllib/request.py", line 222, in urlopen
return opener.open(url, data, timeout)
File "/usr/lib/python3.8/urllib/request.py", line 522, in open
req = meth(req)
File "/usr/lib/python3.8/urllib/request.py", line 1281, in do_request_
raise TypeError(msg)
TypeError: POST data should be bytes, an iterable of bytes, or a file object. It cannot be of type str.
##[error]Process completed with exit code 1.

@JohnTitor
JohnTitor deleted the rollup-3jbqija branch February 18, 2021 10:26
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: 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.

12 participants

@JohnTitor@bors@rust-log-analyzer@rustbot@JulianKnodt@tmiasko@c410-f3r@kraj@henryboisdequin@est31@matthiaskrgr@pickfire