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

Rustup #3902

Merged
merged 6 commits into from
Sep 22, 2024
Merged

Rustup #3902

merged 6 commits into from
Sep 22, 2024

Conversation

RalfJung
Copy link
Member

No description provided.

workingjubilee and others added 5 commits September 20, 2024 10:02
Correct outdated object size limit

The comment here about 48 bit addresses being enough was written in 2016 but was made incorrect in 2019 by 5-level paging, and then persisted for another 5 years before being noticed and corrected.

The bolding of the "exclusive" part is merely to call attention to something I missed when reading it and doublechecking the math.

try-job: i686-msvc
try-job: test-various
rustc_expand: remember module `#[path]`s during expansion

During invocation collection, if a module item parsed from a `#[path]` attribute needed a second pass after parsing, its path wouldn't get added to the file path stack, so cycle detection broke. This checks the `#[path]` in such cases, so that it gets added appropriately. I think it should work identically to the case for external modules that don't need a second pass, but I'm not 100% sure.

Fixes #97589
@RalfJung
Copy link
Member Author

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 22, 2024

📌 Commit dd6acaa has been approved by RalfJung

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Sep 22, 2024

⌛ Testing commit dd6acaa with merge e5b28d2...

bors added a commit that referenced this pull request Sep 22, 2024
@RalfJung
Copy link
Member Author

@bors r+ retry

@bors
Copy link
Collaborator

bors commented Sep 22, 2024

📌 Commit f1b1122 has been approved by RalfJung

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Sep 22, 2024

⌛ Testing commit f1b1122 with merge e2c950a...

@bors
Copy link
Collaborator

bors commented Sep 22, 2024

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing e2c950a to master...

@bors bors merged commit e2c950a into rust-lang:master Sep 22, 2024
8 checks passed
@RalfJung RalfJung deleted the rustup branch September 22, 2024 10:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants