Skip to content
This repository has been archived by the owner on Jul 10, 2023. It is now read-only.

Fix linking on Rust versions that unprefix jemalloc #46

Merged
merged 4 commits into from
Feb 22, 2016
Merged

Conversation

SimonSapin
Copy link
Member

Fixes #43, fixes #44.

Review on Reviewable

@SimonSapin
Copy link
Member Author

@bors-servo r+

@bors-servo
Copy link

📌 Commit e7a98e3 has been approved by SimonSapin

@bors-servo
Copy link

⌛ Testing commit e7a98e3 with merge d17c7b4...

bors-servo pushed a commit that referenced this pull request Feb 22, 2016
Fix linking on Rust versions that unprefix jemalloc

Fixes #43, fixes #44.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/heapsize/46)
<!-- Reviewable:end -->
@SimonSapin
Copy link
Member Author

@bors-servo r+

@bors-servo
Copy link

📌 Commit 81db71e has been approved by SimonSapin

@bors-servo
Copy link

⌛ Testing commit 81db71e with merge 5271fb4...

bors-servo pushed a commit that referenced this pull request Feb 22, 2016
Fix linking on Rust versions that unprefix jemalloc

Fixes #43, fixes #44.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/heapsize/46)
<!-- Reviewable:end -->
- "[ $TRAVIS_RUST_VERSION = nightly ] || cargo test --features unstable"
- "[ $TRAVIS_RUST_VERSION = nightly ] || cargo test --manifest-path plugin/Cargo.toml"
- "[ $TRAVIS_RUST_VERSION != nightly ] || cargo test --features unstable"
- "[ $TRAVIS_RUST_VERSION != nightly ] || cargo test --manifest-path plugin/Cargo.toml"
Copy link
Contributor

Choose a reason for hiding this comment

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

This won't test unstable and plugin on nightly-* though, right?

Copy link
Member Author

Choose a reason for hiding this comment

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

Right, but the point of having these two dated version is to test the build script’s version parsing and the linking to je_malloc_usable_size. These versions are not special as far as the unstable feature and the plugin are concerned.

@bors-servo
Copy link

☀️ Test successful - travis

@bors-servo bors-servo merged commit 81db71e into master Feb 22, 2016
This was referenced Feb 22, 2016
@nox nox deleted the je2 branch February 22, 2016 14:47
SimonSapin added a commit to servo/servo that referenced this pull request Oct 18, 2017
We’ve been bitten before by symbol names changing:
servo/heapsize#46
and upstream is planning to stop using jemalloc by default:
rust-lang/rust#33082 (comment)

So use the (relatively) new `#[global_allocator]` attribute
to explicitly select the system allocator on Windows
and jemalloc (now in an external crate) on other platforms.
This choice matches current defaults.
SimonSapin added a commit to servo/servo that referenced this pull request Oct 18, 2017
We’ve been bitten before by symbol names changing:
servo/heapsize#46
and upstream is planning to stop using jemalloc by default:
rust-lang/rust#33082 (comment)

So use the (relatively) new `#[global_allocator]` attribute
to explicitly select the system allocator on Windows
and jemalloc (now in an external crate) on other platforms.
This choice matches current defaults.
SimonSapin added a commit to servo/servo that referenced this pull request Oct 18, 2017
We’ve been bitten before by symbol names changing:
servo/heapsize#46
and upstream is planning to stop using jemalloc by default:
rust-lang/rust#33082 (comment)

So use the (relatively) new `#[global_allocator]` attribute
to explicitly select the system allocator on Windows
and jemalloc (now in an external crate) on other platforms.
This choice matches current defaults.
SimonSapin added a commit to servo/servo that referenced this pull request Oct 18, 2017
We’ve been bitten before by symbol names changing:
servo/heapsize#46
and upstream is planning to stop using jemalloc by default:
rust-lang/rust#33082 (comment)

So use the (relatively) new `#[global_allocator]` attribute
to explicitly select the system allocator on Windows
and jemalloc (now in an external crate) on other platforms.
This choice matches current defaults.
SimonSapin added a commit to servo/servo that referenced this pull request Oct 19, 2017
We’ve been bitten before by symbol names changing:
servo/heapsize#46
and upstream is planning to stop using jemalloc by default:
rust-lang/rust#33082 (comment)

So use the (relatively) new `#[global_allocator]` attribute
to explicitly select the system allocator on Windows
and jemalloc (now in an external crate) on other platforms.
This choice matches current defaults.
bors-servo pushed a commit to servo/servo that referenced this pull request Oct 19, 2017
Stop relying on linking details of std’s default allocator

We’ve been bitten before by symbol names changing: servo/heapsize#46, and upstream is planning to stop using jemalloc by default: rust-lang/rust#33082 (comment)

So use the (relatively) new `#[global_allocator]` attribute to explicitly select the system allocator on Windows and jemalloc (now in an external crate) on other platforms. This choice matches current defaults.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18944)
<!-- Reviewable:end -->
bors-servo pushed a commit to servo/servo that referenced this pull request Oct 19, 2017
Stop relying on linking details of std’s default allocator

We’ve been bitten before by symbol names changing: servo/heapsize#46, and upstream is planning to stop using jemalloc by default: rust-lang/rust#33082 (comment)

So use the (relatively) new `#[global_allocator]` attribute to explicitly select the system allocator on Windows and jemalloc (now in an external crate) on other platforms. This choice matches current defaults.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18944)
<!-- Reviewable:end -->
moz-v2v-gh pushed a commit to mozilla/gecko-dev that referenced this pull request Oct 20, 2017
…t allocator (from servo:jemallocator2); r=nox

We’ve been bitten before by symbol names changing: servo/heapsize#46, and upstream is planning to stop using jemalloc by default: rust-lang/rust#33082 (comment)

So use the (relatively) new `#[global_allocator]` attribute to explicitly select the system allocator on Windows and jemalloc (now in an external crate) on other platforms. This choice matches current defaults.

Source-Repo: https://github.com/servo/servo
Source-Revision: 07e9794306d597afe5d90d192fd32a99572c3cc3

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : c773f809c4f783e63c42218220e7c8c190727e6e
xeonchen pushed a commit to xeonchen/gecko-cinnabar that referenced this pull request Oct 20, 2017
…t allocator (from servo:jemallocator2); r=nox

We’ve been bitten before by symbol names changing: servo/heapsize#46, and upstream is planning to stop using jemalloc by default: rust-lang/rust#33082 (comment)

So use the (relatively) new `#[global_allocator]` attribute to explicitly select the system allocator on Windows and jemalloc (now in an external crate) on other platforms. This choice matches current defaults.

Source-Repo: https://github.com/servo/servo
Source-Revision: 07e9794306d597afe5d90d192fd32a99572c3cc3
aethanyc pushed a commit to aethanyc/gecko-dev that referenced this pull request Oct 27, 2017
…t allocator (from servo:jemallocator2); r=nox

We’ve been bitten before by symbol names changing: servo/heapsize#46, and upstream is planning to stop using jemalloc by default: rust-lang/rust#33082 (comment)

So use the (relatively) new `#[global_allocator]` attribute to explicitly select the system allocator on Windows and jemalloc (now in an external crate) on other platforms. This choice matches current defaults.

Source-Repo: https://github.com/servo/servo
Source-Revision: 07e9794306d597afe5d90d192fd32a99572c3cc3
thomaskrause pushed a commit to korpling/graphannis-malloc_size_of that referenced this pull request Oct 11, 2018
We’ve been bitten before by symbol names changing:
servo/heapsize#46
and upstream is planning to stop using jemalloc by default:
rust-lang/rust#33082 (comment)

So use the (relatively) new `#[global_allocator]` attribute
to explicitly select the system allocator on Windows
and jemalloc (now in an external crate) on other platforms.
This choice matches current defaults.
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified-and-comments-removed that referenced this pull request Oct 2, 2019
…t allocator (from servo:jemallocator2); r=nox

We’ve been bitten before by symbol names changing: servo/heapsize#46, and upstream is planning to stop using jemalloc by default: rust-lang/rust#33082 (comment)

So use the (relatively) new `#[global_allocator]` attribute to explicitly select the system allocator on Windows and jemalloc (now in an external crate) on other platforms. This choice matches current defaults.

Source-Repo: https://github.com/servo/servo
Source-Revision: 07e9794306d597afe5d90d192fd32a99572c3cc3

UltraBlame original commit: 921526150768f9a2e9ba1586a350583f9ad025c9
gecko-dev-updater pushed a commit to marco-c/gecko-dev-comments-removed that referenced this pull request Oct 2, 2019
…t allocator (from servo:jemallocator2); r=nox

We’ve been bitten before by symbol names changing: servo/heapsize#46, and upstream is planning to stop using jemalloc by default: rust-lang/rust#33082 (comment)

So use the (relatively) new `#[global_allocator]` attribute to explicitly select the system allocator on Windows and jemalloc (now in an external crate) on other platforms. This choice matches current defaults.

Source-Repo: https://github.com/servo/servo
Source-Revision: 07e9794306d597afe5d90d192fd32a99572c3cc3

UltraBlame original commit: 921526150768f9a2e9ba1586a350583f9ad025c9
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified that referenced this pull request Oct 2, 2019
…t allocator (from servo:jemallocator2); r=nox

We’ve been bitten before by symbol names changing: servo/heapsize#46, and upstream is planning to stop using jemalloc by default: rust-lang/rust#33082 (comment)

So use the (relatively) new `#[global_allocator]` attribute to explicitly select the system allocator on Windows and jemalloc (now in an external crate) on other platforms. This choice matches current defaults.

Source-Repo: https://github.com/servo/servo
Source-Revision: 07e9794306d597afe5d90d192fd32a99572c3cc3

UltraBlame original commit: 921526150768f9a2e9ba1586a350583f9ad025c9
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

linking issue on trusty with and latest nightly
5 participants