Merge pull request #983 from caiogeraldes/master

V2 CLI: separate `new` and `init` commands

Author: pkgw

Cargo.lock

@@ -120,7 +120,7 @@ tokio = "0.1.22"
 
 [package.metadata.vcpkg]
 git = "https://github.com/microsoft/vcpkg"
-rev = "1be5a98d090b1d2beeb63a48ba800fbf006e8aca"
+rev = "47a020d619021539a2533e56ef850696065b23a5"
 overlay-triplets-path = "dist/vcpkg-triplets"
 
 # If other targets start using custom triplets like x86_64-pc-windows-msvc,

Cargo.toml

@@ -72,7 +72,7 @@ pub unsafe extern "C" fn tectonic_flate_compress(
         (c.total_out(), FlateResult::Success)
     };
 
-    *output_len = size as u64;
+    *output_len = size;
     result
 }
 
@@ -101,7 +101,7 @@ pub unsafe extern "C" fn tectonic_flate_decompress(
         Err(_) => (0, FlateResult::OtherError),
     };
 
-    *output_len = size as u64;
+    *output_len = size;
     result
 }
 

crates/bridge_flate/src/lib.rs

@@ -525,7 +525,7 @@ impl<CB: CacheBackend> CachingBundle<CB> {
             // The resolved URL has changed, but the digest is the same. So
             // let's just update the URL and keep going.
             let resolved_path = make_txt_path(&self.resolved_base, &pull_data.digest.to_string());
-            file_create_write(&resolved_path, |f| {
+            file_create_write(resolved_path, |f| {
                 f.write_all(pull_data.resolved_url.as_bytes())
             })?;
 
@@ -647,7 +647,7 @@ impl<CB: CacheBackend> IoProvider for CachingBundle<CB> {
             OpenResult::Err(e) => return OpenResult::Err(e),
         };
 
-        let f = match File::open(&path) {
+        let f = match File::open(path) {
             Ok(f) => f,
             Err(e) => return OpenResult::Err(e.into()),
         };

crates/bundles/src/cache.rs

@@ -954,7 +954,7 @@ impl<T: XdvEvents> XdvParser<T> {
         }
 
         let char_num = cursor.get_compact_i32_smpos(opcode - Opcode::SetChar1 as u8)?;
-        self.cur_char_run.push(char_num as i32);
+        self.cur_char_run.push(char_num);
         Ok(())
     }
 

crates/xdv/src/lib.rs

@@ -190,7 +190,7 @@ impl ControlSeqHash {
                 // The 1 here is formally ACTIVE_BASE
                 return Some(format!(
                     "[active character {}]",
-                    crate::format::fmt_usv(p as i32 - 1)
+                    crate::format::fmt_usv(p - 1)
                 ));
             }
         }

crates/xetex_format/src/cshash.rs

@@ -108,7 +108,7 @@ impl EquivalenciesTable {
             engine.symbols.lookup("UNDEFINED_CONTROL_SEQUENCE") as EqtbPointer;
         let undefined_cs_cmd = engine.symbols.lookup("UNDEFINED_CS") as CommandCode;
 
-        let mut eqtb = vec![0; (eqtb_top as usize + 1) * SIZEOF_MEMORY_WORD];
+        let mut eqtb = vec![0; (eqtb_top + 1) * SIZEOF_MEMORY_WORD];
 
         write_eqtb_type(&mut eqtb[..], undefined_control_sequence, undefined_cs_cmd);
         write_eqtb_value(&mut eqtb[..], undefined_control_sequence, TEX_NULL);

crates/xetex_format/src/eqtb.rs

@@ -271,7 +271,7 @@ impl Format {
 
     fn fmt_cs_pointer(&self, ptr: EqtbPointer) -> String {
         if let Some(text) = self.cshash.stringify(ptr, &self.strings) {
-            fmt_csname(&text)
+            fmt_csname(text)
         } else {
             format!("[undecodable cseq pointer {}]", ptr)
         }
@@ -314,7 +314,7 @@ fn parse_body(engine: Engine, input: &[u8]) -> IResult<&[u8], Format> {
     let (input, hash_high) = be_i32(input)?;
     let (input, _mem_top) = parseutils::satisfy_be_i32(mem_top)(input)?;
     let (input, _eqtb_size) = parseutils::satisfy_be_i32(eqtb_size)(input)?;
-    let (input, _hash_prime) = parseutils::satisfy_be_i32(hash_prime as i32)(input)?;
+    let (input, _hash_prime) = parseutils::satisfy_be_i32(hash_prime)(input)?;
     let (input, _hyph_prime) = be_i32(input)?;
 
     // string table
@@ -330,9 +330,9 @@ fn parse_body(engine: Engine, input: &[u8]) -> IResult<&[u8], Format> {
     let (input, eqtb) = eqtb::EquivalenciesTable::parse(input, &engine, hash_high)?;
 
     // nominally hash_top, but hash_top = eqtb_top since hash_extra is nonzero
-    let (input, _par_loc) = parseutils::ranged_be_i32(hash_base as i32, eqtb_top as i32)(input)?;
+    let (input, _par_loc) = parseutils::ranged_be_i32(hash_base, eqtb_top)(input)?;
 
-    let (input, _write_loc) = parseutils::ranged_be_i32(hash_base as i32, eqtb_top as i32)(input)?;
+    let (input, _write_loc) = parseutils::ranged_be_i32(hash_base, eqtb_top)(input)?;
 
     // Primitives. TODO: figure out best type for `prims`.
 
@@ -349,7 +349,7 @@ fn parse_body(engine: Engine, input: &[u8]) -> IResult<&[u8], Format> {
     let (input, _font_info) = count(be_i64, fmem_ptr as usize)(input)?;
 
     // NB: FONT_BASE = 0
-    let (input, font_ptr) = parseutils::ranged_be_i32(0, max_fonts as i32)(input)?;
+    let (input, font_ptr) = parseutils::ranged_be_i32(0, max_fonts)(input)?;
 
     let n_fonts = font_ptr as usize + 1;
     let (input, _font_check) = count(be_i64, n_fonts)(input)?;

crates/xetex_format/src/format.rs

@@ -46,7 +46,7 @@ impl Memory {
 
         // Compressed memory loading;
 
-        let mut mem = vec![0; (mem_top as usize + 1) * SIZEOF_MEMORY_WORD];
+        let mut mem = vec![0; (mem_top + 1) * SIZEOF_MEMORY_WORD];
         let mut input = input;
         let mut p = 0;
         let mut q = rover;
@@ -72,7 +72,7 @@ impl Memory {
         }
 
         // Loading the rest of low memory. TODO: straight into `mem`?
-        let nb = (lo_mem_max + 1 - p as i32) as usize * SIZEOF_MEMORY_WORD;
+        let nb = (lo_mem_max + 1 - p) as usize * SIZEOF_MEMORY_WORD;
         let (input, block) = count(be_u8, nb)(input)?;
         let idx = p as usize * SIZEOF_MEMORY_WORD;
         mem[idx..idx + nb].copy_from_slice(&block[..]);

crates/xetex_format/src/mem.rs

@@ -16,6 +16,7 @@
 - [`tectonic -X compile`](v2cli/compile.md)
 - [`tectonic -X dump`](v2cli/dump.md)
 - [`tectonic -X new`](v2cli/new.md)
+- [`tectonic -X init`](v2cli/init.md)
 - [`tectonic -X show`](v2cli/show.md)
 - [`tectonic -X watch`](v2cli/watch.md)