.lighthouse/pipeline-clippy.yaml

@@ -73,35 +73,6 @@ spec:
             value: $(params.PULL_BASE_SHA)
           - name: deleteExisting
             value: "true"
-      - name: build-image
-        taskRef:
-          name: kaniko
-        params:
-          - name: IMAGE
-            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
-          - name: CONTEXT
-            value: $(params.path-to-image-context)
-          - name: DOCKERFILE
-            value: $(params.path-to-dockerfile)
-          - name: BUILDER_IMAGE
-            value: "gcr.io/kaniko-project/executor:v1.12.1"
-          - name: EXTRA_ARGS
-            value:
-              - --cache=true
-              - --cache-copy-layers
-              - --cache-repo=harbor.fizz.buzz/kanikocache/cache
-              - --use-new-run # Should result in a speed-up
-              - --reproducible # To remove timestamps so layer caching works.
-              - --snapshot-mode=redo
-              - --skip-unused-stages=true
-              - --registry-mirror=dockerhub.dockerhub.svc.cluster.local
-        workspaces:
-          - name: source
-            workspace: git-source
-          - name: dockerconfig
-            workspace: docker-credentials
-        runAfter:
-          - fetch-repository
       - name: clippy
         taskRef:
           name: run-docker-image
@@ -111,10 +82,22 @@ spec:
           - name: cargo-cache
             workspace: cargo-cache
         runAfter:
-          - build-image
+          - fetch-repository
         params:
           - name: docker-image
-            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
+            value: "rustlang/rust:nightly-alpine3.17"
+          - name: command
+            value:
+              [
+                cargo,
+                clippy,
+                --no-deps,
+                --all-targets,
+                --all-features,
+                --,
+                -D,
+                warnings,
+              ]
     finally:
       - name: report-success
         when:
@@ -184,8 +167,8 @@ spec:
   timeout: 240h0m0s
   params:
     - name: image-name
-      value: "harbor.fizz.buzz/private/organic-clippy"
+      value: "harbor.fizz.buzz/private/organic-fmt"
     - name: path-to-image-context
-      value: docker/organic_clippy/
+      value: docker/cargo_fmt/
     - name: path-to-dockerfile
-      value: docker/organic_clippy/Dockerfile
+      value: docker/cargo_fmt/Dockerfile

Makefile

@@ -37,10 +37,6 @@ clean:
 format:
 > $(MAKE) -C docker/cargo_fmt run
 
-.PHONY: dockerclippy
-dockerclippy:
-> $(MAKE) -C docker/organic_clippy run
-
 .PHONY: clippy
 clippy:
 > cargo clippy --no-deps --all-targets --all-features -- -D warnings

docker/organic_clippy/Dockerfile

@@ -1,5 +0,0 @@
-FROM rustlang/rust:nightly-alpine3.17
-
-RUN apk add --no-cache musl-dev
-
-ENTRYPOINT ["cargo", "clippy", "--no-deps", "--all-targets", "--all-features", "--", "-D", "warnings"]

docker/organic_clippy/Makefile

@@ -1,37 +0,0 @@
-IMAGE_NAME:=organic-clippy
-# REMOTE_REPO:=harbor.fizz.buzz/private
-
-.PHONY: all
-all: build push
-
-.PHONY: build
-build:
-	docker build -t $(IMAGE_NAME) -f Dockerfile .
-
-.PHONY: push
-push:
-ifdef REMOTE_REPO
-	docker tag $(IMAGE_NAME) $(REMOTE_REPO)/$(IMAGE_NAME)
-	docker push $(REMOTE_REPO)/$(IMAGE_NAME)
-else
-	@echo "REMOTE_REPO not defined, not pushing to a remote repo."
-endif
-
-.PHONY: clean
-clean:
-	docker rmi $(IMAGE_NAME)
-ifdef REMOTE_REPO
-	docker rmi $(REMOTE_REPO)/$(IMAGE_NAME)
-else
-	@echo "REMOTE_REPO not defined, not removing from remote repo."
-endif
-	docker volume rm cargo-cache
-
-# NOTE: This target will write to folders underneath the git-root
-.PHONY: run
-run: build
-	docker run --rm --init --read-only --mount type=tmpfs,destination=/tmp -v "$$(readlink -f ../../):/source" --workdir=/source --mount source=cargo-cache,target=/usr/local/cargo/registry $(IMAGE_NAME)
-
-.PHONY: shell
-shell: build
-	docker run --rm -i -t --entrypoint /bin/sh --mount type=tmpfs,destination=/tmp -v "$$(readlink -f ../../):/source" --workdir=/source --mount source=cargo-cache,target=/usr/local/cargo/registry $(IMAGE_NAME)

src/parser/latex_environment.rs

@@ -43,8 +43,13 @@ where
     let value_start = remaining;
     start_of_line(remaining)?;
     let (remaining, _leading_whitespace) = space0(remaining)?;
-    let (remaining, (_opening, name, _open_close_brace, _ws, _line_ending)) =
-        tuple((tag_no_case(r"\begin{"), name, tag("}"), space0, line_ending))(remaining)?;
+    let (remaining, (_opening, name, _open_close_brace, _ws, _line_ending)) = tuple((
+        tag_no_case(r#"\begin{"#),
+        name,
+        tag("}"),
+        space0,
+        line_ending,
+    ))(remaining)?;
 
     let latex_environment_end_specialized = latex_environment_end(name.into());
     let parser_context = ContextElement::ExitMatcherNode(ExitMatcherNode {
@@ -122,7 +127,7 @@ fn _latex_environment_end<'b, 'g, 'r, 's, 'c>(
     start_of_line(input)?;
     let (remaining, _leading_whitespace) = space0(input)?;
     let (remaining, (_begin, _name, _close_brace, _ws, _line_ending)) = tuple((
-        tag_no_case(r"\end{"),
+        tag_no_case(r#"\end{"#),
         tag_no_case(current_name_lower),
         tag("}"),
         space0,

src/parser/line_break.rs

@@ -21,7 +21,7 @@ pub(crate) fn line_break<'b, 'g, 'r, 's>(
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, LineBreak<'s>> {
     let (remaining, _) = pre(context, input)?;
-    let (remaining, _) = tag(r"\\")(remaining)?;
+    let (remaining, _) = tag(r#"\\"#)(remaining)?;
     let (remaining, _) = recognize(many0(one_of(" \t")))(remaining)?;
     let (remaining, _) = line_ending(remaining)?;
     let source = get_consumed(input, remaining);

src/parser/subscript_and_superscript.rs

@@ -175,7 +175,7 @@ fn script_alphanum<'b, 'g, 'r, 's>(
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn script_alphanum_character<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     recognize(verify(anychar, |c| {
-        c.is_alphanumeric() || r",.\".contains(*c)
+        c.is_alphanumeric() || r#",.\"#.contains(*c)
     }))(input)
 }
 
@@ -183,7 +183,7 @@ fn script_alphanum_character<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, Org
 fn end_script_alphanum_character<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     let (remaining, final_char) = recognize(verify(anychar, |c| c.is_alphanumeric()))(input)?;
     peek(tuple((
-        take_while(|c| r",.\".contains(c)),
+        take_while(|c| r#",.\"#.contains(c)),
         not(script_alphanum_character),
     )))(remaining)?;
     Ok((remaining, final_char))