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

Do not filter substs in remap_generic_params_to_declaration_params. #106503

Merged
merged 1 commit into from
Jan 18, 2023

Conversation

cjgillot
Copy link
Contributor

@cjgillot cjgillot commented Jan 5, 2023

The relevant filtering should have been performed by borrowck.

Fixes #105826

r? types

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 5, 2023
@lcnr
Copy link
Contributor

lcnr commented Jan 9, 2023

don't have the context to quickly review this.

r? oli-obk with the hope that it's easier to review for them

@rustbot rustbot assigned oli-obk and unassigned lcnr Jan 9, 2023
@oli-obk
Copy link
Contributor

oli-obk commented Jan 9, 2023

Ah wonderful... I was hoping we could nuke this hack. Your variance PR would resolve this issue correctly, so 👍

@bors r+

@bors
Copy link
Contributor

bors commented Jan 9, 2023

📌 Commit ebd22bf has been approved by oli-obk

It is now in the queue for this repository.

@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 Jan 9, 2023
@oli-obk oli-obk added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 9, 2023
JohnTitor pushed a commit to JohnTitor/rust that referenced this pull request Jan 10, 2023
Do not filter substs in `remap_generic_params_to_declaration_params`.

The relevant filtering should have been performed by borrowck.

Fixes rust-lang#105826

r? types
@Noratrieb
Copy link
Member

Tests moved from src/tests to the tests directory in the root, can you rebase and move them?
@bors r-
@rustbot author

@rustbot rustbot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jan 11, 2023
@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 11, 2023
The relevant filtering should have been performed by borrowck.
@cjgillot cjgillot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 11, 2023
@apiraino
Copy link
Contributor

Beta backport approved as per compiler team on Zulip

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jan 12, 2023
@compiler-errors
Copy link
Member

@bors r=oli-obk p=1

@bors
Copy link
Contributor

bors commented Jan 18, 2023

📌 Commit b7bb8a5 has been approved by oli-obk

It is now in the queue for this repository.

@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 Jan 18, 2023
@bors
Copy link
Contributor

bors commented Jan 18, 2023

⌛ Testing commit b7bb8a5 with merge 7bdc564531393b89f559ff9ac2db865aa30370de...

@bors
Copy link
Contributor

bors commented Jan 18, 2023

💔 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 Jan 18, 2023
@compiler-errors
Copy link
Member

Spurious rustdoc failure

@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 Jan 18, 2023
@bors
Copy link
Contributor

bors commented Jan 18, 2023

⌛ Testing commit b7bb8a5 with merge 6d46b1e...

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
Some tests failed in compiletest suite=rustdoc mode=rustdoc host=x86_64-apple-darwin target=x86_64-apple-darwin

failures:

---- [rustdoc] rust/tests/rustdoc/primitive/no_std.rs stdout ----
thread '[rustdoc] rust/tests/rustdoc/primitive/no_std.rs' panicked at 'called `Result::unwrap()` on an `Err` value: Os { code: 22, kind: InvalidInput, message: "Invalid argument" }', src/tools/compiletest/src/runtest.rs:2352:34


failures:
    [rustdoc] rust/tests/rustdoc/primitive/no_std.rs

@bors
Copy link
Contributor

bors commented Jan 18, 2023

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 6d46b1e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 18, 2023
@bors bors merged commit 6d46b1e into rust-lang:master Jan 18, 2023
@rustbot rustbot added this to the 1.68.0 milestone Jan 18, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (6d46b1e): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
0.6% [0.6%, 0.6%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-4.8% [-4.8%, -4.8%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -2.1% [-4.8%, 0.6%] 2

Cycles

This benchmark run did not return any relevant results for this metric.

@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 19, 2023
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.68.0, 1.67.0 Jan 19, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 20, 2023
…mulacrum

[beta] backport rollup

* Revert "Make nested RPITIT inherit the parent opaque's generics." rust-lang#106759
*  Fix mpsc::SyncSender spinning behavior rust-lang#106701
*  rustdoc: fix outdated lint section of the book rust-lang#106605
*  Do not filter substs in remap_generic_params_to_declaration_params. rust-lang#106503
*  Correct detection of elided lifetimes in impl-trait. rust-lang#106501
*  Bump rust-installer rust-lang#106196
*  Don't panic on stable since miri is not available there rust-lang#105901
@cjgillot cjgillot deleted the remap-nofilter branch January 20, 2023 22:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

regression: non-defining opaque type use in defining scope