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

Rustup to rustc 1.36.0-nightly (13fde05b1 2019-05-03) #4061

Merged
merged 1 commit into from
May 4, 2019
Merged

Conversation

Manishearth
Copy link
Member

Trying to deal with changes from rust-lang/rust#60462

Moved from #4060 so everyone can collab on the rustup branch.

@Manishearth
Copy link
Member Author

oops, forgot to make it a draft. oh well.

@Manishearth Manishearth force-pushed the rustup branch 3 times, most recently from e43eddc to 075f302 Compare May 4, 2019 05:06
@Manishearth
Copy link
Member Author

It builds now

@Manishearth Manishearth changed the title WIP Rustup Rustup to rustc 1.36.0-nightly (13fde05b1 2019-05-03) May 4, 2019
@Manishearth
Copy link
Member Author

Passes tests too. r? @oli-obk @eddyb

@phansch
Copy link
Member

phansch commented May 4, 2019

@bors r+

@bors
Copy link
Contributor

bors commented May 4, 2019

📌 Commit d618637 has been approved by phansch

@bors
Copy link
Contributor

bors commented May 4, 2019

⌛ Testing commit d618637 with merge fc96aa0...

bors added a commit that referenced this pull request May 4, 2019
Rustup to rustc 1.36.0-nightly (13fde05 2019-05-03)

Trying to deal with changes from rust-lang/rust#60462

Moved from #4060 so everyone can collab on the rustup branch.
@bors
Copy link
Contributor

bors commented May 4, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: phansch
Pushing fc96aa0 to master...

@bors bors merged commit d618637 into master May 4, 2019
@flip1995 flip1995 deleted the rustup branch May 4, 2019 09:59
@@ -213,7 +213,7 @@ pub fn match_path_ast(path: &ast::Path, segments: &[&str]) -> bool {
}

/// Gets the definition associated to a path.
pub fn path_to_def(cx: &LateContext<'_, '_>, path: &[&str]) -> Option<def::Def> {
pub fn path_to_res(cx: &LateContext<'_, '_>, path: &[&str]) -> Option<(def::Res)> {
Copy link
Member

Choose a reason for hiding this comment

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

Oops I had forgotten to comment about the strange parens in the return type.

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.

5 participants