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

Implement Lift using interners instead of in_arena #67791

Merged
merged 4 commits into from
Jan 17, 2020

Conversation

Zoxc
Copy link
Contributor

@Zoxc Zoxc commented Jan 2, 2020

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 2, 2020
@Zoxc
Copy link
Contributor Author

Zoxc commented Jan 2, 2020

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion

@bors
Copy link
Contributor

bors commented Jan 2, 2020

⌛ Trying commit bd9ef8c with merge 5071cca...

bors added a commit that referenced this pull request Jan 2, 2020
Implement Lift using interners instead of in_arena

r? @eddyb
cc @cjgillot
@@ -137,6 +137,20 @@ impl<K: Eq + Hash + Copy> ShardedHashMap<K, ()> {
}
}

pub unsafe trait IntoPointer {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Documenting the proof obligations would be good.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll just make it safe instead =P

@bors
Copy link
Contributor

bors commented Jan 2, 2020

☀️ Try build successful - checks-azure
Build commit: 5071cca (5071cca24b3e6fe87b1afc16563e9dcf98d18f7a)

@rust-timer
Copy link
Collaborator

Queued 5071cca with parent 0ec3706, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit 5071cca, comparison URL.

@bors
Copy link
Contributor

bors commented Jan 11, 2020

☔ The latest upstream changes (presumably #68115) made this pull request unmergeable. Please resolve the merge conflicts.

@@ -123,6 +123,9 @@ macro_rules! arena_types {
[few] inferred_outlives_crate: rustc::ty::CratePredicatesMap<'tcx>,
[] upvars: rustc_data_structures::fx::FxIndexMap<rustc_hir::HirId, rustc_hir::Upvar>,

// Interned types
[] tys: rustc::ty::TyS<$tcx>,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, so we're not using the DroplessArena for these anymore?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We do, but TyS is not Copy, so we have to declare it.

assoc_name: ast::Ident,
span: Span,
is_equality: Option<String>,
is_equality: impl Fn() -> Option<String>,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Am I missing something, or are the changes in this file unrelated?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I stumbled into this since I broke Lift while working on this PR. There's more cases still where we print types without using them.

@eddyb
Copy link
Member

eddyb commented Jan 15, 2020

r=me with #67791 (comment) explained or resolved

@eddyb
Copy link
Member

eddyb commented Jan 16, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Jan 16, 2020

📌 Commit f4968c8 has been approved by eddyb

@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 16, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jan 17, 2020
Implement Lift using interners instead of in_arena

r? @eddyb
cc @cjgillot
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jan 17, 2020
Implement Lift using interners instead of in_arena

r? @eddyb
cc @cjgillot
bors added a commit that referenced this pull request Jan 17, 2020
Rollup of 4 pull requests

Successful merges:

 - #66564 (Document unsafe blocks in core::{cell, str, sync})
 - #67791 (Implement Lift using interners instead of in_arena)
 - #68278 ([self-profiler] Add example to `-Z help` to turn on query key recording)
 - #68300 (Allow added string.insert benchmarks to compile)

Failed merges:

r? @ghost
@bors bors merged commit f4968c8 into rust-lang:master Jan 17, 2020
@Zoxc Zoxc deleted the lift-interning branch January 17, 2020 19:43
@Zoxc Zoxc mentioned this pull request Jan 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

6 participants