Skip to content

Rollup of 12 pull requests #25735

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 28 commits into from
May 23, 2015
Merged

Rollup of 12 pull requests #25735

merged 28 commits into from
May 23, 2015

Conversation

steveklabnik and others added 28 commits May 21, 2015 11:53
Also, when checking for common gendered words elsewhere, I found one 'he', moved to 'they' as well.

rust-lang#25640 (comment)
Took me a moment to figure out that the appropriate response to
"need program file" was to install the program named "file", not
to think "If I didn't need the program file, why would I be
compiling things?".
The `run` function passed its argument to `msg` via `"$@"`, but `msg`
only printed its first argument. I think the intention was for `msg` to
print all its arguments. (If not, `run` should only `msg "$1"`.)
There are more possible optimizations left (cached length in loops) as
well as some possible bugs (shadowed variables) to fix. This is mostly
syntactic.
I consider that this version has a better reading fluency, instead of having a period between clauses
Also, when checking for common gendered words elsewhere, I found one 'he', moved to 'they' as well.

rust-lang#25640 (comment)
Make the error message about missing dependencies clearer, since "need program file" is pretty confusing, and make full commands get logged, since that seems to have been the intention.
…, r=Gankro

This minimally changes rustdoc's search as described in rust-lang#25167.

Additionally, I also cleaned up some parts of the JS code.

There is one more change I made: After each result for a primitive type, I added "(Overview of primitive type)". This further differentiates the result from the module (previously, the only difference was that the module's link was blue). I'm not this is the way to go (this seems to be the only place where we do this) and it's no problem for me to remove that commit.

![std__str_-_rust](https://cloud.githubusercontent.com/assets/20063/7770589/67e8cb26-0090-11e5-8f99-c2a3af9fa37f.png)

cc @steveklabnik (it concerns docs) and @alexcrichton (who made changes to rustdoc previously)
Reduces pre-trans heap baseline (tested on `fn main() {}`) from 1.2MB to 696kB.
Most of the remaining allocations are used by imported macros.
While it might be possible to also load macros lazily, doing so is non-trivial and this PR doesn't tackle that.
…fackler

fixes rust-lang#25683

I have a very nonscientific measurement of the data via valgrind/massif [here](https://gist.github.com/Manishearth/4c47f15f6835cb3957c4)

I measured the memory usage for both --pretty=expanded and -Z no-trans

It *seems* like there's a 20-25MB decrease during expansion on stage2 librustc; but I'm not quite sure.

r? @eddyb

(have not yet run tests, but it compiles fine, might want to wait before giving r+)

cc @nrc @huon
I consider that this version has a better reading fluency, instead of having a period between clauses
…=brson

Was able to successfully configure.  Building and testing now.
@rust-highfive
Copy link
Contributor

r? @alexcrichton

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

@steveklabnik
Copy link
Member

@bors: r+ p=10000000

@bors
Copy link
Collaborator

bors commented May 23, 2015

📌 Commit a650075 has been approved by steveklabnik

@bors
Copy link
Collaborator

bors commented May 23, 2015

⌛ Testing commit a650075 with merge a33b808...

bors added a commit that referenced this pull request May 23, 2015
@Manishearth
Copy link
Member

Didn't get time between travelling and talk-giving to rollup, thanks for filling in! 😄

@bors bors merged commit a650075 into rust-lang:master May 23, 2015
@oli-obk oli-obk deleted the rollup branch May 23, 2015 19:29
@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.