aboutsummaryrefslogtreecommitdiff
path: root/xtask/src
diff options
context:
space:
mode:
Diffstat (limited to 'xtask/src')
-rw-r--r--xtask/src/codegen/gen_assists_docs.rs2
-rw-r--r--xtask/src/codegen/gen_parser_tests.rs8
-rw-r--r--xtask/src/main.rs2
3 files changed, 5 insertions, 7 deletions
diff --git a/xtask/src/codegen/gen_assists_docs.rs b/xtask/src/codegen/gen_assists_docs.rs
index 0c4cf2152..05afda8f1 100644
--- a/xtask/src/codegen/gen_assists_docs.rs
+++ b/xtask/src/codegen/gen_assists_docs.rs
@@ -53,7 +53,7 @@ fn collect_assists() -> Result<Vec<Assist>> {
53 53
54 let doc = take_until(lines.by_ref(), "```").trim().to_string(); 54 let doc = take_until(lines.by_ref(), "```").trim().to_string();
55 assert!( 55 assert!(
56 doc.chars().next().unwrap().is_ascii_uppercase() && doc.ends_with("."), 56 doc.chars().next().unwrap().is_ascii_uppercase() && doc.ends_with('.'),
57 "\n\n{}: assist docs should be proper sentences, with capitalization and a full stop at the end.\n\n{}\n\n", 57 "\n\n{}: assist docs should be proper sentences, with capitalization and a full stop at the end.\n\n{}\n\n",
58 id, doc, 58 id, doc,
59 ); 59 );
diff --git a/xtask/src/codegen/gen_parser_tests.rs b/xtask/src/codegen/gen_parser_tests.rs
index db1e59dac..d0f0f683b 100644
--- a/xtask/src/codegen/gen_parser_tests.rs
+++ b/xtask/src/codegen/gen_parser_tests.rs
@@ -102,12 +102,10 @@ fn tests_from_dir(dir: &Path) -> Result<Tests> {
102 for test in collect_tests(&text) { 102 for test in collect_tests(&text) {
103 if test.ok { 103 if test.ok {
104 if let Some(old_test) = res.ok.insert(test.name.clone(), test) { 104 if let Some(old_test) = res.ok.insert(test.name.clone(), test) {
105 Err(format!("Duplicate test: {}", old_test.name))? 105 return Err(format!("Duplicate test: {}", old_test.name).into());
106 }
107 } else {
108 if let Some(old_test) = res.err.insert(test.name.clone(), test) {
109 Err(format!("Duplicate test: {}", old_test.name))?
110 } 106 }
107 } else if let Some(old_test) = res.err.insert(test.name.clone(), test) {
108 return Err(format!("Duplicate test: {}", old_test.name).into());
111 } 109 }
112 } 110 }
113 Ok(()) 111 Ok(())
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 04dca402c..4d20232ff 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -60,7 +60,7 @@ fn main() -> Result<()> {
60 matches.finish().or_else(handle_extra_flags)?; 60 matches.finish().or_else(handle_extra_flags)?;
61 let opts = InstallOpt { 61 let opts = InstallOpt {
62 client: if server { None } else { Some(ClientOpt::VsCode) }, 62 client: if server { None } else { Some(ClientOpt::VsCode) },
63 server: if client_code { None } else { Some(ServerOpt { jemalloc: jemalloc }) }, 63 server: if client_code { None } else { Some(ServerOpt { jemalloc }) },
64 }; 64 };
65 install(opts)? 65 install(opts)?
66 } 66 }