From 2080669943e79aba619bc80829172c696ec1f15c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E7=82=B3=E6=9D=83?= <695601626@qq.com>
Date: Sun, 27 Aug 2023 12:04:12 +0800
Subject: chore: update to Rust 1.72 (#20258)

<!--
Before submitting a PR, please read https://deno.com/manual/contributing

1. Give the PR a descriptive title.

  Examples of good title:
    - fix(std/http): Fix race condition in server
    - docs(console): Update docstrings
    - feat(doc): Handle nested reexports

  Examples of bad title:
    - fix #7123
    - update docs
    - fix bugs

2. Ensure there is a related issue and it is referenced in the PR text.
3. Ensure there are tests that cover the changes.
4. Ensure `cargo test` passes.
5. Ensure `./tools/format.js` passes without changing files.
6. Ensure `./tools/lint.js` passes.
7. Open as a draft PR if your work is still in progress. The CI won't
run
   all steps, but you can add '[ci]' to a commit message to force it to.
8. If you would like to run the benchmarks on the CI, add the 'ci-bench'
label.
-->

As the title.

---------

Co-authored-by: Matt Mastracci <matthew@mastracci.com>
---
 cli/tests/integration/fmt_tests.rs  | 40 ++++++++++++++++++-------------------
 cli/tests/integration/lint_tests.rs | 40 ++++++++++++++++++-------------------
 cli/tests/integration/lsp_tests.rs  |  2 +-
 cli/tests/integration/repl_tests.rs |  2 +-
 4 files changed, 42 insertions(+), 42 deletions(-)

(limited to 'cli/tests')

diff --git a/cli/tests/integration/fmt_tests.rs b/cli/tests/integration/fmt_tests.rs
index ef0ad3f3e..dd9e50357 100644
--- a/cli/tests/integration/fmt_tests.rs
+++ b/cli/tests/integration/fmt_tests.rs
@@ -266,15 +266,15 @@ fn fmt_with_glob_config() {
 
   let output = cmd_output.combined_output();
   if cfg!(windows) {
-    assert_contains!(output, r#"glob\nested\fizz\fizz.ts"#);
-    assert_contains!(output, r#"glob\pages\[id].ts"#);
-    assert_contains!(output, r#"glob\nested\fizz\bar.ts"#);
-    assert_contains!(output, r#"glob\nested\foo\foo.ts"#);
-    assert_contains!(output, r#"glob\data\test1.js"#);
-    assert_contains!(output, r#"glob\nested\foo\bar.ts"#);
-    assert_contains!(output, r#"glob\nested\foo\fizz.ts"#);
-    assert_contains!(output, r#"glob\nested\fizz\foo.ts"#);
-    assert_contains!(output, r#"glob\data\test1.ts"#);
+    assert_contains!(output, r"glob\nested\fizz\fizz.ts");
+    assert_contains!(output, r"glob\pages\[id].ts");
+    assert_contains!(output, r"glob\nested\fizz\bar.ts");
+    assert_contains!(output, r"glob\nested\foo\foo.ts");
+    assert_contains!(output, r"glob\data\test1.js");
+    assert_contains!(output, r"glob\nested\foo\bar.ts");
+    assert_contains!(output, r"glob\nested\foo\fizz.ts");
+    assert_contains!(output, r"glob\nested\fizz\foo.ts");
+    assert_contains!(output, r"glob\data\test1.ts");
   } else {
     assert_contains!(output, "glob/nested/fizz/fizz.ts");
     assert_contains!(output, "glob/pages/[id].ts");
@@ -303,15 +303,15 @@ fn fmt_with_glob_config_and_flags() {
 
   let output = cmd_output.combined_output();
   if cfg!(windows) {
-    assert_contains!(output, r#"glob\nested\fizz\fizz.ts"#);
-    assert_contains!(output, r#"glob\pages\[id].ts"#);
-    assert_contains!(output, r#"glob\nested\fizz\bazz.ts"#);
-    assert_contains!(output, r#"glob\nested\foo\foo.ts"#);
-    assert_contains!(output, r#"glob\data\test1.js"#);
-    assert_contains!(output, r#"glob\nested\foo\bazz.ts"#);
-    assert_contains!(output, r#"glob\nested\foo\fizz.ts"#);
-    assert_contains!(output, r#"glob\nested\fizz\foo.ts"#);
-    assert_contains!(output, r#"glob\data\test1.ts"#);
+    assert_contains!(output, r"glob\nested\fizz\fizz.ts");
+    assert_contains!(output, r"glob\pages\[id].ts");
+    assert_contains!(output, r"glob\nested\fizz\bazz.ts");
+    assert_contains!(output, r"glob\nested\foo\foo.ts");
+    assert_contains!(output, r"glob\data\test1.js");
+    assert_contains!(output, r"glob\nested\foo\bazz.ts");
+    assert_contains!(output, r"glob\nested\foo\fizz.ts");
+    assert_contains!(output, r"glob\nested\fizz\foo.ts");
+    assert_contains!(output, r"glob\data\test1.ts");
   } else {
     assert_contains!(output, "glob/nested/fizz/fizz.ts");
     assert_contains!(output, "glob/pages/[id].ts");
@@ -333,8 +333,8 @@ fn fmt_with_glob_config_and_flags() {
 
   let output = cmd_output.combined_output();
   if cfg!(windows) {
-    assert_contains!(output, r#"glob\data\test1.js"#);
-    assert_contains!(output, r#"glob\data\test1.ts"#);
+    assert_contains!(output, r"glob\data\test1.js");
+    assert_contains!(output, r"glob\data\test1.ts");
   } else {
     assert_contains!(output, "glob/data/test1.js");
     assert_contains!(output, "glob/data/test1.ts");
diff --git a/cli/tests/integration/lint_tests.rs b/cli/tests/integration/lint_tests.rs
index 6fef3c000..d4bf175fc 100644
--- a/cli/tests/integration/lint_tests.rs
+++ b/cli/tests/integration/lint_tests.rs
@@ -131,15 +131,15 @@ fn lint_with_glob_config() {
 
   let output = cmd_output.combined_output();
   if cfg!(windows) {
-    assert_contains!(output, r#"glob\nested\fizz\fizz.ts:1:10"#);
-    assert_contains!(output, r#"glob\pages\[id].ts:1:10"#);
-    assert_contains!(output, r#"glob\nested\fizz\bar.ts:1:10"#);
-    assert_contains!(output, r#"glob\nested\foo\foo.ts:1:10"#);
-    assert_contains!(output, r#"glob\data\test1.js:1:10"#);
-    assert_contains!(output, r#"glob\nested\foo\bar.ts:1:10"#);
-    assert_contains!(output, r#"glob\nested\foo\fizz.ts:1:10"#);
-    assert_contains!(output, r#"glob\nested\fizz\foo.ts:1:10"#);
-    assert_contains!(output, r#"glob\data\test1.ts:1:10"#);
+    assert_contains!(output, r"glob\nested\fizz\fizz.ts:1:10");
+    assert_contains!(output, r"glob\pages\[id].ts:1:10");
+    assert_contains!(output, r"glob\nested\fizz\bar.ts:1:10");
+    assert_contains!(output, r"glob\nested\foo\foo.ts:1:10");
+    assert_contains!(output, r"glob\data\test1.js:1:10");
+    assert_contains!(output, r"glob\nested\foo\bar.ts:1:10");
+    assert_contains!(output, r"glob\nested\foo\fizz.ts:1:10");
+    assert_contains!(output, r"glob\nested\fizz\foo.ts:1:10");
+    assert_contains!(output, r"glob\data\test1.ts:1:10");
   } else {
     assert_contains!(output, "glob/nested/fizz/fizz.ts:1:10");
     assert_contains!(output, "glob/pages/[id].ts:1:10");
@@ -168,15 +168,15 @@ fn lint_with_glob_config_and_flags() {
 
   let output = cmd_output.combined_output();
   if cfg!(windows) {
-    assert_contains!(output, r#"glob\nested\fizz\fizz.ts:1:10"#);
-    assert_contains!(output, r#"glob\pages\[id].ts:1:10"#);
-    assert_contains!(output, r#"glob\nested\fizz\bazz.ts:1:10"#);
-    assert_contains!(output, r#"glob\nested\foo\foo.ts:1:10"#);
-    assert_contains!(output, r#"glob\data\test1.js:1:10"#);
-    assert_contains!(output, r#"glob\nested\foo\bazz.ts:1:10"#);
-    assert_contains!(output, r#"glob\nested\foo\fizz.ts:1:10"#);
-    assert_contains!(output, r#"glob\nested\fizz\foo.ts:1:10"#);
-    assert_contains!(output, r#"glob\data\test1.ts:1:10"#);
+    assert_contains!(output, r"glob\nested\fizz\fizz.ts:1:10");
+    assert_contains!(output, r"glob\pages\[id].ts:1:10");
+    assert_contains!(output, r"glob\nested\fizz\bazz.ts:1:10");
+    assert_contains!(output, r"glob\nested\foo\foo.ts:1:10");
+    assert_contains!(output, r"glob\data\test1.js:1:10");
+    assert_contains!(output, r"glob\nested\foo\bazz.ts:1:10");
+    assert_contains!(output, r"glob\nested\foo\fizz.ts:1:10");
+    assert_contains!(output, r"glob\nested\fizz\foo.ts:1:10");
+    assert_contains!(output, r"glob\data\test1.ts:1:10");
   } else {
     assert_contains!(output, "glob/nested/fizz/fizz.ts:1:10");
     assert_contains!(output, "glob/pages/[id].ts:1:10");
@@ -200,8 +200,8 @@ fn lint_with_glob_config_and_flags() {
 
   let output = cmd_output.combined_output();
   if cfg!(windows) {
-    assert_contains!(output, r#"glob\data\test1.js:1:10"#);
-    assert_contains!(output, r#"glob\data\test1.ts:1:10"#);
+    assert_contains!(output, r"glob\data\test1.js:1:10");
+    assert_contains!(output, r"glob\data\test1.ts:1:10");
   } else {
     assert_contains!(output, "glob/data/test1.js:1:10");
     assert_contains!(output, "glob/data/test1.ts:1:10");
diff --git a/cli/tests/integration/lsp_tests.rs b/cli/tests/integration/lsp_tests.rs
index d127ed31c..665fa6275 100644
--- a/cli/tests/integration/lsp_tests.rs
+++ b/cli/tests/integration/lsp_tests.rs
@@ -3685,7 +3685,7 @@ fn lsp_find_references() {
       "uri": "file:///a/mod.ts",
       "languageId": "typescript",
       "version": 1,
-      "text": r#"export const a = 1;\nconst b = 2;"#
+      "text": r"export const a = 1;\nconst b = 2;"
     }
   }));
   client.did_open(json!({
diff --git a/cli/tests/integration/repl_tests.rs b/cli/tests/integration/repl_tests.rs
index 9f37679ef..5335cf964 100644
--- a/cli/tests/integration/repl_tests.rs
+++ b/cli/tests/integration/repl_tests.rs
@@ -242,7 +242,7 @@ fn pty_internal_repl() {
 fn pty_emoji() {
   // windows was having issues displaying this
   util::with_pty(&["repl"], |mut console| {
-    console.write_line(r#"console.log('\u{1F995}');"#);
+    console.write_line(r"console.log('\u{1F995}');");
     console.expect("🦕");
   });
 }
-- 
cgit v1.2.3