Skip to content

Rollup of 5 pull requests #30278

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 11 commits into from
Dec 9, 2015
Merged

Rollup of 5 pull requests #30278

merged 11 commits into from
Dec 9, 2015

Conversation

steveklabnik
Copy link
Member

GuillaumeGomez and others added 11 commits December 4, 2015 13:19
@GuillaumeGomez
Add E0452 error explanation
67eaa9e
@matklad
DOCS: update reference about paths
c8b7e24
@oli-obk
add tests for ensuring const indexing does not cause compile-time err…
ace6fc3 
…ors in runtime code
@Xmasreturns
Update traits.md
f5a4383 
Changes to readability and some clarifications for beginners
@Xmasreturns
Update traits.md
88c407c
@tshepang
doc: these are just renames, so avoid duplication
33d43c1
@steveklabnik
Rollup merge of rust-lang#30201 - GuillaumeGomez:patch-3, r=Manishearth
24a1633 
r? @Manishearth
@steveklabnik
Rollup merge of rust-lang#30224 - matklad:super-docs, r=steveklabnik
ac2cb1f 
Make clear that `super` may be included in the path several times.

r? @steveklabnik
@steveklabnik
Rollup merge of rust-lang#30261 - oli-obk:add_regression_test, r=pnkf…
7fc9a66 
…elix

see https://github.com/rust-lang/rust/pull/30202/files#r46819188

r? @pnkfelix

the only difference between the tests is that one has the const_indexing feature enabled.
@steveklabnik
Rollup merge of rust-lang#30273 - Xmasreturns:patch-1, r=steveklabnik
1f0f7d6 
Changes to readability and some clarifications for beginners
@steveklabnik
Rollup merge of rust-lang#30274 - tshepang:mere-renames, r=steveklabnik
e78629e
@steveklabnik
Copy link
Member Author

@bors: r+ p=1

@bors
Copy link
Collaborator

bors commented Dec 9, 2015

📌 Commit e78629e has been approved by steveklabnik

@rust-highfive
Copy link
Contributor

r? @alexcrichton

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

@bors
Copy link
Collaborator

bors commented Dec 9, 2015

⌛ Testing commit e78629e with merge 6f95ae6...

bors added a commit that referenced this pull request Dec 9, 2015
@bors
Auto merge of #30278 - steveklabnik:rollup, r=steveklabnik
6f95ae6 
- Successful merges: #30201, #30224, #30261, #30273, #30274
- Failed merges:
@bors
Copy link
Collaborator

bors commented Dec 9, 2015

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt

@bors bors merged commit e78629e into rust-lang:master Dec 9, 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

@alexcrichton alexcrichton

Labels
rollup A PR which is a rollup
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@steveklabnik @bors @rust-highfive @alexcrichton @Centril @GuillaumeGomez @matklad @oli-obk @Xmasreturns @tshepang