Merge branch 'master' into extend

doc-src/SASS_CHANGELOG.md

@@ -13,6 +13,14 @@ now allow whitespace before the colon. For example:
     foo
       color : blue
 
+### Minor Changes
+
+* Running `sass-convert --from sass --to sass` will raise an error
+  unless `--in-place` is provided,
+  to prevent accidental erasure of source files.
+
+* SCSS parsing speed is dramatically improved.
+
 ### Bug Fixes
 
 * Variables are now allowed as arguments to `url()`.

lib/haml/exec.rb

@@ -667,6 +667,11 @@ def process_directory
         end
         @options[:output] ||= @options[:input]
 
+        if @options[:to] == @options[:from] && !@options[:in_place]
+          fmt = @options[:from]
+          raise "Error: converting from #{fmt} to #{fmt} without --in-place"
+        end
+
         ext = @options[:from]
         ext = :sass if ext == :sass2
         Dir.glob("#{@options[:input]}/**/*.#{ext}") do |f|

lib/sass/scss/parser.rb

@@ -322,6 +322,7 @@ def block_contents(node, context)
       end
 
       def block_child(context)
+        return variable || directive || ruleset if context == :stylesheet
         variable || directive || declaration_or_ruleset
       end