From 9a211eb11f9cae8d13bf1ec20c422aee578e00aa Mon Sep 17 00:00:00 2001
From: xzyfer <xzyfer@gmail.com>
Date: Mon, 2 Jul 2018 21:11:13 +1000
Subject: [PATCH] Revert "Add a deprecation warning for @import's that resolved
 .css files"

This reverts commit fd989f6fb783a0f0f0f5892b1f710fdedb94a579.
---
 src/context.cpp | 8 --------
 src/file.cpp    | 4 ++--
 src/file.hpp    | 7 +------
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/context.cpp b/src/context.cpp
index dd6d74bfd..dae2cbd75 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -365,14 +365,6 @@ namespace Sass {
     // process the resolved entry
     else if (resolved.size() == 1) {
       bool use_cache = c_importers.size() == 0;
-      if (resolved[0].deprecated) {
-        // emit deprecation warning when import resolves to a .css file
-        deprecated(
-          "Including .css files with @import is non-standard behaviour which will be removed in future versions of LibSass.",
-          "Use a custom importer to maintain this behaviour. Check your implementations documentation on how to create a custom importer.",
-          true, pstate
-        );
-      }
       // use cache for the resource loading
       if (use_cache && sheets.count(resolved[0].abs_path)) return resolved[0];
       // try to read the content of the resolved file entry
diff --git a/src/file.cpp b/src/file.cpp
index 61b8f2ddf..46973057a 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -354,13 +354,13 @@ namespace Sass {
       for(auto ext : d_exts) {
         rel_path = join_paths(base, "_" + name + ext);
         abs_path = join_paths(root, rel_path);
-        if (file_exists(abs_path)) includes.push_back({{ rel_path, root }, abs_path, true });
+        if (file_exists(abs_path)) includes.push_back({{ rel_path, root }, abs_path });
       }
       // next test plain name with d_exts
       for(auto ext : d_exts) {
         rel_path = join_paths(base, name + ext);
         abs_path = join_paths(root, rel_path);
-        if (file_exists(abs_path)) includes.push_back({{ rel_path, root }, abs_path, true });
+        if (file_exists(abs_path)) includes.push_back({{ rel_path, root }, abs_path });
       }
       // nothing found
       return includes;
diff --git a/src/file.hpp b/src/file.hpp
index 718a529cd..759996fa8 100644
--- a/src/file.hpp
+++ b/src/file.hpp
@@ -89,14 +89,9 @@ namespace Sass {
     public:
       // resolved absolute path
       std::string abs_path;
-      // is a deprecated file type
-      bool deprecated;
     public:
-      Include(const Importer& imp, std::string abs_path, bool deprecated)
-      : Importer(imp), abs_path(abs_path), deprecated(deprecated)
-      { }
       Include(const Importer& imp, std::string abs_path)
-      : Importer(imp), abs_path(abs_path), deprecated(false)
+      : Importer(imp), abs_path(abs_path)
       { }
   };