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

make replace_prefix only take &str as arguments #76835

Merged
merged 2 commits into from
Sep 21, 2020

Conversation

matthiaskrgr
Copy link
Member

included the clippy::manual strip commit to not run into merge conflicts later.

r? @lcnr

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 17, 2020
Copy link
Contributor

@pickfire pickfire left a comment

Choose a reason for hiding this comment

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

Nice removing the unnecessary generic.

@matthiaskrgr
Copy link
Member Author

r? @lcnr

@lcnr
Copy link
Contributor

lcnr commented Sep 21, 2020

I thought this was blocked a different PR of yours 😅 if this is not the case

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 21, 2020

📌 Commit 026922a has been approved by lcnr

@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 Sep 21, 2020
@matthiaskrgr
Copy link
Member Author

ah, well I did include the other pr in this one to avoid merge conflicts later down the road

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 21, 2020
Rollup of 10 pull requests

Successful merges:

 - rust-lang#76439 (Add error explanation for E0755)
 - rust-lang#76521 (Fix segfault if pthread_getattr_np fails)
 - rust-lang#76835 (make replace_prefix only take &str as arguments )
 - rust-lang#76967 (Revert adding Atomic::from_mut.)
 - rust-lang#76977 (Add a regression test for copy propagation miscompilation)
 - rust-lang#76981 (liballoc bench use imported path Bencher)
 - rust-lang#76983 (BTreeMap: extra testing & fixed comments)
 - rust-lang#76996 (Fix typo in rustc_lexer docs)
 - rust-lang#77009 (Dogfood total_cmp in the test crate)
 - rust-lang#77012 (update Miri for another bugfix)

Failed merges:

 - rust-lang#76489 (Add explanation for E0756)

r? `@ghost`
@bors bors merged commit 982c4a9 into rust-lang:master Sep 21, 2020
@rustbot rustbot added this to the 1.48.0 milestone Sep 21, 2020
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