Rollup of stuff (take 2) by Manishearth · Pull Request #21698 · rust-lang/rust

Manishearth · 2015-01-27T18:46:52Z

This should work now.

Removes min-width rule from body so that the page does not scroll horizontally on mobile displays; hides out-of-band information.

Lifetime elision with two input references is not clear. Closesrust-lang#21284

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

See 579eb24

Fixesrust-lang#21665

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?

…r=alexcrichton Cleanup mention of uint, use usize/us instead. This includes the example `println!("{}", 2u * x);`

@steveklabnik

Fixesrust-lang#21665 r? @steveklabnik

eddyb · 2015-01-27T23:08:53Z

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

See 579eb24

Manishearth · 2015-01-27T23:48:51Z

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

emberian · 2015-01-27T23:53:29Z

@bors r+ 249c29f

bors · 2015-01-28T02:22:10Z

⌛ Testing commit 249c29f with merge ee5fb94...

This should work now.

bors · 2015-01-28T03:59:13Z

💔 Test failed - auto-win-64-opt

alexcrichton · 2015-01-28T03:59:53Z

@bors: retry

bors · 2015-01-28T07:32:50Z

☔ Merge conflict

richo · 2015-01-28T07:34:17Z

oof :(

Manishearth · 2015-01-28T08:04:20Z

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 · 2015-01-28T16:34:06Z

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 · 2015-01-28T17:36:05Z

@bors: r+ c7c7d64 p=10

bors · 2015-01-28T17:44:25Z

⌛ Testing commit c7c7d64 with merge 9cc35d7...

Conflicts: src/libcollections/slice.rs src/libcore/nonzero.rs src/libcore/ops.rs

alexcrichton · 2015-01-28T18:04:15Z

@bors: r+ c709ed2 rollup p=10

alexcrichton · 2015-01-28T18:39:27Z

@bors: p=10

alexcrichton · 2015-01-28T18:39:40Z

@bors: rollup-

This should work now.

bors · 2015-01-28T18:55:25Z

⌛ Testing commit c709ed2 with merge ee0be3b...

bors · 2015-01-28T21:31:53Z

☀️ 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

fix: Fix scrutinee expr indent for replace_if_let_with_match

GuillaumeGomezand others added 30 commits January 24, 2015 13:58

Add Hash trait to NonZero type
5ab1405

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.

fix wrong link
ac3b4b8

Add example for Lifetime Elision with two inputs
a0ed0f3
Lifetime elision with two input references is not clear. Closesrust-lang#21284

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

bench: this file has not compiled at least since March last year
f1c22a0
See 579eb24

Add on_unimplemented note to Index
6a90eca

Fix broken links in TRPL→More Strings
8e2a44a
Fixesrust-lang#21665

add split_off method to vec with tests
b93843e

cleanup depricated uint in rand mod and rand os
23fd8ca

Don't use if we can avoid it
ac285d5

Add examples to documentation of SliceExt methods
b8b52d6

Correct a typo in a deprecation warning
ebd2d8d

Fix PEP8 in gdb pretty printer
6af3603

Fix PEP8 in get-snapshot
f230683

make get-snapshot externally usable
958dea1

Fix PEP8 in lldb_batchmode.py
f697a06

Fix PEP8 in lldb_rust_formatters.py
2822bc5

Fix PEP8 in make-win-dist
04408fa

Fix PEP8 in maketest
58d03ad

Fix PEP8 in snapshot.py
ab0081a

Fix PEP8 in sugarise-doc-comments
f7509df

Fix PEP8 for check-summary.py
91928dd

Fix PEP8 for errorck
7faffbe

Fix PEP8 for extract_grammar
888a149

Fix PEP8 for generate-keyword-tests
bbb2871

Fix PEP8 for htmldocck
109a6bc

Fix PEP8 for latest-unix-snaps.py
a4ab5e5

Manishearth added 3 commits January 28, 2015 04:34

Rollup merge ofrust-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?

Rollup merge ofrust-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);`

Rollup merge ofrust-lang#21667- nagisa:sbook-links, r=Gankro
78567f1
Fixesrust-lang#21665 r? @steveklabnik

Manishearth force-pushed the rollup branch from f93e839 to 78567f1Compare January 27, 2015 23:08

Rollup merge ofrust-lang#21666- tshepang:rm-unloved-file, r=brson
249c29f
See 579eb24

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

Merge remote-tracking branch 'origin/master' into rollup
c709ed2
Conflicts: src/libcollections/slice.rs src/libcore/nonzero.rs src/libcore/ops.rs

Manishearth force-pushed the rollup branch from c7c7d64 to c709ed2Compare January 28, 2015 18:01

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

bors merged commit c709ed2 into rust-lang:masterJan 28, 2015

Centril added the rollup A PR which is a rollup label Oct 2, 2019

lnicola pushed a commit to lnicola/rust that referenced this pull request Feb 28, 2026
Merge pull requestrust-lang#21698from A4-Tacks/indent-iflet-with-match
f7e81f5
fix: Fix scrutinee expr indent for replace_if_let_with_match

Uh oh!

Uh oh!

Conversation

Manishearth commented Jan 27, 2015

Uh oh!

eddyb commented Jan 27, 2015

Uh oh!

Manishearth commented Jan 27, 2015

Uh oh!

emberian commented Jan 27, 2015

Uh oh!

bors commented Jan 28, 2015

Uh oh!

bors commented Jan 28, 2015

Uh oh!

alexcrichton commented Jan 28, 2015

Uh oh!

bors commented Jan 28, 2015

Uh oh!

richo commented Jan 28, 2015

Uh oh!

Manishearth commented Jan 28, 2015

Uh oh!

alexcrichton commented Jan 28, 2015

Uh oh!

alexcrichton commented Jan 28, 2015

Uh oh!

bors commented Jan 28, 2015

Uh oh!

alexcrichton commented Jan 28, 2015

Uh oh!

alexcrichton commented Jan 28, 2015

Uh oh!

alexcrichton commented Jan 28, 2015

Uh oh!

bors commented Jan 28, 2015

Uh oh!

bors commented Jan 28, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants