Skip to content

Commit 048e804

Browse files
committed
Auto merge of #13939 - tbu-:pr_template_no_usize, r=weihanglo
Use `i32` rather than `usize` as "default integer" in library template `usize` was renamed from `uint` in order to convey that it's not the "default integer type". Guide new users to use `i32` instead of `usize`.
2 parents 99075f2 + a29742a commit 048e804

File tree

31 files changed

+31
-31
lines changed
  • src/cargo/ops
  • tests/testsuite
    • cargo_init
      • auto_git/out/src
      • formats_source/out/src
      • fossil_autodetect/out/src
      • git_autodetect/out/src
      • git_ignore_exists_no_conflicting_entries/out/src
      • ignores_failure_to_format_source/out/src
      • inherit_workspace_package_table
      • mercurial_autodetect/out/src
      • pijul_autodetect/out/src
      • simple_git/out/src
      • simple_git_ignore_exists/out/src
      • simple_hg/out/src
      • simple_hg_ignore_exists/out/src
      • simple_lib/out/src
    • cargo_new
      • add_members_to_non_workspace/out/bar/src
      • add_members_to_workspace_with_exclude_list/in/src
      • add_members_to_workspace_without_members/out/bar/src
      • inherit_workspace_lints
      • inherit_workspace_package_table/out/src
      • inherit_workspace_package_table.in/src
      • inherit_workspace_package_table_with_edition/out/src
      • inherit_workspace_package_table_with_registry/out/src
      • inherit_workspace_package_table_without_version
      • not_inherit_workspace_package_table_if_not_members

31 files changed

+31
-31
lines changed

src/cargo/ops/cargo_new.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,7 @@ fn main() {
876876
"
877877
} else {
878878
b"\
879-
pub fn add(left: usize, right: usize) -> usize {
879+
pub fn add(left: u64, right: u64) -> u64 {
880880
left + right
881881
}
882882

tests/testsuite/cargo_init/auto_git/out/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_init/formats_source/out/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_init/fossil_autodetect/out/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_init/git_autodetect/out/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/out/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_init/ignores_failure_to_format_source/out/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_init/inherit_workspace_package_table/in/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_init/inherit_workspace_package_table/out/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_init/mercurial_autodetect/out/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_init/pijul_autodetect/out/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_init/simple_git/out/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_init/simple_git_ignore_exists/out/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_init/simple_hg/out/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_init/simple_hg_ignore_exists/out/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_init/simple_lib/out/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_new/add_members_to_non_workspace/out/bar/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/in/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_new/add_members_to_workspace_without_members/out/bar/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_new/inherit_workspace_lints/in/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_new/inherit_workspace_lints/out/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_new/inherit_workspace_package_table.in/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_new/inherit_workspace_package_table/out/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/out/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/out/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/in/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/out/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/in/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/out/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub fn add(left: usize, right: usize) -> usize {
1+
pub fn add(left: u64, right: u64) -> u64 {
22
left + right
33
}
44

tests/testsuite/new.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ fn simple_lib() {
4242
let contents = fs::read_to_string(&lib).unwrap();
4343
assert_eq!(
4444
contents,
45-
r#"pub fn add(left: usize, right: usize) -> usize {
45+
r#"pub fn add(left: u64, right: u64) -> u64 {
4646
left + right
4747
}
4848

tests/testsuite/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5085,7 +5085,7 @@ fn cargo_test_set_out_dir_env_var() {
50855085
.file(
50865086
"src/lib.rs",
50875087
r#"
5088-
pub fn add(left: usize, right: usize) -> usize {
5088+
pub fn add(left: u64, right: u64) -> u64 {
50895089
left + right
50905090
}
50915091
"#,

0 commit comments

Comments
 (0)