Fix an issue with overlapping short options.

thedodd · thedodd · commit e7dce90b43c5 · 2020-08-27T11:39:09.000-05:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-18.04, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ changelog
 ## 0.1.2
 ### changed
 - Swap our `grass` for `sass-rs`.
+- Compress SASS/SCSS output when building in `--release` mode.
 
 ## 0.1.1
 ### fixed
diff --git a/README.md b/README.md
@@ -1,5 +1,12 @@
 <h1 align="center">trunk</h1>
 <div align="center">
+
+[![Build Status](https://github.com/thedodd/trunk/workflows/ci/badge.svg?branch=master)](https://github.com/thedodd/trunk/actions)
+[![Crates.io](https://img.shields.io/crates/v/trunk.svg)](https://crates.io/crates/trunk)
+[![License](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue)](LICENSE)
+![Crates.io](https://img.shields.io/crates/d/trunk.svg)
+![Crates.io](https://img.shields.io/crates/dv/trunk.svg)
+
   <strong>
     Build, bundle & ship your Rust WASM application to the web.
   </strong>
@@ -10,12 +17,6 @@
 </div>
 <br/>
 
-[![Build Status](https://github.com/thedodd/trunk/workflows/ci/badge.svg?branch=master)](https://github.com/thedodd/trunk/actions)
-[![Crates.io](https://img.shields.io/crates/v/trunk.svg)](https://crates.io/crates/trunk)
-[![License](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue)](LICENSE)
-![Crates.io](https://img.shields.io/crates/d/trunk.svg)
-![Crates.io](https://img.shields.io/crates/dv/trunk.svg)
-
 Goals:
 - Leverage the wasm-bindgen ecosystem for all things related to building Rust WASM for the web.
 - Simple, zero-config bundling of WASM, JS loader & other assets (images, css, scss) via a source HTML file.
@@ -43,7 +44,7 @@ pub fn main() {
 }
 ```
 
-Trunk uses a source HTML file to drive all asset building and bundling. Trunk also ships with a [built-in SASS/SCSS compiler](https://github.com/connorskees/grass), so let's get started with the following example. Copy this HTML to your cargo project's `src` dir at `src/index.html`:
+Trunk uses a source HTML file to drive all asset building and bundling. Trunk also ships with a [built-in SASS/SCSS compiler](https://github.com/compass-rs/sass-rs), so let's get started with the following example. Copy this HTML to your cargo project's `src` dir at `src/index.html`:
 
 ```html
 <html>
@@ -88,7 +89,7 @@ Trunk leverages Rust's powerful concurrency primitives for maximum build speeds.
 Trunk is still a young project, and new asset types will be added as we move forward. Keep an eye on [trunk#3](https://github.com/thedodd/trunk/issues/3) for more information on planned asset types, implementation status, and please contribute to the discussion if you think something is missing.
 
 Currently supported assets:
-- ✅ `sass`: Trunk ships with a [built-in sass/scss compiler](https://github.com/connorskees/grass). Just link to your sass files from your source HTML, and Trunk will handle the rest. This content is hashed for cache control.
+- ✅ `sass`: Trunk ships with a [built-in sass/scss compiler](https://github.com/compass-rs/sass-rs). Just link to your sass files from your source HTML, and Trunk will handle the rest. This content is hashed for cache control.
 - ✅ `css`: Trunk will copy linked css files found in the source HTML without content modification. This content is hashed for cache control.
   - In the future, Trunk will resolve local `@imports`, will handle minification (see [trunk#7](https://github.com/thedodd/trunk/issues/3)), and we may even look into a pattern where any CSS found in the source tree will be bundled, which would enable a nice zero-config "component styles" pattern. See [trunk#3](https://github.com/thedodd/trunk/issues/3) for more details.
 - ✅ `icon`: Trunk will automatically copy referenced icons to the `dist` dir. This content is hashed for cache control.
diff --git a/src/cmd/build.rs b/src/cmd/build.rs
@@ -21,7 +21,7 @@ pub struct Build {
     #[structopt(short, long, default_value="dist", parse(from_os_str))]
     dist: PathBuf,
     /// The public URL from which assets are to be served.
-    #[structopt(short, long, default_value="/", parse(from_str=parse_public_url))]
+    #[structopt(long, default_value="/", parse(from_str=parse_public_url))]
     public_url: String,
 }
 
diff --git a/src/cmd/serve.rs b/src/cmd/serve.rs
@@ -29,7 +29,7 @@ pub struct Serve {
     #[structopt(short, long, default_value="dist", parse(from_os_str))]
     dist: PathBuf,
     /// The public URL from which assets are to be served.
-    #[structopt(short, long, default_value="/", parse(from_str=parse_public_url))]
+    #[structopt(long, default_value="/", parse(from_str=parse_public_url))]
     public_url: String,
     /// Additional paths to ignore.
     #[structopt(short, long, parse(from_os_str))]
diff --git a/src/cmd/watch.rs b/src/cmd/watch.rs
@@ -21,7 +21,7 @@ pub struct Watch {
     #[structopt(short, long, default_value="dist", parse(from_os_str))]
     dist: PathBuf,
     /// The public URL from which assets are to be served.
-    #[structopt(short, long, default_value="/", parse(from_str=parse_public_url))]
+    #[structopt(long, default_value="/", parse(from_str=parse_public_url))]
     public_url: String,
     /// Additional paths to ignore.
     #[structopt(short, long, parse(from_os_str))]

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ pub struct Build {`
`21`	`21`	`#[structopt(short, long, default_value="dist", parse(from_os_str))]`
`22`	`22`	`dist: PathBuf,`
`23`	`23`	`/// The public URL from which assets are to be served.`
`24`		`- #[structopt(short, long, default_value="/", parse(from_str=parse_public_url))]`
	`24`	`+ #[structopt(long, default_value="/", parse(from_str=parse_public_url))]`
`25`	`25`	`public_url: String,`
`26`	`26`	`}`
`27`	`27`