- 
                Notifications
    You must be signed in to change notification settings 
- Fork 343
verbose errors feature #551
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
          
     Merged
      
      
            yoshuawuyts
  merged 3 commits into
  async-rs:master
from
killercup:feature/verbose-errors
  
      
      
   
  Nov 20, 2019 
      
    
  
     Merged
                    Changes from all commits
      Commits
    
    
            Show all changes
          
          
            3 commits
          
        
        Select commit
          Hold shift + click to select a range
      
      
    File filter
Filter by extension
Conversations
          Failed to load comments.   
        
        
          
      Loading
        
  Jump to
        
          Jump to file
        
      
      
          Failed to load files.   
        
        
          
      Loading
        
  Diff view
Diff view
There are no files selected for viewing
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
              | Original file line number | Diff line number | Diff line change | 
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| use crate::utils::Context; | ||
|  | ||
| /// Wrap `std::io::Error` with additional message | ||
| /// | ||
| /// Keeps the original error kind and stores the original I/O error as `source`. | ||
| impl<T> Context for Result<T, std::io::Error> { | ||
| fn context(self, message: impl Fn() -> String) -> Self { | ||
| self.map_err(|e| VerboseError::wrap(e, message())) | ||
| } | ||
| } | ||
|  | ||
| use std::{error::Error as StdError, fmt, io}; | ||
|  | ||
| #[derive(Debug)] | ||
| pub(crate) struct VerboseError { | ||
| There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm sure this type could be using  | ||
| source: io::Error, | ||
| message: String, | ||
| } | ||
|  | ||
| impl VerboseError { | ||
| pub(crate) fn wrap(source: io::Error, message: impl Into<String>) -> io::Error { | ||
| io::Error::new( | ||
| source.kind(), | ||
| VerboseError { | ||
| source, | ||
| message: message.into(), | ||
| }, | ||
| ) | ||
| } | ||
| } | ||
|  | ||
| impl fmt::Display for VerboseError { | ||
| fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
| write!(f, "{}", self.message) | ||
| } | ||
| } | ||
|  | ||
| impl StdError for VerboseError { | ||
| fn description(&self) -> &str { | ||
| self.source.description() | ||
| } | ||
|  | ||
| fn source(&self) -> Option<&(dyn StdError + 'static)> { | ||
| Some(&self.source) | ||
| } | ||
| } | ||
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              | Original file line number | Diff line number | Diff line change | 
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| use async_std::{fs, task}; | ||
|  | ||
| #[test] | ||
| fn open_file() { | ||
| task::block_on(async { | ||
| let non_existing_file = "/ashjudlkahasdasdsikdhajik/asdasdasdasdasdasd/fjuiklashdbflasas"; | ||
| let res = fs::File::open(non_existing_file).await; | ||
| match res { | ||
| Ok(_) => panic!("Found file with random name: We live in a simulation"), | ||
| Err(e) => assert_eq!( | ||
| "Could not open /ashjudlkahasdasdsikdhajik/asdasdasdasdasdasd/fjuiklashdbflasas", | ||
| &format!("{}", e) | ||
| ), | ||
| } | ||
| }) | ||
| } | 
  Add this suggestion to a batch that can be applied as a single commit.
  This suggestion is invalid because no changes were made to the code.
  Suggestions cannot be applied while the pull request is closed.
  Suggestions cannot be applied while viewing a subset of changes.
  Only one suggestion per line can be applied in a batch.
  Add this suggestion to a batch that can be applied as a single commit.
  Applying suggestions on deleted lines is not supported.
  You must change the existing code in this line in order to create a valid suggestion.
  Outdated suggestions cannot be applied.
  This suggestion has been applied or marked resolved.
  Suggestions cannot be applied from pending reviews.
  Suggestions cannot be applied on multi-line comments.
  Suggestions cannot be applied while the pull request is queued to merge.
  Suggestion cannot be applied right now. Please check back later.
  
    
  
    
Uh oh!
There was an error while loading. Please reload this page.