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.

Sign up for GitHub

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

Jump to bottom

cleanup: Remove Def::GlobalAsm #52886

Merged
merged 1 commit into from
Aug 7, 2018
Merged

cleanup: Remove Def::GlobalAsm #52886

merged 1 commit into from
Aug 7, 2018

Conversation

petrochenkov
Copy link
Contributor

Global asm is not something that needs to have a Def or DefId.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 30, 2018
@alexcrichton
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Aug 1, 2018

📌 Commit ef6fddd has been approved by alexcrichton

@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 Aug 1, 2018
cramertj added a commit to cramertj/rust that referenced this pull request Aug 2, 2018
@cramertj
Rollup merge of rust-lang#52886 - petrochenkov:noga, r=alexcrichton
a94309c 
cleanup: Remove `Def::GlobalAsm`

Global asm is not something that needs to have a `Def` or `DefId`.
@cramertj cramertj mentioned this pull request Aug 2, 2018
Closed
cramertj added a commit to cramertj/rust that referenced this pull request Aug 2, 2018
@cramertj
Rollup merge of rust-lang#52886 - petrochenkov:noga, r=alexcrichton
ec58d48 
cleanup: Remove `Def::GlobalAsm`

Global asm is not something that needs to have a `Def` or `DefId`.
@cramertj cramertj mentioned this pull request Aug 2, 2018
Closed
@kennytm
Copy link
Member

kennytm commented Aug 3, 2018

@bors r-

Merge conflict.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 3, 2018
@petrochenkov
Copy link
Contributor Author

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Aug 4, 2018

📌 Commit 79289b9 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Aug 4, 2018

🌲 The tree is currently closed for pull requests below priority 12, this pull request will be tested once the tree is reopened

@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 Aug 4, 2018
@bors
Copy link
Contributor

bors commented Aug 6, 2018

⌛ Testing commit 79289b9 with merge 43f4148...

bors added a commit that referenced this pull request Aug 6, 2018
@bors
Auto merge of #52886 - petrochenkov:noga, r=alexcrichton
43f4148 
cleanup: Remove `Def::GlobalAsm`

Global asm is not something that needs to have a `Def` or `DefId`.
@bors
Copy link
Contributor

bors commented Aug 6, 2018

💔 Test failed - status-travis

@bors bors 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 Aug 6, 2018
@rust-highfive
Copy link
Collaborator

The job dist-x86_64-apple-alt 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. 
[00:02:45]       Memory: 8 GB
[00:02:45]       Boot ROM Version: VMW71.00V.0.B64.1704110547
[00:02:45]       Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
[00:02:45]       SMC Version (system): 2.8f0
[00:02:45]       Serial Number (system): VMnQhsrx9K1S
[00:02:45] 
[00:02:45] hw.ncpu: 4
[00:02:45] hw.byteorder: 1234
[00:02:45] hw.memsize: 8589934592
---
[00:54:39] [RUSTC-TIMING] cargo_metadata test:false 10.580
[00:54:40]    Compiling clippy v0.0.212 (file:///Users/travis/build/rust-lang/rust/src/tools/clippy)
[00:54:40]    Compiling clippy_lints v0.0.212 (file:///Users/travis/build/rust-lang/rust/src/tools/clippy/clippy_lints)
[00:54:40]    Compiling url v1.7.1
[00:54:45] error[E0599]: no variant named `GlobalAsm` found for type `rustc::hir::def::Def` in the current scope
[00:54:45]     |
[00:54:45]     |
[00:54:45] 942 |         Def::GlobalAsm(id) => Some(id),
[00:54:45]     |         ^^^^^^^^^^^^^^^^^^ variant not found in `rustc::hir::def::Def`
[00:54:49] error: aborting due to previous error
[00:54:49] 
[00:54:49] For more information about this error, try `rustc --explain E0599`.
[00:54:49] [RUSTC-TIMING] clippy_lints test:false 8.551
[00:54:49] [RUSTC-TIMING] clippy_lints test:false 8.551
[00:54:49] error: Could not compile `clippy_lints`.
[00:54:49] 
[00:54:49] Caused by:
[00:54:49]   process didn't exit successfully: `/Users/travis/build/rust-lang/rust/build/bootstrap/debug/rustc --edition=2018 --crate-name clippy_lints tools/clippy/clippy_lints/src/lib.rs --color always --error-format json --crate-type lib --emit=dep-info,link -C opt-level=2 -C metadata=5a4fa5052c728121 -C extra-filename=-5a4fa5052c728121 --out-dir /Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps --target x86_64-apple-darwin -L dependency=/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps -L dependency=/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/release/deps --extern cargo_metadata=/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/libcargo_metadata-ddc020498027754b.rlib --extern if_chain=/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/libif_chain-d177d129174e74d0.rlib --extern itertools=/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/libitertools-5be0af0e0b808680.rlib --extern lazy_static=/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/liblazy_static-b331bc07e0989c12.rlib --extern matches=/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/libmatches-98a2ea457f2dd030.rlib --extern pulldown_cmark=/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/libpulldown_cmark-8d7cbbaeb42cc719.rlib --extern quine_mc_cluskey=/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/libquine_mc_cluskey-3ed807006ac2e562.rlib --extern regex_syntax=/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/libregex_syntax-42dcc37fdece991f.rlib --extern semver=/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/libsemver-979d71b6d9eaabae.rlib --extern serde=/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/libserde-a4ed9556d08e792e.rlib --extern serde_derive=/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/release/deps/libserde_derive-a01660846e2dc714.dylib --extern toml=/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/libtoml-d8c27d975b5fab61.rlib --extern unicode_normalization=/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/libunicode_normalization-da8b377af04bed79.rlib --extern url=/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/liburl-d4bf32e265b8f5dd.rlib` (exit code: 1)
[00:54:49] warning: build failed, waiting for other jobs to finish...
[00:54:52] error[E0599]: no variant named `GlobalAsm` found for type `rustc::hir::def::Def` in the current scope
[00:54:52]     |
[00:54:52]     |
[00:54:52] 942 |         Def::GlobalAsm(id) => Some(id),
[00:54:52]     |         ^^^^^^^^^^^^^^^^^^ variant not found in `rustc::hir::def::Def`
[00:54:56] error: aborting due to previous error
[00:54:56] 
[00:54:56] For more information about this error, try `rustc --explain E0599`.
[00:54:56] error: Could not compile `clippy_lints`.
---
[00:56:04]    Compiling crossbeam-channel v0.2.3
[00:56:05]    Compiling clippy_lints v0.0.212 (file:///Users/travis/build/rust-lang/rust/src/tools/clippy/clippy_lints)
[00:56:06] [RUSTC-TIMING] crossbeam_channel test:false 1.263
[00:56:06]    Compiling rls-data v0.16.0
[00:56:09] error[E0599]: no variant named `GlobalAsm` found for type `rustc::hir::def::Def` in the current scope
[00:56:09]     |
[00:56:09]     |
[00:56:09] 942 |         Def::GlobalAsm(id) => Some(id),
[00:56:09]     |         ^^^^^^^^^^^^^^^^^^ variant not found in `rustc::hir::def::Def`
[00:56:10] [RUSTC-TIMING] languageserver_types test:false 12.263
[00:56:10]    Compiling rls-vfs v0.4.6
[00:56:10] [RUSTC-TIMING] rls_data test:false 4.263
[00:56:10]    Compiling rayon v1.0.1
---
[01:11:53] travis_fold:start:stage2-clippy-driver
travis_time:start:stage2-clippy-driver
Building stage2 tool clippy-driver (x86_64-apple-darwin)
[01:11:53]    Compiling clippy_lints v0.0.212 (file:///Users/travis/build/rust-lang/rust/src/tools/clippy/clippy_lints)
[01:11:58] error[E0599]: no variant named `GlobalAsm` found for type `rustc::hir::def::Def` in the current scope
[01:11:58]     |
[01:11:58]     |
[01:11:58] 942 |         Def::GlobalAsm(id) => Some(id),
[01:11:58]     |         ^^^^^^^^^^^^^^^^^^ variant not found in `rustc::hir::def::Def`
[01:11:58] 
[01:11:58] error[E0599]: no variant named `GlobalAsm` found for type `rustc::hir::def::Def` in the current scope
[01:11:58]     |
[01:11:58]     |
[01:11:58] 942 |         Def::GlobalAsm(id) => Some(id),
[01:11:58]     |         ^^^^^^^^^^^^^^^^^^ variant not found in `rustc::hir::def::Def`
[01:12:01] error: aborting due to previous error
[01:12:01] 
[01:12:01] For more information about this error, try `rustc --explain E0599`.
[01:12:01] error: aborting due to previous error
---
[01:12:02]    Compiling crates-io v0.16.0
[01:12:06] [RUSTC-TIMING] rustc_data_structures test:false 4.223
[01:12:06]   [RUSTC-TIMING] rustc_data_structures test:false 4.226
[01:12:06]  Compiling rls-analysis v0.14.0
[01:12:06] error[E0599]: no variant named `GlobalAsm` found for type `rustc::hir::def::Def` in the current scope
[01:12:06]     |
[01:12:06]     |
[01:12:06] 942 |         Def::GlobalAsm(id) => Some(id),
[01:12:06]     |         ^^^^^^^^^^^^^^^^^^ variant not found in `rustc::hir::def::Def`
[01:12:07]    Compiling rustc-ap-arena v211.0.0
[01:12:07] [RUSTC-TIMING] arena test:false 0.768
[01:12:07]    Compiling rustc-ap-arena v209.0.0
[01:12:08] [RUSTC-TIMING] arena test:false 0.772
---
$ rvm $(travis_internal_ruby) --fuzzy do ruby -S gem install dpl
Warning, new version of rvm available '1.29.4', you are using older version '1.29.3'.
You can disable this warning with:    echo rvm_autoupdate_flag=0 >> ~/.rvmrc
You can enable  auto-update  with:    echo rvm_autoupdate_flag=2 >> ~/.rvmrc
ERROR:  Could not find a valid gem 'dpl' (>= 0), here is why:
          Unable to download data from https://rubygems.org/ - no such name (https://rubygems.org/specs.4.8.gz)


The command "rvm $(travis_internal_ruby) --fuzzy do ruby -S gem install dpl" failed and exited with 2 during .
Your build has been stopped.

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)

@kennytm kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 6, 2018
@petrochenkov
Copy link
Contributor Author

Spurious?

ERROR: Could not find a valid gem 'dpl' (>= 0), here is why:

      Unable to download data from https://rubygems.org/ - no such name (https://rubygems.org/specs.4.8.gz)

@bors retry

@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 Aug 6, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Aug 7, 2018
@kennytm
Rollup merge of rust-lang#52886 - petrochenkov:noga, r=alexcrichton
2c388e0 
cleanup: Remove `Def::GlobalAsm`

Global asm is not something that needs to have a `Def` or `DefId`.
@kennytm kennytm mentioned this pull request Aug 7, 2018
Merged
bors added a commit that referenced this pull request Aug 7, 2018
@bors
Auto merge of #53150 - kennytm:rollup, r=kennytm
18925de 
Rollup of 10 pull requests

Successful merges:

 - #52885 (Remove some unused method arguments from typeck)
 - #52886 (cleanup: Remove `Def::GlobalAsm`)
 - #53028 (Building librustc_codegen_llvm in a separate directory)
 - #53052 (fixed broken links to char)
 - #53060 (Change rustdoc style so fully qualified name does not overlap src link)
 - #53068 (Rename Executor trait to Spawn)
 - #53093 (Enable macros to pass $:literal to another macro)
 - #53107 (Remove references to `StaticMutex` which got removed a while ago)
 - #53135 (Rust 2018: Disable catch_expr, not targeted for 2018 edition)
 - #53139 (set emit_debug_gdb_scripts: false for riscv32imac-unknown-none target)
@bors bors merged commit 79289b9 into rust-lang:master Aug 7, 2018
@pnkfelix pnkfelix mentioned this pull request Oct 8, 2018
Closed
@petrochenkov petrochenkov deleted the noga branch June 5, 2019 16:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-bors Status: 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.
6 participants
@petrochenkov @rust-highfive @alexcrichton @bors @kennytm @nikomatsakis