Skip to content

liballoc, libunicode: Inline police. #23498

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

Merged
merged 2 commits into from
Mar 19, 2015
Merged

Conversation

pcwalton
Copy link
Contributor

r? @cmr

@emberian
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Collaborator

bors commented Mar 19, 2015

📌 Commit b86fbd0 has been approved by cmr

@@ -210,6 +210,18 @@ impl<T> Arc<T> {
// contents.
unsafe { &**self._ptr }
}

// Non-inlined part of `drop`.
unsafe fn drop_slow(&mut self) {
Copy link
Member

Choose a reason for hiding this comment

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

Should this be #[inline(never)]?

@bors
Copy link
Collaborator

bors commented Mar 19, 2015

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

@pcwalton
Copy link
Contributor Author

r? @cmr

@emberian
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Collaborator

bors commented Mar 19, 2015

📌 Commit 01c125e has been approved by cmr

@bors
Copy link
Collaborator

bors commented Mar 19, 2015

⌛ Testing commit 01c125e with merge 08dd30d...

bors added a commit that referenced this pull request Mar 19, 2015
@@ -41,6 +41,426 @@ pub use normalize::{decompose_canonical, decompose_compatible, compose};
pub use tables::normalization::canonical_combining_class;
pub use tables::UNICODE_VERSION;

#[cfg(stage0)]
Copy link
Member

Choose a reason for hiding this comment

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

Should this have a // SNAP comment?

@bors bors merged commit 01c125e into rust-lang:master Mar 19, 2015
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.

5 participants