Skip to content

Move librustc to 2018 - #58193

Merged
bors merged 1 commit into
rust-lang:masterfrom
mark-i-m:rustc-2018
Feb 7, 2019
Merged

Move librustc to 2018#58193
bors merged 1 commit into
rust-lang:masterfrom
mark-i-m:rustc-2018

Conversation

@mark-i-m

@mark-i-mmark-i-m commented Feb 5, 2019

Copy link
Copy Markdown
Contributor

r? @Centril

Part of #58099

It would be great to get this reviewed quickly to avoid merge conflicts...

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 5, 2019
mark-i-m
mark-i-m commented Feb 5, 2019
View reviewed changes
Comment threadsrc/librustc/lib.rs Outdated

@mark-i-mmark-i-mFeb 5, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I want to draw attention to this ^^^

@rust-highfive

rust-highfive commented Feb 5, 2019

Copy link
Copy Markdown
Contributor

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:0bcab2ff:start=1549389014771070356,finish=1549389017281052021,duration=2509981665
$ 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
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
[00:03:46] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:03:46] tidy error: /checkout/src/librustc/ich/impls_ty.rs:515: line longer than 100 chars
[00:03:48] some tidy checks failed
[00:03:48] [00:03:48] [00:03:48] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:03:48] [00:03:48] [00:03:48] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:03:48] Build completed unsuccessfully in 0:00:45
[00:03:48] Build completed unsuccessfully in 0:00:45
[00:03:48] make: *** [tidy] Error 1
[00:03:48] Makefile:68: recipe for target 'tidy' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:1ae1455f
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Tue Feb 5 17:54:16 UTC 2019
---
travis_time:end:0343485d:start=1549389257427361657,finish=1549389257431950422,duration=4588765
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:02d37264
$ 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:2c063f04
travis_time:start:2c063f04
$ 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:2ef01876
$ 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)

@mark-i-m

mark-i-m commented Feb 5, 2019

Copy link
Copy Markdown
ContributorAuthor

fixed tidy

@Centril

Centril commented Feb 6, 2019

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Feb 6, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit e957ed9 has been approved by Centril

@borsbors 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 Feb 6, 2019
@Centril

Centril commented Feb 6, 2019

Copy link
Copy Markdown
Contributor

@bors p=2

@bors

bors commented Feb 6, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e957ed9 with merge f46c577d72fb355f1734383f2423affcae63e4fa...

@bors

bors commented Feb 6, 2019

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 6, 2019
@mark-i-m

mark-i-m commented Feb 6, 2019

Copy link
Copy Markdown
ContributorAuthor

Ugh looks like a spurious failure (timeout?) of the very last CI task...

@kennytm

kennytm commented Feb 7, 2019

Copy link
Copy Markdown
Member

@bors retry #58160

@borsbors 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 Feb 7, 2019
kennytm added a commit to kennytm/rust that referenced this pull request Feb 7, 2019
@kennytm
Rollup merge ofrust-lang#58193- mark-i-m:rustc-2018, r=Centril
26b157b
Move librustc to 2018
r? @Centril
Part of rust-lang#58099
It would be great to get this reviewed quickly to avoid merge conflicts...
@kennytmkennytm mentioned this pull request Feb 7, 2019
Merged
bors added a commit that referenced this pull request Feb 7, 2019
@bors
Auto merge of#58254- kennytm:rollup, r=kennytm
626e74d
Rollup of 23 pull requests
Successful merges:
- #58118 (Transition libtest to 2018 edition)
- #58119 (libproc_macro => 2018)
- #58123 (Avoid some bounds checks in binary_heap::{PeekMut,Hole})
- #58124 (libsyntax_pos => 2018)
- #58133 (libsyntax_ext => 2018)
- #58136 (Improve error message and docs for non-UTF-8 bytes in stdio on Windows)
- #58156 (update submodule: rust-installer from 27dec6c to ccdc47b)
- #58192 (Do not ICE in codegen when using a extern_type static)
- #58193 (Move librustc to 2018)
- #58210 (Make an assert debug-only in `find_constraint_paths_between_regions`.)
- #58217 (librustc_tsan => 2018)
- #58218 (librustc_msan => 2018)
- #58219 (librustc_asan => 2018)
- #58220 (libprofiler_builtins => 2018)
- #58223 (librustc_lsan => 2018)
- #58225 (librustc_fs_util => 2018)
- #58228 (librustc_plugin => 2018)
- #58236 (librustc_resolve => 2018)
- #58237 (Fix broken grammar in iter::from_fn() docs)
- #58239 (librustc_apfloat => 2018)
- #58240 (librustc_errors => 2018)
- #58241 (librustc_llvm => 2018)
- #58242 (Document the one TyKind that isn't documented)
Failed merges:
- #58185 (Remove images' url to make it work even without internet connection)
r? @ghost
@bors

bors commented Feb 7, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e957ed9 with merge 626e74d...

@bors
bors merged commit e957ed9 into rust-lang:masterFeb 7, 2019
@CentrilCentril mentioned this pull request Feb 11, 2019
Closed
78 tasks
@mark-i-m
mark-i-m deleted the rustc-2018 branch May 25, 2019 02:15
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@CentrilCentril

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@mark-i-m@rust-highfive@Centril@bors@kennytm