diff options
| author | bors <bors@rust-lang.org> | 2024-12-10 03:48:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-10 03:48:20 +0000 |
| commit | ff7906bfe1ed264bf9c4d3abe1940e357b7e61dd (patch) | |
| tree | 1802a49b083991db4938697ebc05ff1e5d7ff97f /compiler/rustc_middle | |
| parent | 974ccc12e6b4fdf38407258071e3d794d383ce3a (diff) | |
| parent | 5a33ab0d7160e1d0facf5cdea4a1039c12eed229 (diff) | |
| download | rust-ff7906bfe1ed264bf9c4d3abe1940e357b7e61dd.tar.gz rust-ff7906bfe1ed264bf9c4d3abe1940e357b7e61dd.zip | |
Auto merge of #134096 - fmease:rollup-0asgoo8, r=fmease
Rollup of 9 pull requests
Successful merges:
- #133996 (Move most tests for `-l` and `#[link(..)]` into `tests/ui/link-native-libs`)
- #134012 (Grammar fixes)
- #134032 (docs: better examples for `std::ops::ControlFlow`)
- #134040 (bootstrap: print{ln}! -> eprint{ln}! (take 2))
- #134043 (Add test to check unicode identifier version)
- #134053 (rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 10))
- #134055 (interpret: clean up deduplicating allocation functions)
- #134073 (dataflow_const_prop: do not eval a ptr address in SwitchInt)
- #134084 (Fix typo in RFC mention 3598 -> 3593)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_middle')
| -rw-r--r-- | compiler/rustc_middle/src/ty/context.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_middle/src/ty/context.rs b/compiler/rustc_middle/src/ty/context.rs index d4835bb07f6..2841470d248 100644 --- a/compiler/rustc_middle/src/ty/context.rs +++ b/compiler/rustc_middle/src/ty/context.rs @@ -1479,7 +1479,7 @@ impl<'tcx> TyCtxt<'tcx> { self.mk_adt_def_from_data(ty::AdtDefData::new(self, did, kind, variants, repr)) } - /// Allocates a read-only byte or string literal for `mir::interpret`. + /// Allocates a read-only byte or string literal for `mir::interpret` with alignment 1. /// Returns the same `AllocId` if called again with the same bytes. pub fn allocate_bytes_dedup(self, bytes: &[u8], salt: usize) -> interpret::AllocId { // Create an allocation that just contains these bytes. |