Skip to content

Rollup of stuff (take 2) #21698

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 47 commits into from
Jan 28, 2015
Merged

Rollup of stuff (take 2) #21698

merged 47 commits into from
Jan 28, 2015

Conversation

@Manishearth
Copy link
Member

This should work now.

GuillaumeGomez and others added 30 commits January 24, 2015 13:58
@GuillaumeGomez
Add Hash trait to NonZero type
5ab1405
@iKevinY
Improve mobile-friendliness of API docs
1ec13e7 
Removes min-width rule from body so that the page does not scroll
horizontally on mobile displays; hides out-of-band information.
@bombless
fix wrong link
ac3b4b8
@snowe2010
Add example for Lifetime Elision with two inputs
a0ed0f3 
Lifetime elision with two input references is not clear.
Closes rust-lang#21284
@dinfuehr
more-strings.md: repaired links to API
a09c085
fix vim syntastic: --parse-only => -Z parse-only
59c2de1 
when saving .rs files under vim
do not fail to run the syntax checker
error: Unrecognized option: 'parse-only'.

due to this commit
953f294
which removed the deprecated flag --parse-only
cleanup: s/impl Copy/#[derive(Copy)]/g
bff4623
@tshepang
bench: this file has not compiled at least since March last year
f1c22a0 
See 579eb24
@Manishearth
Add on_unimplemented note to Index
6a90eca
@nagisa
Fix broken links in TRPL→More Strings
8e2a44a 
Fixes rust-lang#21665
@JeffBelgum
add split_off method to vec with tests
b93843e
@Victory
cleanup depricated uint in rand mod and rand os
23fd8ca
@Victory
Don't use if we can avoid it
ac285d5
@carols10cents
Add examples to documentation of SliceExt methods
b8b52d6
@carols10cents
Correct a typo in a deprecation warning
ebd2d8d
@richo
Fix PEP8 in gdb pretty printer
6af3603
@richo
Fix PEP8 in get-snapshot
f230683
@richo
make get-snapshot externally usable
958dea1
@richo
Fix PEP8 in lldb_batchmode.py
f697a06
@richo
Fix PEP8 in lldb_rust_formatters.py
2822bc5
@richo
Fix PEP8 in make-win-dist
04408fa
@richo
Fix PEP8 in maketest
58d03ad
@richo
Fix PEP8 in snapshot.py
ab0081a
@richo
Fix PEP8 in sugarise-doc-comments
f7509df
@richo
Fix PEP8 for check-summary.py
91928dd
@richo
Fix PEP8 for errorck
7faffbe
@richo
Fix PEP8 for extract_grammar
888a149
@richo
Fix PEP8 for generate-keyword-tests
bbb2871
@richo
Fix PEP8 for htmldocck
109a6bc
@richo
Fix PEP8 for latest-unix-snaps.py
a4ab5e5
@Manishearth
Rollup merge of rust-lang#21686 - richo:python-fixes, r=alexcrichton
2ac91a3 
While waiting on some builds I started cleaning up the various python bits and pieces.

I'm going to keep poking, want to ping me before the next rollup?
@Manishearth
Rollup merge of rust-lang#21676 - Victory:fix-deprication-in-random, …
1df0300 
…r=alexcrichton

Cleanup mention of uint, use usize/us instead. This includes the example `println!("{}", 2u * x);`
@Manishearth
Rollup merge of rust-lang#21667 - nagisa:sbook-links, r=Gankro
78567f1 
Fixes rust-lang#21665

r? @steveklabnik
@eddyb
Copy link
Member

eddyb commented Jan 27, 2015

@Manishearth You could have just fixed it (see my comment on his PR).

@Manishearth
Copy link
Member Author

@eddyb History rewrites with merge commits are a bit harder to do and the merge commits tend to disappear.

@emberian
Copy link
Contributor

@bors r+ 249c29f

@bors
Copy link
Collaborator

bors commented Jan 28, 2015

⌛ Testing commit 249c29f with merge ee5fb94...

bors added a commit that referenced this pull request Jan 28, 2015
@bors
Auto merge of #21698 - Manishearth:rollup, r=cmr
ee5fb94 
This should work now.
@bors
Copy link
Collaborator

bors commented Jan 28, 2015

💔 Test failed - auto-win-64-opt

@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Collaborator

bors commented Jan 28, 2015

☔ Merge conflict

@richo
Copy link
Contributor

richo commented Jan 28, 2015

oof :(

@Manishearth
Copy link
Member Author

Oh, no. @alexcrichton I seem to have bad luck rebasing these -- what sort of flags besides --preserve-merges do I feed to git rebase?

@alexcrichton
Copy link
Member

I normally actually just run git merge origin/master as rebasing all the PRs is too much of a pain. Failing that git rebase -p should do the trick (to preserve merge commits)

@alexcrichton
Copy link
Member

@bors: r+ c7c7d64 p=10

@bors
Copy link
Collaborator

bors commented Jan 28, 2015

⌛ Testing commit c7c7d64 with merge 9cc35d7...

@Manishearth
Merge remote-tracking branch 'origin/master' into rollup
c709ed2 
Conflicts:
	src/libcollections/slice.rs
	src/libcore/nonzero.rs
	src/libcore/ops.rs
@alexcrichton
Copy link
Member

@bors: r+ c709ed2 rollup p=10

@alexcrichton
Copy link
Member

@bors: p=10

@alexcrichton
Copy link
Member

@bors: rollup-

bors added a commit that referenced this pull request Jan 28, 2015
@bors
Auto merge of #21698 - Manishearth:rollup, r=alexcrichton
ee0be3b 
This should work now.
@bors
Copy link
Collaborator

bors commented Jan 28, 2015

⌛ Testing commit c709ed2 with merge ee0be3b...

@bors
Copy link
Collaborator

bors commented Jan 28, 2015

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-32-nopt-t, auto-win-32-opt, auto-win-64-nopt-t, auto-win-64-opt

@bors bors merged commit c709ed2 into rust-lang:master Jan 28, 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

Reviewers

No reviews

Assignees

@pcwalton pcwalton

Labels

rollup A PR which is a rollup

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.