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

Add inline attributes for functions used in the query system #70565

Merged
merged 1 commit into from
Apr 9, 2020

Conversation

Zoxc
Copy link
Contributor

@Zoxc Zoxc commented Mar 30, 2020

No description provided.

@rust-highfive
Copy link
Collaborator

r? @davidtwco

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 30, 2020
@@ -51,6 +51,7 @@ pub struct QueryState<CTX: QueryContext, C: QueryCache> {
}

impl<CTX: QueryContext, C: QueryCache> QueryState<CTX, C> {
#[inline]
Copy link
Contributor

Choose a reason for hiding this comment

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

This function is generic, so does it matter?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, #[inline] is an inline hint, while regular generic functions are just available for inlining.

Copy link
Member

@davidtwco davidtwco left a comment

Choose a reason for hiding this comment

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

LGTM, r=me when/if comments are resolved.

@davidtwco
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Apr 8, 2020

📌 Commit 87cdfb6 has been approved by davidtwco

@bors
Copy link
Contributor

bors commented Apr 8, 2020

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

@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 Apr 8, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 9, 2020
Rollup of 7 pull requests

Successful merges:

 - rust-lang#70134 (add basic support of OsStrExt for HermitCore)
 - rust-lang#70565 (Add inline attributes for functions used in the query system)
 - rust-lang#70828 (rustdoc: Don't try to load source files from external crates)
 - rust-lang#70870 (Fix abuses of tykind::err)
 - rust-lang#70906 (Suggest move for closures and async blocks in more cases.)
 - rust-lang#70912 (Do not suggest adding type param when `use` is already suggested)
 - rust-lang#70930 (add tracking issue to `VecDeque::make_contiguous`)

Failed merges:

r? @ghost
@bors bors merged commit 3cae0e4 into rust-lang:master Apr 9, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 18, 2020
perf: Remove inline attribute from `into_vec()`

It was introduced in rust-lang#70565 and is likely related to this perf results: https://perf.rust-lang.org/compare.html?start=1edcfc83c6a08ddc5e63fc652b149baea0236e7c&end=d249d756374737eb014079901ac132f1e1ed905e&stat=instructions:u
Let's check if it's related to that.
r? @wesleywiser could you kick off perf check? I don't think I can do it.
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.

5 participants