auto merge of #2369 : glennw/servo/issue-2308, r=metajack
auto merge of #2369 : glennw/servo/issue-2308, r=metajack

There might be a "cleaner" rust way to separate the scope and invoke the drop() call?
 

pyfisch/servo,pyfisch/servo,RenaudParis/servo,upsuper/servo,emilio/servo,WriterOfAlicrow/servo,indykish/servo,splav/servo,dagnir/servo,avadacatavra/servo,rixrix/servo,rixrix/servo,emilio/servo,jimberlage/servo,steveklabnik/servo,SimonSapin/servo,szeged/servo,anthgur/servo,anthgur/servo,dagnir/servo,juzer10/servo,hyowon/servo,jdramani/servo,mukilan/servo,eddyb/servo,DominoTree/servo,deokjinkim/servo,szeged/servo,dmarcos/servo,notriddle/servo,mukilan/servo,paulrouget/servo,mattnenterprise/servo,huonw/servo,cbrewster/servo,dvberkel/servo,srbhklkrn/SERVOENGINE,kindersung/servo,srbhklkrn/SERVOENGINE,thiagopnts/servo,CJ8664/servo,cbrewster/servo,ConnorGBrewster/servo,Shraddha512/servo,zentner-kyle/servo,emilio/servo,saneyuki/servo,g-k/servo,emilio/servo,dsandeephegde/servo,michaelwu/servo,boghison/servo,paulrouget/servo,nick-thompson/servo,avadacatavra/servo,pgonda/servo,tafia/servo,mdibaiee/servo,karlito40/servo,froydnj/servo,meh/servo,cbrewster/servo,dvberkel/servo,nnethercote/servo,paulrouget/servo,splav/servo,s142857/servo,szeged/servo,tafia/servo,hyowon/servo,mattnenterprise/servo,snf/servo,rnestler/servo,kindersung/servo,chotchki/servo,GreenRecycleBin/servo,jgraham/servo,SimonSapin/servo,walac/servo,tempbottle/servo,tschneidereit/servo,nrc/servo,pyecs/servo,nrc/servo,jlegendary/servo,snf/servo,indykish/servo,steveklabnik/servo,vks/servo,zentner-kyle/servo,echochamber/servo,tempbottle/servo,mattnenterprise/servo,chotchki/servo,larsbergstrom/servo,bjwbell/servo,notriddle/servo,paulrouget/servo,CJ8664/servo,RenaudParis/servo,dagnir/servo,nick-thompson/servo,nnethercote/servo,seanmonstar/servo,eddyb/servo,dati91/servo,boghison/servo,dvberkel/servo,g-k/servo,sadmansk/servo,zhangjunlei26/servo,mbrubeck/servo,KiChjang/servo,szeged/servo,deokjinkim/servo,meh/servo,youprofit/servo,evilpie/servo,splav/servo,KiChjang/servo,CJ8664/servo,samfoo/servo,chotchki/servo,mt2d2/servo,ruud-v-a/servo,GreenRecycleBin/servo,peterjoel/servo,dsandeephegde/servo,ConnorGBrewster/servo,ryancanhelpyou/servo,bfrohs/servo,ConnorGBrewster/servo,nrc/servo,meh/servo,A-deLuna/servo,rentongzhang/servo,RenaudParis/servo,saneyuki/servo,tempbottle/servo,canaltinova/servo,DominoTree/servo,ConnorGBrewster/servo,froydnj/servo,jdramani/servo,indykish/servo,juzer10/servo,srbhklkrn/SERVOENGINE,ryancanhelpyou/servo,mbrubeck/servo,avadacatavra/servo,RenaudParis/servo,mt2d2/servo,GyrosOfWar/servo,dati91/servo,dati91/servo,WriterOfAlicrow/servo,saneyuki/servo,Shraddha512/servo,szeged/servo,samfoo/servo,ryancanhelpyou/servo,Shraddha512/servo,j3parker/servo,pyecs/servo,splav/servo,luniv/servo,dsandeephegde/servo,dagnir/servo,wartman4404/servo,wpgallih/servo,luniv/servo,caldwell/servo,nerith/servo,huonw/servo,nnethercote/servo,brendandahl/servo,KiChjang/servo,dsandeephegde/servo,huonw/servo,pyfisch/servo,mattnenterprise/servo,dati91/servo,avadacatavra/servo,s142857/servo,rentongzhang/servo,karlito40/servo,jimberlage/servo,evilpie/servo,steveklabnik/servo,paulrouget/servo,echochamber/servo,caldwell/servo,nnethercote/servo,ryancanhelpyou/servo,dhananjay92/servo,froydnj/servo,snf/servo,CJ8664/servo,canaltinova/servo,pyfisch/servo,tafia/servo,thiagopnts/servo,saratang/servo,A-deLuna/servo,jgraham/servo,dmarcos/servo,notriddle/servo,seanmonstar/servo,aweinstock314/servo,brendandahl/servo,upsuper/servo,WriterOfAlicrow/servo,shrenikgala/servo,upsuper/servo,nick-thompson/servo,mbrubeck/servo,steveklabnik/servo,dmarcos/servo,vks/servo,huonw/servo,Adenilson/prototype-viewing-distance,akosel/servo,tempbottle/servo,vks/servo,ConnorGBrewster/servo,bfrohs/servo,akosel/servo,nerith/servo,ruud-v-a/servo,caldwell/servo,notriddle/servo,A-deLuna/servo,sadmansk/servo,hyowon/servo,larsbergstrom/servo,seanmonstar/servo,emilio/servo,kindersung/servo,froydnj/servo,thiagopnts/servo,bjwbell/servo,evilpie/servo,luniv/servo,mt2d2/servo,DominoTree/servo,luniv/servo,fiji-flo/servo,saneyuki/servo,thiagopnts/servo,mbrubeck/servo,pgonda/servo,larsbergstrom/servo,rixrix/servo,A-deLuna/servo,GyrosOfWar/servo,j3parker/servo,deokjinkim/servo,jlegendary/servo,mbrubeck/servo,CJ8664/servo,evilpie/servo,notriddle/servo,rnestler/servo,paulrouget/servo,meh/servo,tschneidereit/servo,michaelwu/servo,AnthonyBroadCrawford/servo,kindersung/servo,cbrewster/servo,jgraham/servo,rixrix/servo,wartman4404/servo,mdibaiee/servo,Adenilson/prototype-viewing-distance,zhangjunlei26/servo,CJ8664/servo,juzer10/servo,shrenikgala/servo,samfoo/servo,anthgur/servo,nnethercote/servo,saratang/servo,aweinstock314/servo,Adenilson/prototype-viewing-distance,rnestler/servo,meh/servo,huonw/servo,DominoTree/servo,deokjinkim/servo,indykish/servo,sadmansk/servo,tafia/servo,luniv/servo,paulrouget/servo,codemac/servo,splav/servo,rnestler/servo,avadacatavra/servo,snf/servo,vks/servo,srbhklkrn/SERVOENGINE,pyecs/servo,shrenikgala/servo,runarberg/servo,srbhklkrn/SERVOENGINE,mt2d2/servo,dhananjay92/servo,nrc/servo,WriterOfAlicrow/servo,eddyb/servo,caldwell/servo,nrc/servo,hyowon/servo,bfrohs/servo,ryancanhelpyou/servo,notriddle/servo,kindersung/servo,DominoTree/servo,g-k/servo,tschneidereit/servo,zentner-kyle/servo,zentner-kyle/servo,froydnj/servo,wpgallih/servo,boghison/servo,jgraham/servo,dsandeephegde/servo,seanmonstar/servo,jlegendary/servo,jimberlage/servo,GyrosOfWar/servo,bfrohs/servo,CJ8664/servo,saneyuki/servo,WriterOfAlicrow/servo,DominoTree/servo,aidanhs/servo,jlegendary/servo,rnestler/servo,hyowon/servo,cbrewster/servo,g-k/servo,AnthonyBroadCrawford/servo,pyfisch/servo,saneyuki/servo,splav/servo,jgraham/servo,j3parker/servo,codemac/servo,pyecs/servo,huonw/servo,runarberg/servo,jimberlage/servo,emilio/servo,pgonda/servo,SimonSapin/servo,larsbergstrom/servo,wartman4404/servo,hyowon/servo,KiChjang/servo,dvberkel/servo,GreenRecycleBin/servo,echochamber/servo,anthgur/servo,dhananjay92/servo,GreenRecycleBin/servo,szeged/servo,A-deLuna/servo,ruud-v-a/servo,GreenRecycleBin/servo,notriddle/servo,splav/servo,mdibaiee/servo,wartman4404/servo,dsandeephegde/servo,Shraddha512/servo,j3parker/servo,A-deLuna/servo,dagnir/servo,saneyuki/servo,mattnenterprise/servo,splav/servo,zentner-kyle/servo,huonw/servo,avadacatavra/servo,emilio/servo,youprofit/servo,karlito40/servo,ruud-v-a/servo,snf/servo,canaltinova/servo,walac/servo,dati91/servo,larsbergstrom/servo,echochamber/servo,jimberlage/servo,runarberg/servo,zentner-kyle/servo,shrenikgala/servo,nick-thompson/servo,srbhklkrn/SERVOENGINE,saratang/servo,GreenRecycleBin/servo,eddyb/servo,michaelwu/servo,aidanhs/servo,echochamber/servo,s142857/servo,cbrewster/servo,bjwbell/servo,caldwell/servo,evilpie/servo,szeged/servo,codemac/servo,tempbottle/servo,larsbergstrom/servo,GreenRecycleBin/servo,jlegendary/servo,dati91/servo,tempbottle/servo,aweinstock314/servo,runarberg/servo,bfrohs/servo,peterjoel/servo,upsuper/servo,nrc/servo,wartman4404/servo,zhangjunlei26/servo,samfoo/servo,pyfisch/servo,samfoo/servo,mukilan/servo,cbrewster/servo,anthgur/servo,saneyuki/servo,notriddle/servo,rentongzhang/servo,pyfisch/servo,shrenikgala/servo,mbrubeck/servo,GreenRecycleBin/servo,akosel/servo,karlito40/servo,fiji-flo/servo,rentongzhang/servo,michaelwu/servo,indykish/servo,Adenilson/prototype-viewing-distance,wpgallih/servo,codemac/servo,bjwbell/servo,brendandahl/servo,zhangjunlei26/servo,Adenilson/prototype-viewing-distance,peterjoel/servo,seanmonstar/servo,thiagopnts/servo,zhangjunlei26/servo,akosel/servo,rixrix/servo,Shraddha512/servo,Adenilson/prototype-viewing-distance,vks/servo,ConnorGBrewster/servo,rnestler/servo,snf/servo,nnethercote/servo,SimonSapin/servo,mbrubeck/servo,mbrubeck/servo,anthgur/servo,Shraddha512/servo,CJ8664/servo,upsuper/servo,wpgallih/servo,eddyb/servo,youprofit/servo,codemac/servo,nnethercote/servo,peterjoel/servo,brendandahl/servo,cbrewster/servo,pyecs/servo,jgraham/servo,michaelwu/servo,pyfisch/servo,runarberg/servo,shrenikgala/servo,saratang/servo,aidanhs/servo,GreenRecycleBin/servo,ryancanhelpyou/servo,deokjinkim/servo,A-deLuna/servo,mukilan/servo,larsbergstrom/servo,nerith/servo,KiChjang/servo,mukilan/servo,steveklabnik/servo,juzer10/servo,upsuper/servo,codemac/servo,sadmansk/servo,thiagopnts/servo,wpgallih/servo,fiji-flo/servo,larsbergstrom/servo,saratang/servo,indykish/servo,mattnenterprise/servo,g-k/servo,pyecs/servo,froydnj/servo,g-k/servo,jdramani/servo,jdramani/servo,indykish/servo,dmarcos/servo,nerith/servo,rentongzhang/servo,tschneidereit/servo,youprofit/servo,WriterOfAlicrow/servo,notriddle/servo,jdramani/servo,nerith/servo,peterjoel/servo,samfoo/servo,walac/servo,mdibaiee/servo,SimonSapin/servo,dsandeephegde/servo,akosel/servo,snf/servo,pyfisch/servo,ruud-v-a/servo,echochamber/servo,Adenilson/prototype-viewing-distance,aidanhs/servo,KiChjang/servo,splav/servo,pgonda/servo,jimberlage/servo,peterjoel/servo,szeged/servo,mattnenterprise/servo,wartman4404/servo,anthgur/servo,nnethercote/servo,nrc/servo,nnethercote/servo,aweinstock314/servo,thiagopnts/servo,jimberlage/servo,tschneidereit/servo,sadmansk/servo,aweinstock314/servo,chotchki/servo,kindersung/servo,g-k/servo,rixrix/servo,thiagopnts/servo,SimonSapin/servo,RenaudParis/servo,runarberg/servo,DominoTree/servo,upsuper/servo,aidanhs/servo,tafia/servo,aweinstock314/servo,ConnorGBrewster/servo,pgonda/servo,juzer10/servo,dmarcos/servo,nick-thompson/servo,dhananjay92/servo,tafia/servo,dhananjay92/servo,dvberkel/servo,dmarcos/servo,michaelwu/servo,anthgur/servo,pgonda/servo,zentner-kyle/servo,evilpie/servo,nnethercote/servo,walac/servo,zhangjunlei26/servo,mdibaiee/servo,shrenikgala/servo,indykish/servo,fiji-flo/servo,j3parker/servo,chotchki/servo,canaltinova/servo,fiji-flo/servo,szeged/servo,paulrouget/servo,paulrouget/servo,canaltinova/servo,deokjinkim/servo,KiChjang/servo,codemac/servo,saratang/servo,emilio/servo,boghison/servo,eddyb/servo,aidanhs/servo,rnestler/servo,samfoo/servo,mt2d2/servo,jlegendary/servo,jdramani/servo,jgraham/servo,emilio/servo,juzer10/servo,juzer10/servo,notriddle/servo,aidanhs/servo,KiChjang/servo,dagnir/servo,indykish/servo,chotchki/servo,canaltinova/servo,peterjoel/servo,splav/servo,kindersung/servo,luniv/servo,akosel/servo,tempbottle/servo,boghison/servo,avadacatavra/servo,caldwell/servo,dati91/servo,mdibaiee/servo,zhangjunlei26/servo,ryancanhelpyou/servo,luniv/servo,dmarcos/servo,sadmansk/servo,fiji-flo/servo,runarberg/servo,pgonda/servo,jimberlage/servo,walac/servo,dhananjay92/servo,srbhklkrn/SERVOENGINE,larsbergstrom/servo,echochamber/servo,upsuper/servo,ruud-v-a/servo,s142857/servo,bjwbell/servo,karlito40/servo,mukilan/servo,bfrohs/servo,RenaudParis/servo,Shraddha512/servo,steveklabnik/servo,brendandahl/servo,wpgallih/servo,AnthonyBroadCrawford/servo,AnthonyBroadCrawford/servo,KiChjang/servo,SimonSapin/servo,nick-thompson/servo,vks/servo,rixrix/servo,j3parker/servo,DominoTree/servo,paulrouget/servo,s142857/servo,nick-thompson/servo,szeged/servo,vks/servo,larsbergstrom/servo,rixrix/servo,brendandahl/servo,youprofit/servo,peterjoel/servo,jlegendary/servo,saratang/servo,mattnenterprise/servo,aweinstock314/servo,s142857/servo,boghison/servo,DominoTree/servo,walac/servo,zhangjunlei26/servo,boghison/servo,eddyb/servo,rentongzhang/servo,s142857/servo,tafia/servo,AnthonyBroadCrawford/servo,tschneidereit/servo,mdibaiee/servo,rentongzhang/servo,bjwbell/servo,WriterOfAlicrow/servo,evilpie/servo,DominoTree/servo,youprofit/servo,walac/servo,canaltinova/servo,jdramani/servo,hyowon/servo,ConnorGBrewster/servo,sadmansk/servo,peterjoel/servo,AnthonyBroadCrawford/servo,dagnir/servo,evilpie/servo,emilio/servo,peterjoel/servo,nerith/servo,eddyb/servo,youprofit/servo,wartman4404/servo,GyrosOfWar/servo,saneyuki/servo,dvberkel/servo,evilpie/servo,KiChjang/servo,pyecs/servo,bjwbell/servo,dsandeephegde/servo,jimberlage/servo,wpgallih/servo,seanmonstar/servo,sadmansk/servo,steveklabnik/servo,akosel/servo,wpgallih/servo,j3parker/servo,GyrosOfWar/servo,caldwell/servo,saneyuki/servo,canaltinova/servo,mt2d2/servo,dati91/servo,wpgallih/servo,meh/servo,GyrosOfWar/servo,SimonSapin/servo,brendandahl/servo,karlito40/servo,fiji-flo/servo,tschneidereit/servo,fiji-flo/servo,dhananjay92/servo,GyrosOfWar/servo,rixrix/servo,rnestler/servo,dvberkel/servo,pyfisch/servo,RenaudParis/servo,mt2d2/servo,deokjinkim/servo,AnthonyBroadCrawford/servo,nerith/servo,avadacatavra/servo,meh/servo,karlito40/servo,zhangjunlei26/servo