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 7 pull requests #89984

Merged
merged 15 commits into from
Oct 17, 2021
Merged

Rollup of 7 pull requests #89984

merged 15 commits into from
Oct 17, 2021

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

eddyb and others added 15 commits October 10, 2021 18:18
ty::pretty: prevent infinite recursion for `extern crate` paths.

Fixes rust-lang#55779, fixes rust-lang#87932.

This fix is based on `@estebank's` idea in rust-lang#55779 (comment) - but instead of trying to get `try_print_visible_def_path_recur`'s cycle detection to work in this case, this PR "just" disables the "visible path" feature when printing the path to an `extern crate`, so that the old recursion chain of `try_print_visible_def_path -> print_def_path -> try_print_visible_def_path`, is now impossible.

Both tests have been confirmed to crash `rustc` because of a stack overflow, without the fix.
…arm64, r=Mark-Simulacrum

Make `llvm.download-ci-llvm="if-available"` work for tier 2 targets with host tools

`llvm.download-ci-llvm="if-available"` is used for most profiles configured via `x.py setup`. It allows downloading prebuilt LLVM tarballs from the CI artifacts for a configured list of platforms. Currently this list is restricted to tier 1 targets but it makes sense for all tier 2 targets with host tools.
…rom-slice, r=the8472

Remove a mention to `copy_from_slice` from `clone_from_slice` doc

Fixes rust-lang#84736
I think removing it would be the best but I'm happy to clarify it instead if someone would like.
…=nagisa

Some "parenthesis" and "parentheses" fixes

"Parenthesis" is the singular (e.g. one `(` or one `)`) and "parentheses" is the plural (multiple `(` or `)`s) and this is not hard to mix up so here are some fixes for that.

Inspired by rust-lang#89958
Make Result::as_mut const

Adding `const` for `Result::as_mut`.

Tracking issue: rust-lang#82814
@rustbot rustbot added the rollup A PR which is a rollup label Oct 17, 2021
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Oct 17, 2021

📌 Commit f044a84 has been approved by matthiaskrgr

@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 Oct 17, 2021
@bors
Copy link
Contributor

bors commented Oct 17, 2021

⌛ Testing commit f044a84 with merge 1f12ac8...

@bors
Copy link
Contributor

bors commented Oct 17, 2021

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 1f12ac8 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 17, 2021
@bors bors merged commit 1f12ac8 into rust-lang:master Oct 17, 2021
@rustbot rustbot added this to the 1.58.0 milestone Oct 17, 2021
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (1f12ac8): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@matthiaskrgr matthiaskrgr deleted the rollup-ikmyhmx branch November 20, 2021 15:04
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