Skip to content

Rollup of PRs in the queue; Saturday #24009

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 34 commits into from
Apr 4, 2015
Merged

Conversation

Manishearth
Copy link
Member

No description provided.

carloslfu and others added 9 commits April 1, 2015 10:16
Validate if the description is available in the rawSearchIndex
The existing impl had the too-strong requirement of `Clone`, when only
`ToOwned` was needed.
MacOS X does not ship with Java installed by default. Instead it
includes binary stubs that upon execution pop up a message suggesting
the installation of the JDK.

Since `javac` is only used when `antlr4` is available, it is possible
to work around the popup by only probing for `javac` if `antlr4` has
been successfully detected (in which case the JDK is probably already
installed on the system).

Fixes rust-lang#23138.
@Manishearth
Copy link
Member Author

@bors: r+ p=20

@rust-highfive
Copy link
Contributor

r? @pnkfelix

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

@bors
Copy link
Collaborator

bors commented Apr 3, 2015

📌 Commit b104d70 has been approved by Manishearth

This was brought up in IRC by a confused reader.
bors added a commit that referenced this pull request Apr 3, 2015
@bors
Copy link
Collaborator

bors commented Apr 3, 2015

⌛ Testing commit b104d70 with merge f77cb26...

@bors
Copy link
Collaborator

bors commented Apr 3, 2015

💔 Test failed - auto-win-64-nopt-t

@dhuseby
Copy link

dhuseby commented Apr 4, 2015

It's my fault. I broke that test. I just fixed it in #23976

 The existing impl had the too-strong requirement of `Clone`, when only
`ToOwned` was needed.
…excrichton

 MacOS X does not ship with Java installed by default. Instead it
includes binary stubs that upon execution pop up a message suggesting
the installation of the JDK.

Since `javac` is only used when `antlr4` is available, it is possible
to work around the popup by only probing for `javac` if `antlr4` has
been successfully detected (in which case the JDK is probably already
installed on the system).

Fixes rust-lang#23138.
 Validate if the description is available in the rawSearchIndex
 Won't make it for beta, but it's rust-packaging that matters.

r? @alexcrichton
…ig, r=alexcrichton

 Until I can figure out the correct way to configure jemalloc for Bitrig, this patch will correctly disable it.  All other build targets remain unchanged.
 Kinda hoped I'd spot something else for this PR, but then didn't.
 This was brought up in IRC by a confused reader.

r? steveklabnik
…veklabnik

 Also: the std_misc feature flag is removed; it's not needed in Beta.

Hat tip to @tshepang in rust-lang#23871

Fixes rust-lang#24023

This PR replaces rust-lang#24024
…ichton

 Default is now beta, add nightly in the unstable section
@Manishearth
Copy link
Member Author

@bors: r+ force

@bors
Copy link
Collaborator

bors commented Apr 4, 2015

📌 Commit 29582d3 has been approved by Manishearth

@bors
Copy link
Collaborator

bors commented Apr 4, 2015

⌛ Testing commit 29582d3 with merge 69cd145...

@Manishearth Manishearth changed the title Rollup of 9 pull requests Rollup of PRs in the queue; Saturday Apr 4, 2015
@bors
Copy link
Collaborator

bors commented Apr 4, 2015

💔 Test failed - auto-mac-64-opt

@Manishearth
Copy link
Member Author

@bors: r+ force

@bors
Copy link
Collaborator

bors commented Apr 4, 2015

📌 Commit b62c110 has been approved by Manishearth

@bors
Copy link
Collaborator

bors commented Apr 4, 2015

⌛ Testing commit b62c110 with merge 6971727...

bors added a commit that referenced this pull request Apr 4, 2015
@bors bors merged commit b62c110 into rust-lang:master Apr 4, 2015
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.