about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbjorn3 <17426603+bjorn3@users.noreply.github.com>2022-10-23 13:44:16 +0200
committerbjorn3 <17426603+bjorn3@users.noreply.github.com>2022-10-23 13:44:16 +0200
commit57984be8eaba93b7f433448d333f7e76e1df6fdf (patch)
tree94bf67b9404450445a7f371b2675cbf3867cd651
parentb1791eef6add9563c1b750e88ec02e681a9a4ad7 (diff)
parent54ee5ac0734a5c715558190fda9c61be2446d93a (diff)
downloadrust-57984be8eaba93b7f433448d333f7e76e1df6fdf.tar.gz
rust-57984be8eaba93b7f433448d333f7e76e1df6fdf.zip
Sync from rust e64f1110c062f61746f222059439529a43ccf6dc
-rw-r--r--build_system/rustc_info.rs2
-rw-r--r--src/abi/pass_mode.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/build_system/rustc_info.rs b/build_system/rustc_info.rs
index 913b589afcc..3c08b6fa389 100644
--- a/build_system/rustc_info.rs
+++ b/build_system/rustc_info.rs
@@ -65,7 +65,7 @@ pub(crate) fn get_file_name(crate_name: &str, crate_type: &str) -> String {
 }
 
 /// Similar to `get_file_name`, but converts any dashes (`-`) in the `crate_name` to
-/// underscores (`_`). This is specially made for the the rustc and cargo wrappers
+/// underscores (`_`). This is specially made for the rustc and cargo wrappers
 /// which have a dash in the name, and that is not allowed in a crate name.
 pub(crate) fn get_wrapper_file_name(crate_name: &str, crate_type: &str) -> String {
     let crate_name = crate_name.replace('-', "_");
diff --git a/src/abi/pass_mode.rs b/src/abi/pass_mode.rs
index 96e25d3a8d4..e5ad31eb948 100644
--- a/src/abi/pass_mode.rs
+++ b/src/abi/pass_mode.rs
@@ -193,7 +193,7 @@ pub(super) fn from_casted_value<'tcx>(
         kind: StackSlotKind::ExplicitSlot,
         // FIXME Don't force the size to a multiple of 16 bytes once Cranelift gets a way to
         // specify stack slot alignment.
-        // Stack slot size may be bigger for for example `[u8; 3]` which is packed into an `i32`.
+        // Stack slot size may be bigger for example `[u8; 3]` which is packed into an `i32`.
         // It may also be smaller for example when the type is a wrapper around an integer with a
         // larger alignment than the integer.
         size: (std::cmp::max(abi_param_size, layout_size) + 15) / 16 * 16,