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

Remove needless lifetimes (rustc) #62039

Merged
merged 11 commits into from
Jul 4, 2019

Conversation

jeremystucki
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:22cbbb80:start=1561155001507457737,finish=1561155005433717111,duration=3926259374
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
travis_time:start:test_assembly
Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:04:55] 
[01:04:55] running 9 tests
[01:04:55] iiiiiiiii
[01:04:55] 
[01:04:55]  finished in 0.151
[01:04:55] travis_fold:end:test_assembly

---
travis_time:start:test_debuginfo
Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:05:11] 
[01:05:11] running 122 tests
[01:05:35] .iiiii...i.....i..i...i..i.i.i..i.ii..i.i.....i..i....i..........iiii..........i...ii...i.......ii.i 100/122
[01:05:40] .i.i......iii.i.....ii
[01:05:40] 
[01:05:40]  finished in 29.485
[01:05:40] travis_fold:end:test_debuginfo

---
[01:23:52]    Compiling rustc_data_structures v0.0.0 (/checkout/src/librustc_data_structures)
[01:23:53] error: hidden lifetime parameters in types are deprecated
[01:23:53]   --> src/librustc_data_structures/graph/test.rs:62:42
[01:23:53]    |
[01:23:53] 62 |     fn successors(&self, node: usize) -> <Self as GraphSuccessors>::Iter {
[01:23:53] 
[01:23:55] error: aborting due to previous error
[01:23:55] 
[01:23:55] error: Could not compile `rustc_data_structures`.
[01:23:55] error: Could not compile `rustc_data_structures`.
[01:23:55] 
[01:23:55] To learn more, run the command again with --verbose.
[01:23:55] 
[01:23:55] 
[01:23:55] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--features" "" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "-p" "rustc_data_structures" "--" "--quiet"
[01:23:55] 
[01:23:55] 
[01:23:55] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:23:55] Build completed unsuccessfully in 1:19:04

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 @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Jun 22, 2019

☔ The latest upstream changes (presumably #62041) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jun 22, 2019
@tesuji
Copy link
Contributor

tesuji commented Jun 23, 2019

You need to rebase on top of master instead.

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:03c00924:start=1561313219021875745,finish=1561313221482241957,duration=2460366212
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
travis_time:start:test_assembly
Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:06:49] 
[01:06:49] running 9 tests
[01:06:49] iiiiiiiii
[01:06:49] 
[01:06:49]  finished in 0.156
[01:06:49] travis_fold:end:test_assembly

---
travis_time:start:test_debuginfo
Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:07:06] 
[01:07:06] running 122 tests
[01:07:31] .iiiii...i.....i..i...i..i.i.i..i.ii..i.i.....i..i....i..........iiii..........i...ii...i.......ii.i 100/122
[01:07:36] .i.i......iii.i.....ii
[01:07:36] 
[01:07:36]  finished in 30.434
[01:07:36] travis_fold:end:test_debuginfo

---
[01:28:56]    Compiling syntax v0.0.0 (/checkout/src/libsyntax)
[01:29:01] error: hidden lifetime parameters in types are deprecated
[01:29:01]   --> src/libsyntax/util/parser_testing.rs:23:64
[01:29:01]    |
[01:29:01] 23 | pub fn string_to_parser(ps: &ParseSess, source_str: String) -> Parser {
[01:29:01] 
[01:29:09] error: aborting due to previous error
[01:29:09] 
[01:29:09] error: Could not compile `syntax`.
[01:29:09] error: Could not compile `syntax`.
[01:29:09] 
[01:29:09] To learn more, run the command again with --verbose.
[01:29:09] 
[01:29:09] 
[01:29:09] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--features" "" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "-p" "syntax" "--" "--quiet"
[01:29:09] 
[01:29:09] 
[01:29:09] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:29:09] Build completed unsuccessfully in 1:23:59
---
travis_time:end:03d9c598:start=1561318582755011415,finish=1561318582761247371,duration=6235956
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:048c76a4
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0e4f5bf8
travis_time:start:0e4f5bf8
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:08c22952
$ dmesg | grep -i kill

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 @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Jun 24, 2019

☔ The latest upstream changes (presumably #62092) made this pull request unmergeable. Please resolve the merge conflicts.

Copy link
Contributor

@tesuji tesuji left a 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.

@@ -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> {
Copy link
Contributor

Choose a reason for hiding this comment

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

-> Slice<'_, T>

@eddyb
Copy link
Member

eddyb commented Jun 24, 2019

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).

@jeremystucki
Copy link
Contributor Author

So just move the changes to src/libstd to its own PR?

@eddyb
Copy link
Member

eddyb commented Jun 25, 2019

@jeremystucki Yeah, liballoc, libcore and libstd, they are part of "the standard library".
You can keep the changes to librustc*, libsyntax* and libproc_macro/bridge in a rustc-only PR.

@jeremystucki jeremystucki changed the title Remove needless lifetimes Remove needless lifetimes (rustc) Jun 25, 2019
@bors
Copy link
Contributor

bors commented Jun 25, 2019

☔ The latest upstream changes (presumably #62119) made this pull request unmergeable. Please resolve the merge conflicts.

@eddyb
Copy link
Member

eddyb commented Jun 26, 2019

r=me after a rebase

@bors
Copy link
Contributor

bors commented Jun 30, 2019

☔ The latest upstream changes (presumably #59722) made this pull request unmergeable. Please resolve the merge conflicts.

@jeremystucki jeremystucki force-pushed the needless_lifetimes branch 3 times, most recently from f5d67a3 to 4c221b3 Compare July 1, 2019 10:31
@jeremystucki jeremystucki reopened this Jul 1, 2019
@jeremystucki
Copy link
Contributor Author

r? @eddyb

@jeremystucki
Copy link
Contributor Author

On mobile, accidentally closed the PR

@eddyb
Copy link
Member

eddyb commented Jul 2, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Jul 2, 2019

📌 Commit 4c221b3 has been approved by eddyb

@bors bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 2, 2019
@eddyb
Copy link
Member

eddyb commented Jul 3, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Jul 3, 2019

📌 Commit 88c515d has been approved by eddyb

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 3, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 3, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 3, 2019
…, r=alexcrichton

 Remove needless lifetimes (std)

Split from rust-lang#62039
Centril added a commit to Centril/rust that referenced this pull request Jul 3, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 3, 2019
…, r=alexcrichton

 Remove needless lifetimes (std)

Split from rust-lang#62039
Centril added a commit to Centril/rust that referenced this pull request Jul 3, 2019
bors added a commit that referenced this pull request Jul 3, 2019
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
Centril added a commit to Centril/rust that referenced this pull request Jul 3, 2019
bors added a commit that referenced this pull request Jul 3, 2019
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
@bors bors merged commit 88c515d into rust-lang:master Jul 4, 2019
@jeremystucki jeremystucki deleted the needless_lifetimes branch July 4, 2019 08:41
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Jul 4, 2019
…, r=alexcrichton

 Remove needless lifetimes (std)

Split from rust-lang#62039
Centril added a commit to Centril/rust that referenced this pull request Jul 5, 2019
…, r=alexcrichton

 Remove needless lifetimes (std)

Split from rust-lang#62039
Centril added a commit to Centril/rust that referenced this pull request Jul 5, 2019
…, r=alexcrichton

 Remove needless lifetimes (std)

Split from rust-lang#62039
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.

5 participants