From 2cf0866ba3f4a32a180e0b02484ef1798216c6e1 Mon Sep 17 00:00:00 2001
From: Ry Dahl <ry@tinyclouds.org>
Date: Thu, 7 Nov 2019 14:21:45 -0500
Subject: upgrade: Rust 1.39.0 (#3286)

---
 .github/workflows/ci.yml | 2 +-
 cli/compilers/ts.rs      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b5ec28954..84967caa8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,7 +45,7 @@ jobs:
       - name: Install rust
         uses: hecrj/setup-rust-action@v1
         with:
-          rust-version: "1.38.0"
+          rust-version: "1.39.0"
 
       - name: Install clippy and rustfmt
         if: matrix.kind == 'lint'
diff --git a/cli/compilers/ts.rs b/cli/compilers/ts.rs
index 3c36f14c4..854963eaa 100644
--- a/cli/compilers/ts.rs
+++ b/cli/compilers/ts.rs
@@ -580,7 +580,7 @@ impl SourceMapGetter for TsCompiler {
   fn get_source_map(&self, script_name: &str) -> Option<Vec<u8>> {
     self
       .try_to_resolve_and_get_source_map(script_name)
-      .and_then(|out| Some(out.source_code))
+      .map(|out| out.source_code)
   }
 
   fn get_source_line(&self, script_name: &str, line: usize) -> Option<String> {
-- 
cgit v1.2.3