fallback `default` to `None` during ast-lowering for lifetime binder #119042

bvanjoi · 2023-12-17T10:51:05Z

This is another attempt. It has a fallback, setting default to None and emit an error for non-lifetime binders during ast lowering.

r? @compiler-errors

compiler/rustc_parse/src/parser/ty.rs

compiler-errors

Please move this to ast validation or some post-macro-expansion pass.

bvanjoi · 2023-12-18T08:49:17Z

I'm pretty sure that this PR will cause the following code to go from pass to fail: ....

Yes, I agree with this, and it's a great catch.

move this to ast validation

But I'm curious about how we can change the default in GenericParamKind::Type from Some(xxx) to None because the validation is simply a visit and can't modify the ast.

bvanjoi · 2023-12-21T03:37:43Z

I have shifted this process into the AST lowering stage: if the default value is not empty, it will raise an error and fall back to None.

compiler/rustc_ast_lowering/src/lib.rs

bvanjoi · 2023-12-21T12:35:26Z

ci is green. @rustbot ready

compiler-errors

r=me after leaving a comment

compiler/rustc_ast_lowering/src/lib.rs

compiler-errors · 2023-12-25T22:13:43Z

@bors r+

bors · 2023-12-25T22:13:46Z

📌 Commit 873ed19 has been approved by compiler-errors

It is now in the queue for this repository.

bvanjoi · 2023-12-26T09:30:48Z

@rustbot ready

compiler-errors · 2023-12-26T12:56:58Z

@bors r+

bors · 2023-12-26T12:57:01Z

📌 Commit e16efbd has been approved by compiler-errors

It is now in the queue for this repository.

bors · 2023-12-26T14:25:24Z

⌛ Testing commit e16efbd with merge fb3598d...

fallback `default` to `None` during ast-lowering for lifetime binder Fixes rust-lang#118697 This is another attempt. It has a fallback, setting `default` to `None` and emit an error for non-lifetime binders during ast lowering. r? `@compiler-errors`

rust-log-analyzer · 2023-12-26T15:30:03Z

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

Click to see the possible cause of the failure (guessed by this bot)

failures:

---- [rustdoc] tests\rustdoc\inline_cross\sugar-closure-crate-21801.rs stdout ----

error: rustdoc failed!
status: exit code: 0xc00000fd
command: PATH="C:\a\rust\rust\build\x86_64-pc-windows-gnu\stage2\bin;C:\a\rust\rust\build\x86_64-pc-windows-gnu\stage0-bootstrap-tools\x86_64-pc-windows-gnu\release\deps;C:\a\rust\rust\build\x86_64-pc-windows-gnu\stage0\bin;C:\a\rust\rust\ninja;C:\a\rust\rust\mingw64\bin;C:\hostedtoolcache\windows\Python\3.12.1\x64\Scripts;C:\hostedtoolcache\windows\Python\3.12.1\x64;C:\msys64\usr\bin;C:\a\rust\rust\sccache;C:\Program Files\MongoDB\Server\5.0\bin;C:\aliyun-cli;C:\vcpkg;C:\cf-cli;C:\Program Files (x86)\NSIS;C:\tools\zstd;C:\Program Files\Mercurial;C:\hostedtoolcache\windows\stack\2.13.1\x64;C:\cabal\bin;C:\ghcup\bin;C:\mingw64\bin;C:\Program Files\dotnet;C:\Program Files\MySQL\MySQL Server 5.7\bin;C:\Program Files\R\R-4.3.2\bin\x64;C:\SeleniumWebDrivers\GeckoDriver;C:\SeleniumWebDrivers\EdgeDriver;C:\SeleniumWebDrivers\ChromeDriver;C:\Program Files (x86)\sbt\bin;C:\Program Files (x86)\GitHub CLI;C:\Program Files\Git\bin;C:\Program Files (x86)\pipx_bin;C:\npm\prefix;C:\hostedtoolcache\windows\go\1.20.12\x64\bin;C:\hostedtoolcache\windows\Python\3.7.9\x64\Scripts;C:\hostedtoolcache\windows\Python\3.7.9\x64;C:\hostedtoolcache\windows\Ruby\2.5.9\x64\bin;C:\Program Files\OpenSSL\bin;C:\tools\kotlinc\bin;C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk\8.0.392-8\x64\bin;C:\Program Files\ImageMagick-7.1.1-Q16-HDRI;C:\Program Files\Microsoft SDKs\Azure\CLI2\wbin;C:\ProgramData\kind;C:\Program Files\Eclipse Foundation\jdk-8.0.302.8-hotspot\bin;C:\ProgramData\Chocolatey\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\Program Files\PowerShell\7;C:\Program Files\Microsoft\Web Platform Installer;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\160\DTS\Binn;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\ProgramData\chocolatey\lib\pulumi\tools\Pulumi\bin;C:\Program Files\TortoiseSVN\bin;C:\Program Files\CMake\bin;C:\ProgramData\chocolatey\lib\maven\apache-maven-3.8.7\bin;C:\Program Files\Microsoft Service Fabric\bin\Fabric\Fabric.Code;C:\Program Files\Microsoft SDKs\Service Fabric\Tools\ServiceFabricLocalClusterManager;C:\Program Files\nodejs;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\Program Files\GitHub CLI;C:\tools\php;C:\Program Files (x86)\sbt\bin;C:\Program Files\Amazon\AWSCLIV2;C:\Program Files\Amazon\SessionManagerPlugin\bin;C:\Program Files\Amazon\AWSSAMCLI\bin;C:\Program Files (x86)\Google\Cloud SDK\google-cloud-sdk\bin;C:\Program Files (x86)\Microsoft BizTalk Server;C:\Program Files\LLVM\bin;C:\Users\runneradmin\.dotnet\tools;C:\Users\runneradmin\.cargo\bin;C:\Users\runneradmin\AppData\Local\Microsoft\WindowsApps" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-gnu\\stage2\\bin\\rustdoc.exe" "-L" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-gnu\\stage2\\lib\\rustlib\\x86_64-pc-windows-gnu\\lib" "-L" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-gnu\\test\\rustdoc\\inline_cross\\sugar-closure-crate-21801\\auxiliary" "-o" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-gnu\\test\\rustdoc\\inline_cross\\sugar-closure-crate-21801" "--deny" "warnings" "C:\\a\\rust\\rust\\tests\\rustdoc\\inline_cross\\sugar-closure-crate-21801.rs" "-A" "internal_features"
--- stderr -------------------------------

thread 'main' has overflowed its stack
------------------------------------------

bors · 2023-12-26T15:30:36Z

💔 Test failed - checks-actions

bvanjoi · 2023-12-26T15:54:15Z

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

Click to see the possible cause of the failure (guessed by this bot)

This appears to be unrelated to the current change...

fmease · 2023-12-26T16:03:08Z

@bors retry

bors · 2023-12-26T17:30:45Z

⌛ Testing commit e16efbd with merge a75fed7...

bors · 2023-12-26T19:27:43Z

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing a75fed7 to master...

rust-timer · 2023-12-26T20:49:51Z

Finished benchmarking commit (a75fed7): 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
Regressions ❌ (secondary)	2.3%	[2.2%, 2.4%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Cycles

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

Binary size

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

Bootstrap: 670.607s -> 671.414s (0.12%)
Artifact size: 312.44 MiB -> 312.42 MiB (-0.01%)

…ompiler-errors Deny defaults for higher-ranked generic parameters Fixes rust-lang#119489 (incl. rust-lang#119489 (comment)). Partially reverts rust-lang#119042. cc `@bvanjoi` r? `@compiler-errors` or compiler

…ompiler-errors Deny defaults for higher-ranked generic parameters Fixes rust-lang#119489 (incl. rust-lang#119489 (comment)). Partially reverts rust-lang#119042. cc ``@bvanjoi`` r? ``@compiler-errors`` or compiler

…ompiler-errors Deny defaults for higher-ranked generic parameters Fixes rust-lang#119489 (incl. rust-lang#119489 (comment)). Partially reverts rust-lang#119042. cc ```@bvanjoi``` r? ```@compiler-errors``` or compiler

Rollup merge of rust-lang#119494 - fmease:deny-hr-param-defaults, r=compiler-errors Deny defaults for higher-ranked generic parameters Fixes rust-lang#119489 (incl. rust-lang#119489 (comment)). Partially reverts rust-lang#119042. cc ```@bvanjoi``` r? ```@compiler-errors``` or compiler

rustbot assigned compiler-errors Dec 17, 2023

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 Dec 17, 2023

fmease requested changes Dec 17, 2023

View reviewed changes

compiler/rustc_parse/src/parser/ty.rs Outdated Show resolved Hide resolved

compiler-errors reviewed Dec 17, 2023

View reviewed changes

compiler/rustc_parse/src/parser/ty.rs Outdated Show resolved Hide resolved

compiler-errors reviewed Dec 17, 2023

View reviewed changes

compiler-errors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 17, 2023

bvanjoi force-pushed the fix-118697-2 branch from 985c57d to dd8809c Compare December 21, 2023 03:37

bvanjoi commented Dec 21, 2023

View reviewed changes

compiler/rustc_ast_lowering/src/lib.rs Show resolved Hide resolved

rustbot 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 Dec 21, 2023

compiler-errors approved these changes Dec 22, 2023

View reviewed changes

compiler/rustc_ast_lowering/src/lib.rs Show resolved Hide resolved

bvanjoi changed the title ~~fallback default to None during parse late-bound lifetime~~ fallback default to None during ast-loweing for lifetime binder Dec 23, 2023

This comment has been minimized.

# to view

bvanjoi changed the title ~~fallback default to None during ast-loweing for lifetime binder~~ fallback default to None during ast-loweing for lifetime binder Dec 23, 2023

This comment has been minimized.

# to view

bvanjoi changed the title ~~fallback default to None during ast-loweing for lifetime binder~~ fallback default to None during ast-loweing for lifetime binder Dec 23, 2023

This comment has been minimized.

# to view

bvanjoi force-pushed the fix-118697-2 branch from dd8809c to 873ed19 Compare December 23, 2023 07:59

bvanjoi mentioned this pull request Dec 23, 2023

create LifetimeRes::Fresh firstly when lower lifetime binder #119021

Closed

compiler-errors approved these changes Dec 25, 2023

View reviewed changes

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 Dec 25, 2023

fmease changed the title ~~fallback default to None during ast-loweing for lifetime binder~~ fallback default to None during ast-lowering for lifetime binder Dec 26, 2023

bvanjoi force-pushed the fix-118697-2 branch from 873ed19 to e16efbd Compare December 26, 2023 08:13

rustbot 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 Dec 26, 2023

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 Dec 26, 2023

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 Dec 26, 2023

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 Dec 26, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 26, 2023

bors merged commit a75fed7 into rust-lang:master Dec 26, 2023

rustbot added this to the 1.77.0 milestone Dec 26, 2023

This was referenced Jan 1, 2024

ICE: no entry found for key, expr.rs #119489

Closed

Deny defaults for higher-ranked generic parameters #119494

Merged

fallback default to None during ast-lowering for lifetime binder #119042

fallback default to None during ast-lowering for lifetime binder #119042

Uh oh!

Conversation

bvanjoi commented Dec 17, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

compiler-errors left a comment

Choose a reason for hiding this comment

Uh oh!

bvanjoi commented Dec 18, 2023

Uh oh!

bvanjoi commented Dec 21, 2023

Uh oh!

Uh oh!

bvanjoi commented Dec 21, 2023

Uh oh!

compiler-errors left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

compiler-errors commented Dec 25, 2023

Uh oh!

bors commented Dec 25, 2023

Uh oh!

bvanjoi commented Dec 26, 2023

Uh oh!

compiler-errors commented Dec 26, 2023

Uh oh!

bors commented Dec 26, 2023

Uh oh!

bors commented Dec 26, 2023

Uh oh!

rust-log-analyzer commented Dec 26, 2023

Uh oh!

bors commented Dec 26, 2023

Uh oh!

bvanjoi commented Dec 26, 2023

Uh oh!

fmease commented Dec 26, 2023

Uh oh!

bors commented Dec 26, 2023

Uh oh!

bors commented Dec 26, 2023

Uh oh!

rust-timer commented Dec 26, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!

fallback `default` to `None` during ast-lowering for lifetime binder #119042

fallback `default` to `None` during ast-lowering for lifetime binder #119042

bvanjoi commented Dec 17, 2023 •

edited

Loading