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

[beta] Rollup + backports #47553

Merged
merged 4 commits into from
Jan 19, 2018
Merged

[beta] Rollup + backports #47553

merged 4 commits into from
Jan 19, 2018

Conversation

ehuss and others added 4 commits January 18, 2018 12:05
This fixes an accidental regression rust-lang#46335 where the behavior of
`Path::ends_with` is different from `str::ends_with` (paths operate over
components, strs operate over chars).
This is only applicable when neither of --emit=llvm-ir or --emit=llvm-bc are not
requested.

In case either of these outputs are wanted, but the benefits of such context are
desired as well, -Zfewer_names option provides the same functionality regardless
of the outputs requested.
We got rust-lang#47396 merged but it looks like rcs failed to deploy the beta because
when it tried to calculate the beta version its cwd was different. Let's try to
fix this bug and fix auto-deploy by explicitly setting the `current_dir` for git
commands.
@rust-highfive
Copy link
Collaborator

r? @estebank

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

@alexcrichton
Copy link
Member Author

@bors: r+ p=5

(beta backports)

@bors
Copy link
Contributor

bors commented Jan 18, 2018

📌 Commit cbfb985 has been approved by alexcrichton

@alexcrichton alexcrichton added this to the 1.24 milestone Jan 18, 2018
@kennytm kennytm added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 18, 2018
@bors
Copy link
Contributor

bors commented Jan 18, 2018

⌛ Testing commit cbfb985 with merge 1262787...

bors added a commit that referenced this pull request Jan 18, 2018
[beta] Rollup + backports

This is a rollup of two PRs:

* #47546
* #47431

and a backport of two PRs:

* #47505
* #47220
@bors
Copy link
Contributor

bors commented Jan 19, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 1262787 to beta...

@bors bors merged commit cbfb985 into rust-lang:beta Jan 19, 2018
@alexcrichton alexcrichton deleted the beta-next branch January 19, 2018 02:24
@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
Labels
rollup A PR which is a rollup 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.

8 participants