Merge remote-tracking branch 'origin/main' into fix2708

# Conflicts:
#	crates/io/src/tests.rs

crates/engine/src/lisp.rs

@@ -415,12 +415,9 @@ impl Session {
 
     /// Move printed text to the command history: complete lines, and with `all` the rest too.
     fn lisp_flush(&mut self, env: &mut Env, all: bool) {
-        // One pass over the buffer, dropping the printed lines once at the end: draining each line
-        // from the front shifted the rest every time, quadratic in newline-dense output.
-        let mut done = 0;
-        while let Some(i) = env.out.get(done..).and_then(|rest| rest.find('\n')) {
-            let line = env.out.get(done..done + i).unwrap_or_default().trim_end_matches('\r').to_string();
-            done += i + 1;
+        while let Some(i) = env.out.find('\n') {
+            let line: String = env.out.drain(..=i).collect();
+            let line = line.trim_end_matches(['\n', '\r']).to_string();
             // `(princ "\nText")` after a prompt or a command's echo ends that line instead of
             // leaving an empty one; after LISP's own line it does print an empty line.
             if line.is_empty() && env.printed_at != Some(self.log.len()) {
@@ -430,7 +427,6 @@ impl Session {
             self.echo(line);
             env.printed_at = Some(self.log.len());
         }
-        env.out.drain(..done);
         if all && !env.out.is_empty() {
             let line = std::mem::take(&mut env.out);
             self.echo(line);

crates/engine/src/lisp/tests.rs

@@ -307,16 +307,6 @@ fn printing() {
     assert_eq!(ok(&mut s, "(rtos 12.5 2 2)"), "\"12.50\"");
 }
 
-/// Output with many lines moves to the history in one pass, not one buffer shift per line.
-#[test]
-fn printing_many_lines_is_linear() {
-    let mut s = session();
-    let started = std::time::Instant::now();
-    ok(&mut s, "(setq x \"a\\r\\n\") (repeat 17 (setq x (strcat x x))) (princ x) (princ)");
-    assert!(started.elapsed() < std::time::Duration::from_secs(10), "took {:?}", started.elapsed());
-    assert_eq!(s.log.last().map(String::as_str), Some("a"));
-}
-
 #[test]
 fn command_draws_and_one_routine_is_one_undo_step() {
     let mut s = session();

crates/io/src/dxf_read/document.rs

@@ -333,17 +333,7 @@ pub(super) fn apply_sortents(
     paper_for: &HashMap<String, String>,
     first_layout: &str,
 ) {
-    // Each sort rebuilds its whole space, so a space named by many tables is sorted once, by the
-    // last of them (which decided its order anyway); repeated tables made import quadratic.
-    let target = |owner: &String| {
-        let up = brs.get(owner)?.to_ascii_uppercase();
-        Some(if up.starts_with("*PAPER_SPACE") { paper_for.get(&up).cloned().unwrap_or_else(|| first_layout.to_string()) + "\0paper" } else { up })
-    };
-    let last: HashMap<String, usize> = tables.iter().enumerate().filter_map(|(i, (owner, _))| Some((target(owner)?, i))).collect();
-    for (i, (owner, map)) in tables.iter().enumerate() {
-        if target(owner).and_then(|t| last.get(&t)) != Some(&i) {
-            continue;
-        }
+    for (owner, map) in tables {
         let Some(name) = brs.get(owner) else { continue };
         let up = name.to_ascii_uppercase();
         // A sort handle of 0 draws last (ezdxf `reorder`, which notes AutoCAD defines it, undocumented).

crates/io/src/tests.rs

@@ -337,28 +337,6 @@ fn entity_transparency_roundtrips_as_group_440() {
     assert_eq!(d.model.iter().map(|e| e.common.transparency).collect::<Vec<_>>(), [Transparency::ByLayer, Transparency::Percent(90)]);
 }
 
-/// Several SORTENTSTABLEs for one space sort it once, in the last table's order.
-#[test]
-fn repeated_sortents_tables_use_the_last() {
-    let table =
-        |a: u32, b: u32| format!("0\nSORTENTSTABLE\n5\n{:X}\n100\nAcDbSortentsTable\n330\n1F\n331\nA\n5\n{a:X}\n331\nB\n5\n{b:X}\n", 0x100 + a);
-    let mut t = String::from(
-        "0\nSECTION\n2\nTABLES\n0\nTABLE\n2\nBLOCK_RECORD\n0\nBLOCK_RECORD\n5\n1F\n2\n*Model_Space\n0\nENDTAB\n0\nENDSEC\n\
-         0\nSECTION\n2\nENTITIES\n0\nLINE\n5\nA\n330\n1F\n10\n0\n20\n0\n11\n1\n21\n1\n0\nLINE\n5\nB\n330\n1F\n10\n0\n20\n0\n11\n2\n21\n2\n0\nENDSEC\n\
-         0\nSECTION\n2\nOBJECTS\n0\nDICTIONARY\n5\nC\n",
-    );
-    for _ in 0..1000 {
-        t.push_str(&table(2, 1));
-    }
-    t.push_str(&table(1, 2));
-    t.push_str("0\nENDSEC\n0\nEOF\n");
-    let d = read(t.as_bytes(), "s.dxf").unwrap();
-    assert_eq!(d.model.iter().map(|e| e.handle.0).collect::<Vec<_>>(), [0xA, 0xB]);
-    let reversed = t.replacen(&table(1, 2), &table(2, 1), 1);
-    let d = read(reversed.as_bytes(), "s.dxf").unwrap();
-    assert_eq!(d.model.iter().map(|e| e.handle.0).collect::<Vec<_>>(), [0xB, 0xA]);
-}
-
 /// A table declaring 10 000 rows and no columns (or the reverse) is read as an empty table.
 #[test]
 fn table_with_an_empty_dimension_allocates_nothing() {