Skip to content

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

mu001999 and others added 14 commits December 11, 2023 23:24
This might have made sense if the algorithm could use `searchWords`
to skip having to look at `searchIndex`, but since it always
does a substring check on both the stock word and the normalizedName,
it doesn't seem to help performance anyway.
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
…=b-naber

Add test for Apple's `-weak_framework` linker argument

The [`-weak_framework`](https://developer.apple.com/library/archive/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/WeakLinking.html) linker argument can sometimes be useful to reduce startup times, and to link newer frameworks while still having older deployment targets.

So I made a test to ensure that it continues to work.

Discussed in rust-lang#99427.
Remove dead codes in rustc_codegen_gcc

Detected by rust-lang#118257
…Nilstrieb

Add support for `--env` on `tracked_env::var`

Follow-up of rust-lang#118368.
Part of Part of rust-lang#80792.

It adds support of the `--env` option for proc-macros through `tracked_env::var`.

r? `@Nilstrieb`
…=GuillaumeGomez

rustdoc-search: remove parallel searchWords array

This might have made sense if the algorithm could use `searchWords` to skip having to look at `searchIndex`, but since it always does a substring check on both the stock word and the normalizedName, it doesn't seem to help performance anyway.

Profile: http://notriddle.com/rustdoc-html-demo-8/searchwords/index.html
…san68

remove `hex` dependency in bootstrap

First commit removes the `hex` dependency, as we can achieve the same output with the added function, which is very small and simple.

Second commit creates a test module for the helpers util and adds unit tests for multiple helper functions, including `hex_encode`.
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Dec 16, 2023
@GuillaumeGomez
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Dec 16, 2023

📌 Commit 6c50b61 has been approved by GuillaumeGomez

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 Dec 16, 2023
@bors
Copy link
Collaborator

bors commented Dec 16, 2023

⌛ Testing commit 6c50b61 with merge abaf2e8...

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 16, 2023
…llaumeGomez

Rollup of 5 pull requests

Successful merges:

 - rust-lang#118644 (Add test for Apple's `-weak_framework` linker argument)
 - rust-lang#118828 (Remove dead codes in rustc_codegen_gcc)
 - rust-lang#118830 (Add support for `--env` on `tracked_env::var`)
 - rust-lang#119001 (rustdoc-search: remove parallel searchWords array)
 - rust-lang#119020 (remove `hex` dependency in bootstrap)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

The job aarch64-apple failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
test [ui] tests/ui/limits/issue-17913.rs ... ok
test [ui] tests/ui/linkage-attr/common-linkage-non-zero-init.rs ... ok
test [ui] tests/ui/link-section.rs ... ok
test [ui] tests/ui/linkage-attr/incompatible-flavor.rs ... ok
test [ui] tests/ui/linkage-attr/framework.rs#link ... ok
test [ui] tests/ui/linkage-attr/framework.rs#both ... ok
test [ui] tests/ui/linkage-attr/issue-109144.rs ... ok
test [ui] tests/ui/linkage-attr/link-attr-validation-early.rs ... ok
test [ui] tests/ui/linkage-attr/link-attr-validation-late.rs ... ok
test [ui] tests/ui/linkage-attr/link-self-contained-consistency.rs#many ... ok
test [ui] tests/ui/linkage-attr/link-self-contained-consistency.rs#many ... ok
test [ui] tests/ui/linkage-attr/framework.rs#weak ... ok
test [ui] tests/ui/limits/huge-struct.rs ... ok
test [ui] tests/ui/linkage-attr/linkage1.rs ... ignored, ignored when the operating system is macos
test [ui] tests/ui/linkage-attr/linkage2.rs ... ok
test [ui] tests/ui/linkage-attr/linkage3.rs ... ok
test [ui] tests/ui/linkage-attr/linkage3.rs ... ok
test [ui] tests/ui/linkage-attr/linkage-detect-local-generated-name-collision.rs ... ok
test [ui] tests/ui/linkage-attr/unstable-flavor.rs#bpf ... ok
test [ui] tests/ui/linkage-attr/linkage4.rs ... ok
test [ui] tests/ui/linkage-attr/unstable-flavor.rs#ptx ... ok
test [ui] tests/ui/lint-group-denied-lint-allowed.rs ... ok
test [ui] tests/ui/lint-group-forbid-always-trumps-cli.rs ... ok
test [ui] tests/ui/linkage-attr/framework.rs#omit ... FAILED
test [ui] tests/ui/lint/bad-lint-cap.rs ... ok
test [ui] tests/ui/lint/bad-lint-cap2.rs ... ok
test [ui] tests/ui/lint/bad-lint-cap3.rs ... ok
test [ui] tests/ui/lint/bare-trait-objects-path.rs ... ok
---
test [ui] tests/ui/wrong-hashset-issue-42918.rs ... ok

failures:

---- [ui] tests/ui/linkage-attr/framework.rs#omit stdout ----

1 error: linking with `cc` failed: exit status: 1
2    |
3    = note: [linker command]
3    = note: [linker command]
-    = note: ld: warning: search path '$TEST_BUILD_DIR/linkage-attr/framework.omit/auxiliary' not found
-            ld: Undefined symbols:
-              _CFRunLoopGetTypeID, referenced from:
+    = note: ld: warning: directory not found for option '-L$TEST_BUILD_DIR/linkage-attr/framework.omit/auxiliary'
+            Undefined symbols for architecture arm64:
+              "_CFRunLoopGetTypeID", referenced from:
7                  framework::main::HASH in framework.framework.HASH-cgu.0.rcgu.o
+            ld: symbol(s) not found for architecture arm64
8            clang: error: linker command failed with exit code 1 (use -v to see invocation)
10 


The actual stderr differed from the expected stderr.
The actual stderr differed from the expected stderr.
Actual stderr saved to /Users/runner/work/rust/rust/build/aarch64-apple-darwin/test/ui/linkage-attr/framework.omit/framework.omit.stderr
To only update this specific test, also pass `--test-args linkage-attr/framework.rs`


error in revision `omit`: 1 errors occurred comparing output.
status: exit status: 1
command: RUSTC_ICE="0" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2/bin/rustc" "/Users/runner/work/rust/rust/tests/ui/linkage-attr/framework.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/Users/runner/.cargo" "--sysroot" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2" "--target=aarch64-apple-darwin" "--cfg" "omit" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "-C" "prefer-dynamic" "--out-dir" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/test/ui/linkage-attr/framework.omit" "-A" "unused" "-A" "internal_features" "-Crpath" "-Cdebuginfo=0" "-Lnative=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/native/rust-test-helpers" "-L" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/test/ui/linkage-attr/framework.omit/auxiliary"
--- stderr -------------------------------
error: linking with `cc` failed: exit status: 1
   |
   |
   = note: env -u IPHONEOS_DEPLOYMENT_TARGET -u TVOS_DEPLOYMENT_TARGET LC_ALL="C" PATH="/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2/lib/rustlib/aarch64-apple-darwin/bin:/opt/homebrew/lib/ruby/gems/3.0.0/bin:/opt/homebrew/opt/ruby@3.0/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/Users/runner/.cargo/bin:/usr/local/opt/curl/bin:/usr/local/bin:/usr/local/sbin:/Users/runner/bin:/Users/runner/.yarn/bin:/Users/runner/Library/Android/sdk/tools:/Users/runner/Library/Android/sdk/platform-tools:/Library/Frameworks/Python.framework/Versions/Current/bin:/Library/Frameworks/Mono.framework/Versions/Current/Commands:/usr/bin:/bin:/usr/sbin:/sbin:/Users/runner/.dotnet/tools" VSLANG="1033" ZERO_AR_DATE="1" "cc" "-arch" "arm64" "/var/folders/pt/pcptgk8n1jgfqqk0263cpblm0000gn/T/rustcCi6Ikw/symbols.o" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/test/ui/linkage-attr/framework.omit/framework.framework.17ab4582b218217d-cgu.0.rcgu.o" "-L" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/native/rust-test-helpers" "-L" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/test/ui/linkage-attr/framework.omit/auxiliary" "-L" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2/lib/rustlib/aarch64-apple-darwin/lib" "-L" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2/lib/rustlib/aarch64-apple-darwin/lib" "-lstd-44e70665c9772f1d" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2/lib/rustlib/aarch64-apple-darwin/lib/libcompiler_builtins-550a14a24d201f87.rlib" "-lSystem" "-lc" "-lm" "-L" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2/lib/rustlib/aarch64-apple-darwin/lib" "-o" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/test/ui/linkage-attr/framework.omit/framework" "-Wl,-dead_strip" "-nodefaultlibs" "-Wl,-rpath,@loader_path/../../../../stage2/lib/rustlib/aarch64-apple-darwin/lib"
   = note: ld: warning: directory not found for option '-L/Users/runner/work/rust/rust/build/aarch64-apple-darwin/test/ui/linkage-attr/framework.omit/auxiliary'
           Undefined symbols for architecture arm64:
             "_CFRunLoopGetTypeID", referenced from:
                 framework::main::h8acad2a093599f0d in framework.framework.17ab4582b218217d-cgu.0.rcgu.o
           ld: symbol(s) not found for architecture arm64
           clang: error: linker command failed with exit code 1 (use -v to see invocation)

error: aborting due to 1 previous error
------------------------------------------




failures:
    [ui] tests/ui/linkage-attr/framework.rs#omit
test result: FAILED. 15747 passed; 1 failed; 217 ignored; 0 measured; 0 filtered out; finished in 222.58s

Build completed unsuccessfully in 0:18:31
Some tests failed in compiletest suite=ui mode=ui host=aarch64-apple-darwin target=aarch64-apple-darwin

@bors
Copy link
Collaborator

bors commented Dec 16, 2023

💔 Test failed - checks-actions

@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 Dec 16, 2023
@GuillaumeGomez GuillaumeGomez deleted the rollup-bcxuwn7 branch December 16, 2023 23:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc 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