-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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
Remove needless lifetimes (rustc) #62039
Conversation
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
☔ The latest upstream changes (presumably #62041) made this pull request unmergeable. Please resolve the merge conflicts. |
You need to rebase on top of master instead. |
c2ef324
to
c8c2f97
Compare
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
☔ The latest upstream changes (presumably #62092) made this pull request unmergeable. Please resolve the merge conflicts. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You should file PRs on seperate repository of submodules if you want to change them
and after they are approved, file other PRs here to update those submodules.
src/libcore/marker.rs
Outdated
@@ -498,7 +498,7 @@ macro_rules! impls{ | |||
/// # end: *const T, | |||
/// # phantom: PhantomData<&'a T>, | |||
/// # } | |||
/// fn borrow_vec<'a, T>(vec: &'a Vec<T>) -> Slice<'a, T> { | |||
/// fn borrow_vec<T>(vec: &Vec<T>) -> Slice<T> { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
-> Slice<'_, T>
r=me on the rustc changes, but you have some accidental submodule changes to remove, and someone else (i.e. from @rust-lang/libs) needs to review the standard library changes (it would be easier if the rustc parts and the std parts were split into two PRs, IMO). |
So just move the changes to |
@jeremystucki Yeah, |
☔ The latest upstream changes (presumably #62119) made this pull request unmergeable. Please resolve the merge conflicts. |
r=me after a rebase |
15f8cee
to
73511fc
Compare
☔ The latest upstream changes (presumably #59722) made this pull request unmergeable. Please resolve the merge conflicts. |
f5d67a3
to
4c221b3
Compare
r? @eddyb |
On mobile, accidentally closed the PR |
@bors r+ |
📌 Commit 4c221b3 has been approved by |
4c221b3
to
88c515d
Compare
@bors r+ |
📌 Commit 88c515d has been approved by |
…eddyb Remove needless lifetimes (rustc)
…, r=alexcrichton Remove needless lifetimes (std) Split from rust-lang#62039
…eddyb Remove needless lifetimes (rustc)
…, r=alexcrichton Remove needless lifetimes (std) Split from rust-lang#62039
…eddyb Remove needless lifetimes (rustc)
Rollup of 17 pull requests Successful merges: - #62039 (Remove needless lifetimes (rustc)) - #62153 (Update the `rust-installer` submodule) - #62173 (rename InterpretCx -> InterpCx) - #62240 (wfcheck: resolve the type-vars in `AdtField` types) - #62249 (Use mem::take instead of mem::replace with default) - #62252 (Update mem::replace example to not be identical to mem::take) - #62258 (syntax: Unsupport `foo! bar { ... }` macros in the parser) - #62268 (Clean up inherent_impls) - #62287 (Use link attributes on extern "C" blocks with llvm-libuwind) - #62295 (miri realloc: do not require giving old size+align) - #62297 (refactor check_for_substitution) - #62316 (When possible without changing semantics, implement Iterator::last in terms of DoubleEndedIterator::next_back for types in liballoc and libcore.) - #62317 (Migrate `compile-pass` annotations to `build-pass`) - #62337 (Fix bucket in CPU usage script) - #62344 (simplify Option::get_or_insert) - #62346 (enable a few more tests in Miri and update the comment for others) - #62351 (remove bogus example from drop_in_place) Failed merges: r? @ghost
…eddyb Remove needless lifetimes (rustc)
Rollup of 16 pull requests Successful merges: - #62039 (Remove needless lifetimes (rustc)) - #62173 (rename InterpretCx -> InterpCx) - #62240 (wfcheck: resolve the type-vars in `AdtField` types) - #62249 (Use mem::take instead of mem::replace with default) - #62252 (Update mem::replace example to not be identical to mem::take) - #62258 (syntax: Unsupport `foo! bar { ... }` macros in the parser) - #62268 (Clean up inherent_impls) - #62287 (Use link attributes on extern "C" blocks with llvm-libuwind) - #62295 (miri realloc: do not require giving old size+align) - #62297 (refactor check_for_substitution) - #62316 (When possible without changing semantics, implement Iterator::last in terms of DoubleEndedIterator::next_back for types in liballoc and libcore.) - #62317 (Migrate `compile-pass` annotations to `build-pass`) - #62337 (Fix bucket in CPU usage script) - #62344 (simplify Option::get_or_insert) - #62346 (enable a few more tests in Miri and update the comment for others) - #62351 (remove bogus example from drop_in_place) Failed merges: r? @ghost
…, r=alexcrichton Remove needless lifetimes (std) Split from rust-lang#62039
…, r=alexcrichton Remove needless lifetimes (std) Split from rust-lang#62039
…, r=alexcrichton Remove needless lifetimes (std) Split from rust-lang#62039
No description provided.