Merge 01f73c35ed279d26678fe9c991ef55a0e44a1b76 into e9f1b5825a9d37ca0c173a7b2830ba36a27ca9e0

Co-authored-by: Laurenz <laurmaedje@gmail.com>

Cargo.toml

@@ -159,6 +159,7 @@ strip = true
 [workspace.lints.clippy]
 blocks_in_conditions = "allow"
 comparison_chain = "allow"
+iter_over_hash_type = "warn"
 manual_range_contains = "allow"
 mutable_key_type = "allow"
 uninlined_format_args = "warn"

crates/typst-cli/src/watch.rs

@@ -139,6 +139,7 @@ impl Watcher {
     fn update(&mut self, iter: impl IntoIterator<Item = PathBuf>) -> StrResult<()> {
         // Mark all files as not "seen" so that we may unwatch them if they
         // aren't in the dependency list.
+        #[allow(clippy::iter_over_hash_type, reason = "order does not matter")]
         for seen in self.watched.values_mut() {
             *seen = false;
         }

crates/typst-cli/src/world.rs

@@ -173,6 +173,7 @@ impl SystemWorld {
 
     /// Reset the compilation state in preparation of a new compilation.
     pub fn reset(&mut self) {
+        #[allow(clippy::iter_over_hash_type, reason = "order does not matter")]
         for slot in self.slots.get_mut().values_mut() {
             slot.reset();
         }

crates/typst-eval/src/code.rs

@@ -7,6 +7,7 @@ use typst_library::foundations::{
 };
 use typst_library::introspection::{Counter, State};
 use typst_syntax::ast::{self, AstNode};
+use typst_syntax::Span;
 use typst_utils::singleton;
 
 use crate::{CapturesVisitor, Eval, FlowEvent, Vm};
@@ -284,8 +285,19 @@ impl Eval for ast::CodeBlock<'_> {
     type Output = Value;
 
     fn eval(self, vm: &mut Vm) -> SourceResult<Self::Output> {
+        let body = self.body();
+        match body.exprs().next_back() {
+            Some(expr @ ast::Expr::ShowRule(_)) => {
+                warn_for_useless_rule(&mut vm.engine, expr.span(), "show")
+            }
+            Some(expr @ ast::Expr::SetRule(_)) => {
+                warn_for_useless_rule(&mut vm.engine, expr.span(), "set")
+            }
+            _ => {}
+        }
+
         vm.scopes.enter();
-        let output = self.body().eval(vm)?;
+        let output = body.eval(vm)?;
         vm.scopes.exit();
         Ok(output)
     }
@@ -389,3 +401,12 @@ fn warn_for_discarded_content(engine: &mut Engine, event: &FlowEvent, joined: &V
 
     engine.sink.warn(warning);
 }
+
+/// Emits a warning when a set or show rule has no effect.
+fn warn_for_useless_rule(engine: &mut Engine, span: Span, kind: &str) {
+    engine.sink.warn(warning!(
+        span,
+        "{kind} rule has no effect";
+        hint: "a {kind} rule is only in effect until the end of the surrounding code block"
+    ));
+}

crates/typst-library/src/visualize/curve.rs

@@ -476,26 +476,18 @@ impl Curve {
 
     /// Computes the size of the bounding box of this curve.
     pub fn bbox_size(&self) -> Size {
-        let mut min_x = Abs::inf();
-        let mut min_y = Abs::inf();
-        let mut max_x = -Abs::inf();
-        let mut max_y = -Abs::inf();
+        let mut min = Point::splat(Abs::inf());
+        let mut max = Point::splat(-Abs::inf());
 
         let mut cursor = Point::zero();
         for item in self.0.iter() {
             match item {
                 CurveItem::Move(to) => {
-                    min_x = min_x.min(cursor.x);
-                    min_y = min_y.min(cursor.y);
-                    max_x = max_x.max(cursor.x);
-                    max_y = max_y.max(cursor.y);
                     cursor = *to;
                 }
                 CurveItem::Line(to) => {
-                    min_x = min_x.min(cursor.x);
-                    min_y = min_y.min(cursor.y);
-                    max_x = max_x.max(cursor.x);
-                    max_y = max_y.max(cursor.y);
+                    min = min.min(cursor).min(*to);
+                    max = max.max(cursor).max(*to);
                     cursor = *to;
                 }
                 CurveItem::Cubic(c0, c1, end) => {
@@ -507,17 +499,17 @@ impl Curve {
                     );
 
                     let bbox = cubic.bounding_box();
-                    min_x = min_x.min(Abs::pt(bbox.x0)).min(Abs::pt(bbox.x1));
-                    min_y = min_y.min(Abs::pt(bbox.y0)).min(Abs::pt(bbox.y1));
-                    max_x = max_x.max(Abs::pt(bbox.x0)).max(Abs::pt(bbox.x1));
-                    max_y = max_y.max(Abs::pt(bbox.y0)).max(Abs::pt(bbox.y1));
+                    min.x = min.x.min(Abs::pt(bbox.x0)).min(Abs::pt(bbox.x1));
+                    min.y = min.y.min(Abs::pt(bbox.y0)).min(Abs::pt(bbox.y1));
+                    max.x = max.x.max(Abs::pt(bbox.x0)).max(Abs::pt(bbox.x1));
+                    max.y = max.y.max(Abs::pt(bbox.y0)).max(Abs::pt(bbox.y1));
                     cursor = *end;
                 }
                 CurveItem::Close => (),
             }
         }
 
-        Size::new(max_x - min_x, max_y - min_y)
+        Size::new(max.x - min.x, max.y - min.y)
     }
 }
 

tests/suite/foundations/context.typ

@@ -48,4 +48,5 @@
   let n = query(<a>).len()
   let fonts = ("nope", "Roboto")
   set text(font: fonts.at(n))
+  []
 }

tests/suite/model/document.typ

@@ -51,4 +51,5 @@ Hello
 #context {
   set document(author: "Changed") if "Normal" in document.author
   set document(title: "Changed") if document.title ==  "Normal"
+  []
 }

tests/suite/styling/in-block.typ

@@ -0,0 +1,12 @@
+--- warn-show-set-last-in-block ---
+#{
+  // Warning: 3-16 show rule has no effect
+  // Hint: 3-16 a show rule is only in effect until the end of the surrounding code block
+  show "a": "b"
+}
+
+#{
+  // Warning: 3-17 set rule has no effect
+  // Hint: 3-17 a set rule is only in effect until the end of the surrounding code block
+  set text(blue)
+}

tests/suite/visualize/curve.typ

@@ -130,6 +130,16 @@
   down, up, down, up, down,
 )
 
+--- curve-stroke-gradient-sharp ---
+#set page(width: auto)
+#let down = curve.line((40pt, 40pt), relative: true)
+#let up = curve.line((40pt, -40pt), relative: true)
+
+#curve(
+  stroke: 4pt + gradient.linear(red, blue).sharp(3),
+  down, up, down, up, down,
+)
+
 --- curve-fill-rule ---
 #stack(
   dir: ltr,