Skip to content
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

Rollup of 6 pull requests #36885

Merged
merged 15 commits into from
Oct 1, 2016
Merged

Rollup of 6 pull requests #36885

merged 15 commits into from
Oct 1, 2016

Conversation

Manishearth
Copy link
Member

kallisti5 and others added 15 commits September 30, 2016 13:17
@kallisti5
Haiku: Fix target triplet delimiter
dc9ac88
@GuillaumeGomez
Update E0035 to new error format
d8239e3
@frewsxcv
Migrate Item ➡ ItemType function to method.
c66c453
@frewsxcv
Simplify logic around Context's root_path.
7732e62 
Was previously cached and maintained in the `Context`, which to me seems
overkill.
@GuillaumeGomez
Update E0036 to new error format
4d5e81d
@GuillaumeGomez
Update E0370 to new error format
8ea426a
@solson
Fix RUSTC_VERSION for 'documenting' build stage.
41832f2 
Previously the `env!("RUSTC_VERSION")` requirement would break the
"Documenting rustc_metadata" stage of the rustc build, since that
environment variable is only defined during the main build.
impl Debug for raw pointers to unsized data
ba1a493
@jseyfried
Fix module_to_string.
91e1f24
@Manishearth
Rollup merge of rust-lang#36865 - kallisti5:master, r=brson
3821811 
Haiku: Fix target triplet delimiter
@Manishearth
Rollup merge of rust-lang#36872 - frewsxcv:rustdoc, r=GuillaumeGomez
2e5837a 
A couple refactorings in librustdoc.

None
@Manishearth
Rollup merge of rust-lang#36873 - GuillaumeGomez:e0035_e0036, r=jonat…
e506bfa 
…handturner

Update E0035, E0036 and E0370 to new error format

Fixes rust-lang#35634.
Fixes rust-lang#35206.
Fixes rust-lang#35207.

r? @jonathandturner
@Manishearth
Rollup merge of rust-lang#36877 - solson:rustc-version-build-issue, r…
9e25570 
…=eddyb

Fix RUSTC_VERSION for 'documenting' build stage.

Previously the `env!("RUSTC_VERSION")` requirement would break the "Documenting rustc_metadata" stage of the rustc build, since that environment variable is only defined during the main build.

r? @eddyb
@Manishearth
Rollup merge of rust-lang#36880 - durka:debug-unsized-ptr, r=bluss
987aea5 
impl Debug for raw pointers to unsized data

`?Sized` was missing from these impls for seemingly no reason.

Fixes rust-lang#36870.
@Manishearth
Rollup merge of rust-lang#36882 - jseyfried:fix_36881, r=eddyb
8457ab6 
resolve: fix incorrect code in `module_to_string`

Fixes rust-lang#36881.
r? @nrc or @eddyb
@rust-highfive
Copy link
Collaborator

r? @steveklabnik

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

@Manishearth
Copy link
Member Author

@bors p=5

@Manishearth
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Oct 1, 2016

📌 Commit 8457ab6 has been approved by Manishearth

@bors
Copy link
Contributor

bors commented Oct 1, 2016

⌛ Testing commit 8457ab6 with merge ab38d52...

bors added a commit that referenced this pull request Oct 1, 2016
@bors
Auto merge of #36885 - Manishearth:rollup, r=Manishearth
ab38d52 
Rollup of 6 pull requests

- Successful merges: #36865, #36872, #36873, #36877, #36880, #36882
- Failed merges:
@bors
Copy link
Contributor

bors commented Oct 1, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-rustbuild
Approved by: Manishearth
Pushing ab38d52 to master...

@bors bors merged commit 8457ab6 into rust-lang:master Oct 1, 2016
This was referenced Oct 1, 2016
Merged
Closed
@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

@steveklabnik steveklabnik

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
@Manishearth @rust-highfive @bors @steveklabnik @Centril @kallisti5 @GuillaumeGomez @frewsxcv @solson @jseyfried