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 #87156

Merged
merged 17 commits into from
Jul 15, 2021
Merged

Rollup of 8 pull requests #87156

merged 17 commits into from
Jul 15, 2021

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

m-ou-se and others added 17 commits July 8, 2021 02:33
This helper is in line with other other allocation helpers on Arc.
Added Arc::try_pin

This helper is in line with other other allocation helpers on Arc.

I didn't think this would require an RFC or broader discussion, let me know if that's incorrect.
Add -Zfuture-incompat-test to assist with testing future-incompat reports.

This adds a `-Zfuture-incompat-test` cli flag to assist with testing future-incompatible reports. This flag causes all lints to be treated as a future-incompatible lint, and will emit a report for them. This is being added so that Cargo's testsuite can reliably test the reporting infrastructure.  Right now, Cargo relies on using array_into_iter as a test subject. Since the breaking "future incompatible" lints are never intended to last forever, this means Cargo's testsuite would always need to keep changing to choose different lints (for example, rust-lang#86330 proposed dropping that moniker for array_into_iter). With this flag, Cargo's tests can trigger any lint and check for the report.
…, r=yaahc

Move assert_matches to an inner module

Fixes rust-lang#82913
… r=dtolnay

Add tracking issue number to `wasi_ext`

Feature `wasi_ext` is tracked by rust-lang#71213 but is was not in the source code.
…cottmcm

Add safety comments in private core::slice::rotate::ptr_rotate function

Helps with rust-lang#66219.

```@rustbot``` label C-cleanup T-compiler T-libs
Make SelfInTyParamDefault wording not be specific to type defaults

r? ```@lcnr```
Update cargo

13 commits in 3ebb5f15a940810f250b68821149387af583a79e..66a6737a0c9f3a974af2dd032a65d3e409c77aac
2021-07-02 20:35:38 +0000 to 2021-07-14 20:54:28 +0000
- Add format option to `cargo tree` to print the lib_name (rust-lang/cargo#9663)
- Prefer patched versions of dependencies (rust-lang/cargo#9639)
- When a dependency does not have a version, git or path, fails directly (rust-lang/cargo#9686)
- Spot the crate typo easily (rust-lang/cargo#9665)
- remove unnecessary 'collect' (rust-lang/cargo#9616)
- Make it easier to run testsuite with a custom toolchain. (rust-lang/cargo#9679)
- Serialize `cargo fix` (rust-lang/cargo#9677)
- Don't recommend filing issues on rust-lang/cargo for Cargo.toml errors. (rust-lang/cargo#9658)
- Update nightly failure notification. (rust-lang/cargo#9657)
- Update Windows env uppercase key check. (rust-lang/cargo#9654)
- Unignore fix_edition_2021. (rust-lang/cargo#9662)
- Warning when using features in patch (rust-lang/cargo#9666)
- Unify cargo and rustc's error reporting (rust-lang/cargo#9655)
Fix misuse of rev attribute on <a> tag

The `rev` attribute is supposed to talk about "ownership" as far as I could found out. This attribute seems not very well defined in the HTML spec and its usage in rustdoc is suboptimal.

It was found out in rust-lang#87149.

r? `@JohnTitor`
@rustbot rustbot added the rollup A PR which is a rollup label Jul 15, 2021
@JohnTitor
Copy link
Member Author

@bors r+ p=8 rollup=never

@bors
Copy link
Contributor

bors commented Jul 15, 2021

📌 Commit 262a4f9 has been approved by JohnTitor

@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 Jul 15, 2021
@bors
Copy link
Contributor

bors commented Jul 15, 2021

⌛ Testing commit 262a4f9 with merge cb234be7664957311758c1a1c77760eb5234f196...

@bors
Copy link
Contributor

bors commented Jul 15, 2021

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 15, 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)
[command]"C:\Program Files\Git\bin\git.exe" submodule foreach --recursive "git config --local --name-only --get-regexp 'http\.https\:\/\/github\.com\/\.extraheader' && git config --local --unset-all 'http.https://github.com/.extraheader' || :"
Cleaning up orphan processes
Terminate orphan process: pid (6760) (node)
Terminate orphan process: pid (7356) (python)
Terminate orphan process: pid (1324) (vctip)

@JohnTitor
Copy link
Member Author

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 15, 2021
@bors
Copy link
Contributor

bors commented Jul 15, 2021

⌛ Testing commit 262a4f9 with merge 6dc1368ab6cdf637c346fac329c798d26d7c18b8...

@bors
Copy link
Contributor

bors commented Jul 15, 2021

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 15, 2021
@JohnTitor
Copy link
Member Author

Ugh, @bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 15, 2021
@bors
Copy link
Contributor

bors commented Jul 15, 2021

⌛ Testing commit 262a4f9 with merge 1b3d26153f9aa92b8d68e6b74f326487b0f7d79c...

@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)
[command]"C:\Program Files\Git\bin\git.exe" submodule foreach --recursive "git config --local --name-only --get-regexp 'http\.https\:\/\/github\.com\/\.extraheader' && git config --local --unset-all 'http.https://github.com/.extraheader' || :"
Cleaning up orphan processes
Terminate orphan process: pid (7848) (node)
Terminate orphan process: pid (7256) (python)
Terminate orphan process: pid (3728) (vctip)

@JohnTitor
Copy link
Member Author

@bors retry

@bors
Copy link
Contributor

bors commented Jul 15, 2021

⌛ Testing commit 262a4f9 with merge dfc5d4ebc6806528d74b4d708e32cd251c7e3220...

@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)

@bors
Copy link
Contributor

bors commented Jul 15, 2021

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 15, 2021
@JohnTitor
Copy link
Member Author

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 15, 2021
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-apple failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
      Memory: 14 GB
      Boot ROM Version: VMW71.00V.13989454.B64.1906190538
      Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
      SMC Version (system): 2.8f0
      Serial Number (system): VMaatLaNvkNO

hw.ncpu: 3
hw.byteorder: 1234
hw.memsize: 15032385536
---
-- Build files have been written to: /Users/runner/work/rust/rust/build/x86_64-apple-darwin/native/sanitizers/build
running: "cmake" "--build" "." "--target" "clang_rt.lsan_osx_dynamic" "--config" "Release" "--" "-j" "3"
Consolidate compiler generated dependencies of target RTSanitizerCommonCoverage.osx
Consolidate compiler generated dependencies of target RTLSanCommon.osx
make[3]: *** No rule to make target `/�h�jF�%"��ն��S���3Ѧ�~�K�-x��=8Gu��'L�F���6�ƫǜ�8y*ٿ�$#�N��x%W��Uo7��o55_��]wG𰚺Np���Np�', needed by `lib/sanitizer_common/CMakeFiles/RTSanitizerCommonSymbolizer.osx.dir/sanitizer_symbolizer_mac.cpp.o'.  Stop.
[  0%] Built target RTSanitizerCommonCoverage.osx
[  0%] Built target RTSanitizerCommonCoverage.osx
make[2]: *** [lib/sanitizer_common/CMakeFiles/RTSanitizerCommonSymbolizer.osx.dir/all] Error 2
[ 11%] Built target RTLSanCommon.osx
make[2]: *** Waiting for unfinished jobs....
Consolidate compiler generated dependencies of target RTSanitizerCommonLibc.osx
make[1]: *** [lib/lsan/CMakeFiles/clang_rt.lsan_osx_dynamic.dir/rule] Error 2
[ 11%] Built target RTSanitizerCommonLibc.osx
make: *** [clang_rt.lsan_osx_dynamic] Error 2
thread 'main' panicked at '
Build completed unsuccessfully in 0:43:29
command did not execute successfully, got: exit status: 2


build script failed, must exit now', /Users/runner/.cargo/registry/src/git.luolix.top-1ecc6299db9ec823/cmake-0.1.44/src/lib.rs:885:5

@bors
Copy link
Contributor

bors commented Jul 15, 2021

⌛ Testing commit 262a4f9 with merge 0a6c636...

@bors
Copy link
Contributor

bors commented Jul 15, 2021

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing 0a6c636 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 15, 2021
@bors bors merged commit 0a6c636 into rust-lang:master Jul 15, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jul 15, 2021
@JohnTitor JohnTitor deleted the rollup-osuhe53 branch July 15, 2021 21:20
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.