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

fix verbatim with upstream dependencies #101806

Closed
wants to merge 2 commits into from

Conversation

belovdv
Copy link
Contributor

@belovdv belovdv commented Sep 14, 2022

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 14, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 14, 2022
compiler/rustc_metadata/src/native_libs.rs Outdated Show resolved Hide resolved
compiler/rustc_metadata/src/native_libs.rs Outdated Show resolved Hide resolved
compiler/rustc_metadata/src/native_libs.rs Outdated Show resolved Hide resolved
src/test/run-make/verbatim/Makefile Outdated Show resolved Hide resolved
@petrochenkov petrochenkov 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 Sep 14, 2022
@rust-log-analyzer

This comment has been minimized.

@belovdv belovdv force-pushed the issue-fix-fn-find_library branch 2 times, most recently from 666cc4d to 68bff9b Compare September 14, 2022 15:21
@belovdv
Copy link
Contributor Author

belovdv commented Sep 14, 2022

@rustbot ready
Current test is likely to fail on some architecture. Maybe forbid rollup?

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

@bors r+ squash rollup=never

@bors
Copy link
Contributor

bors commented Sep 14, 2022

📌 Commit 68bff9b165479533eda358986fd5d10a87272ed5 has been approved by petrochenkov

It is now in the queue for this repository.

@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 Sep 14, 2022
@bors
Copy link
Contributor

bors commented Sep 15, 2022

⌛ Testing commit 68bff9b165479533eda358986fd5d10a87272ed5 with merge b4d89765aa70a0107cb80b553e6b164180160415...

@bors

This comment was marked as resolved.

@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 Sep 15, 2022
@rust-log-analyzer

This comment has been minimized.

@petrochenkov
Copy link
Contributor

The job dist-various-1 failed!

Looks like missing // ignore-cross-compile.
@rustbot author

@rustbot rustbot 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 Sep 15, 2022
@belovdv belovdv force-pushed the issue-fix-fn-find_library branch from 68bff9b to 0e44481 Compare September 18, 2022 08:23
@belovdv
Copy link
Contributor Author

belovdv commented Sep 18, 2022

@rustbot ready

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

@bors r+ squash-

@petrochenkov petrochenkov 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 Sep 19, 2022
@belovdv belovdv force-pushed the issue-fix-fn-find_library branch from d399e4b to 6515270 Compare September 19, 2022 08:16
@belovdv
Copy link
Contributor Author

belovdv commented Sep 19, 2022

@rustbot ready

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

linker.rs doesn't currently add : correctly for verbatim modifiers, it should only add it to sess.target.linker_is_gnu linkers, other linkers (like macos linker from the CI failure) don't support it.

@petrochenkov petrochenkov 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 Sep 19, 2022
@belovdv belovdv force-pushed the issue-fix-fn-find_library branch from 992826b to f55797c Compare September 19, 2022 13:27
@belovdv
Copy link
Contributor Author

belovdv commented Sep 19, 2022

@rustbot ready

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

@bors r+ squash

@bors
Copy link
Contributor

bors commented Sep 19, 2022

📌 Commit f55797c has been approved by petrochenkov

It is now in the queue for this repository.

@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 Sep 19, 2022
@bors
Copy link
Contributor

bors commented Sep 20, 2022

⌛ Testing commit f55797c with merge 8fd6d03...

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 20, 2022
…=petrochenkov

fix verbatim with upstream dependencies

rust-lang#99425 (comment)

r? `@petrochenkov`
@bors
Copy link
Contributor

bors commented Sep 20, 2022

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing 8fd6d03 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 20, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (8fd6d03): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean1 range count2
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
5.7% [5.1%, 6.2%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-5.4% [-5.4%, -5.4%] 1
All ❌✅ (primary) - - 0

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean1 range count2
Regressions ❌
(primary)
3.1% [3.1%, 3.1%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 3.1% [3.1%, 3.1%] 1

Footnotes

  1. the arithmetic mean of the percent change 2

  2. number of relevant changes 2

@klensy
Copy link
Contributor

klensy commented Sep 20, 2022

@bors r+ squash

squash command works bad and shouldn't be used, probably: https://github.com/rust-lang/rust/commits?author=bors
looks like one commit landed separately.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants