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

rustdoc: Smallish refactor #31967

Merged
merged 6 commits into from
Mar 6, 2016
Merged

rustdoc: Smallish refactor #31967

merged 6 commits into from
Mar 6, 2016

Conversation

mitaa
Copy link
Contributor

@mitaa mitaa commented Feb 29, 2016

This is mostly cleanup of individual code bits and code reuse for clean::Attribute handling.

The only change in behaviour should be that emitted sources are now being recorded and queried when trying to create src-links to local source-files.

r? @alexcrichton

@bors
Copy link
Contributor

bors commented Mar 3, 2016

☔ The latest upstream changes (presumably #31979) made this pull request unmergeable. Please resolve the merge conflicts.

Since we emit the sources beforhand we actually **know** whether we
can safely create src-links to these files and where they are stored.
@mitaa
Copy link
Contributor Author

mitaa commented Mar 3, 2016

(rebased)

}
None => {}
}
cx.tcx_opt().map(|tcx| {
Copy link
Member

Choose a reason for hiding this comment

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

Stylistically we tend to use if let Some(...) for imperative computations rather than .map(..) on Option

Copy link
Member

Choose a reason for hiding this comment

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

This shows up in a number of other places as well, but otherwise 512c5cdc0f340cba2b8fc86436cca49f963912a8 looks like great cleanup!

@alexcrichton
Copy link
Member

Thanks @mitaa! Overall looks like a fantastic refactor to me.

@mitaa
Copy link
Contributor Author

mitaa commented Mar 4, 2016

(updated)

@alexcrichton
Copy link
Member

@bors: r+ 938c8c1

Thanks!

@bors
Copy link
Contributor

bors commented Mar 6, 2016

⌛ Testing commit 938c8c1 with merge 34caf4a...

@bors
Copy link
Contributor

bors commented Mar 6, 2016

💔 Test failed - auto-mac-64-opt

@alexcrichton
Copy link
Member

@bors: retry

On Sat, Mar 5, 2016 at 11:16 PM, bors notifications@github.com wrote:

[image: 💔] Test failed - auto-mac-64-opt
http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/8276


Reply to this email directly or view it on GitHub
#31967 (comment).

bors added a commit that referenced this pull request Mar 6, 2016
This is mostly cleanup of individual code bits and code reuse for `clean::Attribute` handling.

The only change in behaviour should be that emitted sources are now being recorded and queried when trying to create src-links to local source-files.

r? @alexcrichton
@bors
Copy link
Contributor

bors commented Mar 6, 2016

⌛ Testing commit 938c8c1 with merge 21fb3ce...

@bors bors merged commit 938c8c1 into rust-lang:master Mar 6, 2016
@mitaa mitaa deleted the rdoc-refactor branch March 6, 2016 11:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants