make replace_prefix only take &str as arguments #76835
Merged
bors merged 2 commits intorust-lang:masterfrom Sep 21, 2020
Merged
make replace_prefix only take &str as arguments #76835bors merged 2 commits intorust-lang:masterfrom
bors merged 2 commits intorust-lang:masterfrom
Conversation
tesuji
reviewed
Sep 17, 2020
lcnr
approved these changes
Sep 17, 2020
pickfire
approved these changes
Sep 18, 2020
Contributor
pickfire
left a comment
There was a problem hiding this comment.
Nice removing the unnecessary generic.
Member
Author
|
r? @lcnr |
Contributor
|
I thought this was blocked a different PR of yours 😅 if this is not the case @bors r+ rollup |
Collaborator
|
📌 Commit 026922a has been approved by |
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`
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
included the clippy::manual strip commit to not run into merge conflicts later.
r? @lcnr