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.

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

Transition rustdoc to 2018 edition #58115

Merged
merged 1 commit into from
Feb 9, 2019
Merged

Transition rustdoc to 2018 edition #58115

merged 1 commit into from
Feb 9, 2019

Conversation

h-michael
Copy link
Contributor

Transitions rustdoc to Rust 2018; cc #58099

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 3, 2019
@h-michael
Copy link
Contributor Author

r? @Centril

@rust-highfive rust-highfive assigned Centril and unassigned alexcrichton Feb 3, 2019
@Centril
Copy link
Contributor

Centril commented Feb 5, 2019

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 5, 2019

📌 Commit 958828c779efdf85d4940ebe770a163f7087de00 has been approved by Centril

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 5, 2019
@@ -10,6 +12,6 @@
// See src/rustc/rustc.rs for the corresponding rustc settings.
extern {}

extern crate rustdoc;
use rustdoc;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this actually needed? thanks to uniform paths line 17 should Just Work, no?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@kennytm
Copy link
Member

kennytm commented Feb 7, 2019

@bors r=Centril

@bors
Copy link
Contributor

bors commented Feb 7, 2019

📌 Commit a6f2f7f has been approved by Centril

kennytm added a commit to kennytm/rust that referenced this pull request Feb 8, 2019
Transition rustdoc to 2018 edition

Transitions rustdoc to Rust 2018; cc rust-lang#58099
Centril added a commit to Centril/rust that referenced this pull request Feb 8, 2019
Transition rustdoc to 2018 edition

Transitions rustdoc to Rust 2018; cc rust-lang#58099
bors added a commit that referenced this pull request Feb 9, 2019
Rollup of 18 pull requests

Successful merges:

 - #58091 (Transition compiletest to Rust 2018)
 - #58115 (Transition rustdoc to 2018 edition)
 - #58120 (Transition build_helper to 2018 edition)
 - #58222 (librustc_allocator => 2018)
 - #58233 (librustc_save_analysis => 2018)
 - #58245 (librustc_lint => 2018)
 - #58247 (librustc_passes => 2018)
 - #58251 (Transition librustc_traits to 2018 edition)
 - #58255 (librustc_metadata => 2018)
 - #58256 (librustc_cratesio_shim => 2018)
 - #58257 (librustc_target => 2018)
 - #58259 (librustc_codegen_utils => 2018)
 - #58260 (librustc_borrowck => 2018)
 - #58261 (librustc_incremental => 2018)
 - #58265 (librustc_mir => 2018)
 - #58275 (libcore, liballoc: disable tests in Miri)
 - #58285 (error_index_generator => 2018)
 - #58312 (librustc_data_structures => 2018)

Failed merges:

r? @ghost
@bors bors merged commit a6f2f7f into rust-lang:master Feb 9, 2019
@h-michael h-michael deleted the rustdoc-2018 branch February 9, 2019 04:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants