Skip to content

minor: Sync from downstream #18431

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 24 commits into from
Oct 29, 2024
Merged

minor: Sync from downstream #18431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
9ee8f5a
Rollup merge of #131918 - Zalathar:counters, r=nnethercote
matthiaskrgr Oct 22, 2024
81d6960
Rollup merge of #132029 - lnicola:sync-from-ra, r=lnicola
matthiaskrgr Oct 22, 2024
9f433d2
Auto merge of #132030 - matthiaskrgr:rollup-1g6quh0, r=matthiaskrgr
bors Oct 22, 2024
6158f03
Auto merge of #131321 - RalfJung:feature-activation, r=nnethercote
bors Oct 22, 2024
88132c4
Auto merge of #131871 - RalfJung:x86-32-float, r=workingjubilee
bors Oct 22, 2024
1c7e595
Auto merge of #131929 - LaihoE:replace_default_capacity, r=joboet
bors Oct 23, 2024
cf72ce4
Auto merge of #131951 - notriddle:notriddle/sha256-compile-time, r=Gu…
bors Oct 24, 2024
23bccaa
Auto merge of #123550 - GnomedDev:remove-initial-arc, r=Noratrieb
bors Oct 24, 2024
771e0eb
Auto merge of #132007 - rustbot:docs-update, r=ehuss
bors Oct 24, 2024
3a6ace0
Auto merge of #127731 - veluca93:abi_checks, r=RalfJung
bors Oct 25, 2024
c1cba5b
Auto merge of #131917 - jieyouxu:rmake-clang, r=Kobzol
bors Oct 25, 2024
e3b428c
Auto merge of #125116 - blyxyas:ignore-allowed-lints-final, r=cjgillot
bors Oct 26, 2024
fa1eaea
Auto merge of #131715 - tgross35:add-const_sockaddr_setters, r=Amanieu
bors Oct 26, 2024
bfeadff
Auto merge of #131900 - mrkajetanp:target-feature-pauth-lr, r=Amanieu
bors Oct 27, 2024
f806406
rust-analyzer: Rename LayoutS to LayoutData
workingjubilee Oct 28, 2024
065ff2f
Rollup merge of #131391 - ChaiTRex:isqrt, r=scottmcm,tgross35
matthiaskrgr Oct 28, 2024
ea04262
Rollup merge of #132252 - workingjubilee:rename-layouts-to-layoutdata…
matthiaskrgr Oct 28, 2024
4d0ed44
Rollup merge of #132253 - Zalathar:keyword-idents-bug, r=jieyouxu
matthiaskrgr Oct 28, 2024
1a7657b
Auto merge of #132262 - matthiaskrgr:rollup-pcphi6l, r=matthiaskrgr
bors Oct 28, 2024
aecc3e7
Auto merge of #132145 - RalfJung:stdarch, r=Amanieu
bors Oct 28, 2024
0dc8c6c
Auto merge of #128985 - GrigorenkoPV:instantly-dangling-pointer, r=Urgau
bors Oct 29, 2024
478b234
Preparing for merge from rust-lang/rust
lnicola Oct 29, 2024
779074d
Merge from rust-lang/rust
lnicola Oct 29, 2024
ffdeb5d
Bump rustc crates
lnicola Oct 29, 2024
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
24 changes: 12 additions & 12 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ tt = { path = "./crates/tt", version = "0.0.0" }
vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
vfs = { path = "./crates/vfs", version = "0.0.0" }

ra-ap-rustc_lexer = { version = "0.73", default-features = false }
ra-ap-rustc_parse_format = { version = "0.73", default-features = false }
ra-ap-rustc_index = { version = "0.73", default-features = false }
ra-ap-rustc_abi = { version = "0.73", default-features = false }
ra-ap-rustc_pattern_analysis = { version = "0.73", default-features = false }
ra-ap-rustc_lexer = { version = "0.75", default-features = false }
ra-ap-rustc_parse_format = { version = "0.75", default-features = false }
ra-ap-rustc_index = { version = "0.75", default-features = false }
ra-ap-rustc_abi = { version = "0.75", default-features = false }
ra-ap-rustc_pattern_analysis = { version = "0.75", default-features = false }

# local crates that aren't published to crates.io. These should not have versions.
test-fixture = { path = "./crates/test-fixture" }
Expand Down
4 changes: 2 additions & 2 deletions crates/hir-ty/src/layout.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use base_db::ra_salsa::Cycle;
use chalk_ir::{AdtId, FloatTy, IntTy, TyKind, UintTy};
use hir_def::{
layout::{
Abi, FieldsShape, Float, Integer, LayoutCalculator, LayoutCalculatorError, LayoutS,
Abi, FieldsShape, Float, Integer, LayoutCalculator, LayoutCalculatorError, LayoutData,
Primitive, ReprOptions, Scalar, Size, StructKind, TargetDataLayout, WrappingRange,
},
LocalFieldId, StructId,
Expand Down Expand Up @@ -66,7 +66,7 @@ impl rustc_index::Idx for RustcFieldIdx {
}
}

pub type Layout = LayoutS<RustcFieldIdx, RustcEnumVariantIdx>;
pub type Layout = LayoutData<RustcFieldIdx, RustcEnumVariantIdx>;
pub type TagEncoding = hir_def::layout::TagEncoding<RustcEnumVariantIdx>;
pub type Variants = hir_def::layout::Variants<RustcFieldIdx, RustcEnumVariantIdx>;

Expand Down
2 changes: 1 addition & 1 deletion rust-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1de57a5ce952c722f7053aeacfc6c90bc139b678
a9d17627d241645a54c1134a20f1596127fedb60