Skip to content

[beta] backports#103316

Merged
bors merged 13 commits intorust-lang:betafrom
cuviper:beta-next
Oct 21, 2022
Merged

[beta] backports#103316
bors merged 13 commits intorust-lang:betafrom
cuviper:beta-next

Conversation

@cuviper
Copy link
Member

@cuviper cuviper commented Oct 20, 2022 •
edited
Loading

r? @ghost

compiler-errors and others added 11 commits October 20, 2022 11:30
@compiler-errors @cuviper
Better binder treatment
f2dd585 
(cherry picked from commit 83e6128)
@Urgau @cuviper
Add missing space between notable trait tooltip and where clause
45b953a 
(cherry picked from commit e214385)
@saethlin @cuviper
Avoid defensive re-initialization of the BufReader buffer
de7a6e5 
(cherry picked from commit 95ae993)
@nbdd0121 @cuviper
Ensure enum cast moves
f66eca1 
(cherry picked from commit de0396c)
@nbdd0121 @cuviper
Add test for issue 102389
8c36d46 
(cherry picked from commit f1452fc)
@nbdd0121 @cuviper
Bless tests
b4ad734 
(cherry picked from commit 247da7b)
@nbdd0121 @cuviper
Fix test
7539bc3 
(cherry picked from commit 4a25a49)
@nnethercote @cuviper
Tweak deriving-all-codegen.rs.
8f1050e 
To include some `Option<>` fields of different types in a single enum.
The test output is currently buggy, but the next commit will fix that.

(cherry picked from commit dfa9d5c)
@nnethercote @cuviper
Fix TyKind::is_simple_path.
692bc5b 
PR rust-lang#98758 introduced code to avoid redundant assertions in derived code
like this:
```
let _: ::core::clone::AssertParamIsClone<u32>;
let _: ::core::clone::AssertParamIsClone<u32>;
```
But the predicate `is_simple_path` introduced as part of this failed to
account for generic arguments. Therefore the deriving code erroneously
considers types like `Option<bool>` and `Option<f32>` to be the same.

This commit fixes `is_simple_path`.

Fixes rust-lang#103157.

(cherry picked from commit 9a23f60)
@spastorino @cuviper
Extract orig_opt_local_def_id as a function
2396c20 
(cherry picked from commit fb54758)
@spastorino @cuviper
Do anonymous lifetimes remapping correctly for nested rpits
5dbca91 
(cherry picked from commit 49ce8a2)
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Oct 20, 2022
@rustbot
Copy link
Collaborator

rustbot commented Oct 20, 2022

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@ehuss
Copy link
Contributor

ehuss commented Oct 20, 2022

@cuviper Can you also include #103303?

@weihanglo @cuviper
[beta] Update cargo
b1fb60e 
1 commits in 082503982ea0fb7a8fd72210427d43a2e2128a63..4bc8f24d3e899462e43621aab981f6383a370365
2022-09-13 17:49:38 +0000 to 2022-10-20 06:00:42 +0000

- [BETA-1.65] Fix deadlock when build scripts are waiting for input on stdin (rust-lang/cargo#11257)
@ehuss ehuss mentioned this pull request Oct 20, 2022
Closed
@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Oct 20, 2022
@rustbot
Copy link
Collaborator

rustbot commented Oct 20, 2022

Some changes occurred in src/tools/cargo

cc @ehuss

@cuviper
Copy link
Member Author

cuviper commented Oct 20, 2022

@bors r+ rollup=never p=1

@bors
Copy link
Collaborator

bors commented Oct 20, 2022

📌 Commit 731bbc8 has been approved by cuviper

It is now in the queue for this repository.

@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 20, 2022
@bors
Copy link
Collaborator

bors commented Oct 21, 2022

⌛ Testing commit 731bbc8 with merge a317055...

@bors
Copy link
Collaborator

bors commented Oct 21, 2022

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing a317055 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 21, 2022
@bors bors merged commit a317055 into rust-lang:beta Oct 21, 2022
@rustbot rustbot added this to the 1.65.0 milestone Oct 21, 2022
@cuviper cuviper mentioned this pull request Oct 21, 2022
Merged
@cuviper cuviper deleted the beta-next branch March 2, 2023 18:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.65.0

Development

Successfully merging this pull request may close these issues.