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

Return None from Span::join if in different files #47150

Merged
merged 1 commit into from Jan 5, 2018
Merged

Return None from Span::join if in different files #47150

merged 1 commit into from Jan 5, 2018

Conversation

dtolnay
Copy link
Member

@dtolnay dtolnay commented Jan 3, 2018

Fixes #47148. r? @abonander

@dtolnay
Copy link
Member Author

dtolnay commented Jan 3, 2018

r? @jseyfried

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 3, 2018
@abonander
Copy link
Contributor

Can't believe I made that mistake. Maybe something that should be tested? Though you'd need a multi-file project.

@jseyfried
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jan 3, 2018

📌 Commit 2b9add2 has been approved by jseyfried

kennytm added a commit to kennytm/rust that referenced this pull request Jan 4, 2018
@kennytm
Rollup merge of rust-lang#47150 - dtolnay:join, r=jseyfried
e3e54d9 
Return None from Span::join if in different files

Fixes rust-lang#47148. r? @abonander
@kennytm kennytm mentioned this pull request Jan 4, 2018
Closed
kennytm added a commit to kennytm/rust that referenced this pull request Jan 5, 2018
@kennytm
Rollup merge of rust-lang#47150 - dtolnay:join, r=jseyfried
5a5b16a 
Return None from Span::join if in different files

Fixes rust-lang#47148. r? @abonander
@kennytm kennytm mentioned this pull request Jan 5, 2018
Merged
bors added a commit that referenced this pull request Jan 5, 2018
@bors
Auto merge of #47214 - kennytm:rollup, r=kennytm
dd582ac 
Rollup of 10 pull requests

- Successful merges: #47030, #47033, #47110, #47149, #47150, #47160, #47162, #47182, #47198, #47199
- Failed merges:
@bors bors merged commit 2b9add2 into rust-lang:master Jan 5, 2018
@dtolnay dtolnay deleted the join branch May 26, 2018 02:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jseyfried jseyfried

Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@dtolnay @abonander @jseyfried @bors @kennytm