Skip to content

Commit 844264a

Browse files
committed
Auto merge of #147675 - lnicola:sync-from-ra, r=lnicola
`rust-analyzer` subtree update Subtree update of `rust-analyzer` to rust-lang/rust-analyzer@6d4b234. Created using https://github.com/rust-lang/josh-sync. r? `@ghost`
2 parents e100792 + 7d93599 commit 844264a

File tree

219 files changed

+11101
-9715
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

219 files changed

+11101
-9715
lines changed

src/bootstrap/src/core/build_steps/tool.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1021,7 +1021,7 @@ impl RustAnalyzer {
10211021
}
10221022

10231023
impl RustAnalyzer {
1024-
pub const ALLOW_FEATURES: &'static str = "rustc_private,proc_macro_internals,proc_macro_diagnostic,proc_macro_span,proc_macro_span_shrink,proc_macro_def_site";
1024+
pub const ALLOW_FEATURES: &'static str = "rustc_private,proc_macro_internals,proc_macro_diagnostic,proc_macro_span,proc_macro_span_shrink,proc_macro_def_site,new_zeroed_alloc";
10251025
}
10261026

10271027
impl Step for RustAnalyzer {

src/tools/rust-analyzer/.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ jobs:
293293
timeout-minutes: 10
294294
env:
295295
FORCE_COLOR: 1
296-
TYPOS_VERSION: v1.28.3
296+
TYPOS_VERSION: v1.38.1
297297
steps:
298298
- name: download typos
299299
run: curl -LsSf https://github.com/crate-ci/typos/releases/download/$TYPOS_VERSION/typos-$TYPOS_VERSION-x86_64-unknown-linux-musl.tar.gz | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin

src/tools/rust-analyzer/.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
RUSTFLAGS: "-D warnings -W unreachable-pub"
1717
RUSTUP_MAX_RETRIES: 10
1818
FETCH_DEPTH: 0 # pull in the tags for the version string
19-
MACOSX_DEPLOYMENT_TARGET: 13.0
19+
MACOSX_DEPLOYMENT_TARGET: 14.0
2020
ZIG_VERSION: 0.13.0
2121
ZIGBUILD_VERSION: 0.19.8
2222

@@ -52,7 +52,7 @@ jobs:
5252
target: arm-unknown-linux-gnueabihf
5353
zig_target: arm-unknown-linux-gnueabihf.2.28
5454
code-target: linux-armhf
55-
- os: macos-13
55+
- os: macos-14
5656
target: x86_64-apple-darwin
5757
code-target: darwin-x64
5858
pgo: clap-rs/[email protected]

src/tools/rust-analyzer/.typos.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ makro = "makro"
3232
trivias = "trivias"
3333
thir = "thir"
3434
jod = "jod"
35+
tructure = "tructure"
3536

3637
[default.extend-identifiers]
3738
anc = "anc"

0 commit comments

Comments
 (0)