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 6 pull requests #82192

Merged
merged 13 commits into from
Feb 16, 2021
Merged

Rollup of 6 pull requests #82192

merged 13 commits into from
Feb 16, 2021

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

GuillaumeGomez and others added 13 commits February 15, 2021 10:11
If we already have a slice, there is no need to get another full-range slice from that, just use the original.
clippy::redundant_slicing
Fix ES5 errors (IE11)

rustdoc is supposed to run on IE11 but someone reported me that it wasn't. I just confirmed it by using `es-check` with the `es5` option like this:

```
$ es-check es5 src/librustdoc/html/static/*.js
```

The PR fixes those issues and add CI checks to prevent regressions.

`@Mark-Simulacrum:` I added checks in the CI, but not sure if it's the correct way to do it. Any help on that side would be very appreciated!

r? `@Nemo157`
Fix typo in rustc_infer::infer::UndoLog

Also use double quotes.
…545, r=GuillaumeGomez

Add long explanation for E0545

Helps with rust-lang#61137
avoid full-slicing slices

If we already have a slice, there is no need to get another full-range slice from that, just use the original.
clippy::redundant_slicing
validation: fix invalid-fn-ptr error message

rust-lang#82061 changed the code here to print an `ImmTy` instead of a `ScalarMaybeUninit`; that was an accident. So go back to printing a `ScalarMaybeUninit`.

r? ```@oli-obk```
…oc, r=nagisa

[Minor] Update discriminant_value docs

Updated for new `DiscriminantKind` trait.
@rustbot rustbot added the rollup A PR which is a rollup label Feb 16, 2021
@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=6

@bors
Copy link
Contributor

bors commented Feb 16, 2021

📌 Commit 9502e5c has been approved by GuillaumeGomez

@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 Feb 16, 2021
@bors
Copy link
Contributor

bors commented Feb 16, 2021

⌛ Testing commit 9502e5c with merge a143517...

@bors
Copy link
Contributor

bors commented Feb 16, 2021

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing a143517 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 16, 2021
@bors bors merged commit a143517 into rust-lang:master Feb 16, 2021
@rustbot rustbot added this to the 1.52.0 milestone Feb 16, 2021
@rust-log-analyzer
Copy link
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 a143517d4 Auto merge of #82192 - GuillaumeGomez:rollup-gi1639b, r=GuillaumeGomez
##[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'...
📣 Toolstate changed by rust-lang/rust#82192!

Tested on commit rust-lang/rust@a143517d44cac50b20cbd3a0b579addab40dd399.
Direct link to PR: <https://github.com/rust-lang/rust/pull/82192>

🎉 miri on windows: test-fail → test-pass (cc @RalfJung @eddyb @oli-obk).
🎉 miri on linux: test-fail → test-pass (cc @RalfJung @eddyb @oli-obk).

/home/runner/work/rust/rust/src/tools/publish_toolstate.py:121: DeprecationWarning: 'U' mode is deprecated
  with open(path, 'rU') as f:
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.

@GuillaumeGomez GuillaumeGomez deleted the rollup-gi1639b branch February 17, 2021 08:54
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.

9 participants