Skip to content

Rollup of 9 pull requests #101946

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

Merged
merged 22 commits into from
Sep 17, 2022
Merged

Rollup of 9 pull requests #101946

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
705a766
array docs - advertise how to get array from slice
Sep 11, 2022
1ec92c8
rustdoc: add test cases for turning ``[Vec<T>]`` into ``[`Vec<T>`]``
notriddle Sep 14, 2022
44506f3
add note for `layout_of` when query depth overflows
SparrowLii Sep 14, 2022
89fd6ae
correct span, add help message and add UI test when query depth overf…
SparrowLii Sep 15, 2022
9286c3c
Update stdarch
wesleywiser Sep 15, 2022
532e3a5
Allow building `rust-analyzer-proc-macro-srv` as a standalone tool
WaffleLapkin Sep 15, 2022
9c3c88c
Use `builder.sysroot(...)` instead of a hack
WaffleLapkin Sep 16, 2022
1c65997
Create new CSS variables for links color
GuillaumeGomez Sep 16, 2022
5d449a0
Add GUI test for links colors
GuillaumeGomez Sep 16, 2022
9995029
Remove the allow-list for dynamic linking of LLVM tools
chriswailes Sep 13, 2022
b72de9b
rustdoc: clean up CSS for All Items and All Crates lists
notriddle Sep 16, 2022
a87a883
rustdoc: update test case for All Crates page
notriddle Sep 16, 2022
d1291dc
Improve handing of env vars during bootstrap process
chriswailes Sep 13, 2022
00d88bd
Rollup merge of #101672 - idigdoug:array_try_into, r=Mark-Simulacrum
matthiaskrgr Sep 17, 2022
ec61047
Rollup merge of #101781 - chriswailes:dynamic-llvm-on-musl, r=jyn514
matthiaskrgr Sep 17, 2022
9c32773
Rollup merge of #101783 - chriswailes:env-vars, r=jyn514
matthiaskrgr Sep 17, 2022
4757d2d
Rollup merge of #101801 - SparrowLii:query_depth_note, r=estebank
matthiaskrgr Sep 17, 2022
030f453
Rollup merge of #101824 - notriddle:notriddle/html-as-generics-intra-…
matthiaskrgr Sep 17, 2022
92d8bf9
Rollup merge of #101861 - wesleywiser:update_stdarch, r=Amanieu
matthiaskrgr Sep 17, 2022
179fd13
Rollup merge of #101873 - WaffleLapkin:x-build-proc-macro-srv, r=jyn514
matthiaskrgr Sep 17, 2022
9702c6c
Rollup merge of #101918 - notriddle:notriddle/all, r=GuillaumeGomez
matthiaskrgr Sep 17, 2022
1f31bee
Rollup merge of #101934 - GuillaumeGomez:theme-links-cleanup, r=notri…
matthiaskrgr Sep 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use builder.sysroot(...) instead of a hack
  • Loading branch information
@WaffleLapkin
WaffleLapkin committed Sep 16, 2022
commit 9c3c88c94563ed9c42b7c6549c89e5fc8cc5615e
8 changes: 2 additions & 6 deletions src/bootstrap/tool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,13 +778,9 @@ impl Step for RustAnalyzerProcMacroSrv {
source_type: SourceType::InTree,
})?;

// Copy `rust-analyzer-proc-macro-srv` to `build/triple/stageN/libexec/`
// Copy `rust-analyzer-proc-macro-srv` to `<sysroot>/libexec/`
// so that r-a can use it.
let libexec_path = builder
.out
.join(&*builder.config.build.triple)
.join(format!("stage{}", self.compiler.stage))
.join("libexec");
let libexec_path = builder.sysroot(self.compiler).join("libexec");
t!(fs::create_dir_all(&libexec_path));
builder.copy(&path, &libexec_path.join("rust-analyzer-proc-macro-srv"));

Expand Down