Skip to content

Fix most of clippy warnings#1754

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.

Sign up for GitHub

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
kinnison merged 1 commit into from
Apr 14, 2019
Merged

Fix most of clippy warnings #1754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions download/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -266,7 +266,7 @@ pub mod reqwest_be {

if !res.status().is_success() {
let code: u16 = res.status().into();
return Err(ErrorKind::HttpStatus(code as u32).into());
return Err(ErrorKind::HttpStatus(u32::from(code)).into());
}

let buffer_size = 0x10000;
Expand DownExpand Up@@ -345,13 +345,13 @@ pub mod reqwest_be {
return Err(ErrorKind::FileNotFound.into());
}

let ref mut f = fs::File::open(src).chain_err(|| "unable to open downloaded file")?;
io::Seek::seek(f, io::SeekFrom::Start(resume_from))?;
let mut f = fs::File::open(src).chain_err(|| "unable to open downloaded file")?;
io::Seek::seek(&mut f, io::SeekFrom::Start(resume_from))?;

let ref mut buffer = vec![0u8; 0x10000];
let mut buffer = vec![0u8; 0x10000];
loop {
let bytes_read =
io::Read::read(f, buffer).chain_err(|| "unable to read downloaded file")?;
let bytes_read = io::Read::read(&mut f, &mut buffer)
.chain_err(|| "unable to read downloaded file")?;
if bytes_read == 0 {
break;
}
Expand Down
32 changes: 15 additions & 17 deletions src/cli/common.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ pub fn read_line() -> Result<String> {
lines
.next()
.and_then(|l| l.ok())
.ok_or("unable to read from stdin for confirmation".into())
.ok_or_else(|| "unable to read from stdin for confirmation".into())
}

pub fn set_globals(verbose: bool) -> Result<Cfg> {
Expand DownExpand Up@@ -146,8 +146,8 @@ fn show_channel_updates(
toolchains: Vec<(String, rustup::Result<UpdateStatus>)>,
) -> Result<()> {
let data = toolchains.into_iter().map(|(name, result)| {
let ref toolchain = cfg.get_toolchain(&name, false).expect("");
let version = rustc_version(toolchain);
let toolchain = cfg.get_toolchain(&name, false).expect("");
let version = rustc_version(&toolchain);

let banner;
let color;
Expand DownExpand Up@@ -195,7 +195,7 @@ fn show_channel_updates(
let _ = t.reset();
let _ = writeln!(t, " - {}", version);
}
let _ = writeln!(t, "");
let _ = writeln!(t);

Ok(())
}
Expand DownExpand Up@@ -355,20 +355,18 @@ pub fn list_toolchains(cfg: &Cfg) -> Result<()> {

if toolchains.is_empty() {
println!("no installed toolchains");
} else if let Ok(Some(def_toolchain)) = cfg.find_default() {
for toolchain in toolchains {
let if_default = if def_toolchain.name() == &*toolchain {
" (default)"
} else {
""
};
println!("{}{}", &toolchain, if_default);
}
} else {
if let Ok(Some(def_toolchain)) = cfg.find_default() {
for toolchain in toolchains {
let if_default = if def_toolchain.name() == &*toolchain {
" (default)"
} else {
""
};
println!("{}{}", &toolchain, if_default);
}
} else {
for toolchain in toolchains {
println!("{}", &toolchain);
}
for toolchain in toolchains {
println!("{}", &toolchain);
}
}
Ok(())
Expand Down
2 changes: 1 addition & 1 deletion src/cli/download_tracker.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,7 @@ impl DownloadTracker {
if self.displayed_progress {
// Display the finished state
self.display();
let _ = writeln!(self.term.as_mut().unwrap(), "");
let _ = writeln!(self.term.as_mut().unwrap());
}
self.prepare_for_new_download();
}
Expand Down
10 changes: 5 additions & 5 deletions src/cli/log.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ pub fn warn_fmt(args: fmt::Arguments<'_>) {
let _ = write!(t, "warning: ");
let _ = t.reset();
let _ = t.write_fmt(args);
let _ = write!(t, "\n");
let _ = writeln!(t);
}

pub fn err_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -37,7 +37,7 @@ pub fn err_fmt(args: fmt::Arguments<'_>) {
let _ = write!(t, "error: ");
let _ = t.reset();
let _ = t.write_fmt(args);
let _ = write!(t, "\n");
let _ = writeln!(t);
}

pub fn info_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -46,7 +46,7 @@ pub fn info_fmt(args: fmt::Arguments<'_>) {
let _ = write!(t, "info: ");
let _ = t.reset();
let _ = t.write_fmt(args);
let _ = write!(t, "\n");
let _ = writeln!(t);
}

pub fn verbose_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -56,7 +56,7 @@ pub fn verbose_fmt(args: fmt::Arguments<'_>) {
let _ = write!(t, "verbose: ");
let _ = t.reset();
let _ = t.write_fmt(args);
let _ = write!(t, "\n");
let _ = writeln!(t);
}

pub fn debug_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -67,6 +67,6 @@ pub fn debug_fmt(args: fmt::Arguments<'_>) {
let _ = write!(t, "verbose: ");
let _ = t.reset();
let _ = t.write_fmt(args);
let _ = write!(t, "\n");
let _ = writeln!(t);
}
}
4 changes: 2 additions & 2 deletions src/cli/proxy_mode.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ pub fn main() -> Result<()> {
.as_ref()
.and_then(|a| a.file_name())
.and_then(|a| a.to_str());
let ref arg0 = arg0.ok_or(ErrorKind::NoExeName)?;
let arg0 = arg0.ok_or(ErrorKind::NoExeName)?;

// Check for a toolchain specifier.
let arg1 = args.next();
Expand All@@ -41,7 +41,7 @@ pub fn main() -> Result<()> {

let cfg = set_globals(false)?;
cfg.check_metadata_version()?;
direct_proxy(&cfg, arg0, toolchain, &cmd_args)?
direct_proxy(&cfg, &arg0, toolchain, &cmd_args)?
};

process::exit(c)
Expand Down
70 changes: 34 additions & 36 deletions src/cli/rustup_mode.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,11 +26,11 @@ fn handle_epipe(res: Result<()>) -> Result<()> {
pub fn main() -> Result<()> {
crate::self_update::cleanup_self_updater()?;

let ref matches = cli().get_matches();
let matches = cli().get_matches();
let verbose = matches.is_present("verbose");
let ref cfg = common::set_globals(verbose)?;
let cfg = &common::set_globals(verbose)?;

if maybe_upgrade_data(cfg, matches)? {
if maybe_upgrade_data(cfg, &matches)? {
return Ok(());
}

Expand DownExpand Up@@ -408,7 +408,7 @@ pub fn cli() -> App<'static, 'static> {
)
.args(
&DOCS_DATA
.into_iter()
.iter()
.map(|(name, help_msg, _)| Arg::with_name(name).long(name).help(help_msg))
.collect::<Vec<_>>(),
)
Expand All@@ -421,7 +421,7 @@ pub fn cli() -> App<'static, 'static> {
.group(
ArgGroup::with_name("page").args(
&DOCS_DATA
.into_iter()
.iter()
.map(|(name, _, _)| *name)
.collect::<Vec<_>>(),
),
Expand DownExpand Up@@ -497,7 +497,7 @@ fn update_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {
warn!("(partial) target triple specified instead of toolchain name");
let installed_toolchains = cfg.list_toolchains()?;
let default = cfg.find_default()?;
let default_name = default.map(|t| t.name().to_string()).unwrap_or("".into());
let default_name = default.map(|t| t.name().to_string()).unwrap_or_default();
let mut candidates = vec![];
for t in installed_toolchains {
if t == default_name {
Expand DownExpand Up@@ -545,11 +545,11 @@ fn default_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {
if let Some(triple) = PartialTargetTriple::from_str(name) {
warn!("(partial) target triple specified instead of toolchain name");
let default = cfg.find_default()?;
let default_name = default.map(|t| t.name().to_string()).unwrap_or("".into());
let default_name = default.map(|t| t.name().to_string()).unwrap_or_default();
if let Ok(mut desc) = PartialToolchainDesc::from_str(&default_name) {
desc.target = triple;
let maybe_toolchain = format!("{}", desc);
let ref toolchain = cfg.get_toolchain(maybe_toolchain.as_ref(), false)?;
let toolchain = cfg.get_toolchain(maybe_toolchain.as_ref(), false)?;
if toolchain.name() == default_name {
warn!(
"(partial) triple '{}' resolves to a toolchain that is already default",
Expand All@@ -569,9 +569,9 @@ fn default_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {

fn default_(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
if m.is_present("toolchain") {
let ref toolchain = m.value_of("toolchain").expect("");
let toolchain = m.value_of("toolchain").expect("");
default_bare_triple_check(cfg, toolchain)?;
let ref toolchain = cfg.get_toolchain(toolchain, false)?;
let toolchain = cfg.get_toolchain(toolchain, false)?;

let status = if !toolchain.is_custom() {
Some(toolchain.install_from_dist_if_not_installed()?)
Expand DownExpand Up@@ -634,7 +634,7 @@ fn update(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
}

fn run(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
let ref toolchain = m.value_of("toolchain").expect("");
let toolchain = m.value_of("toolchain").expect("");
let args = m.values_of("command").unwrap();
let args: Vec<_> = args.collect();
let cmd = cfg.create_command_for_toolchain(toolchain, m.is_present("install"), args[0])?;
Expand DownExpand Up@@ -669,9 +669,9 @@ fn show(cfg: &Cfg) -> Result<()> {
writeln!(t)?;
}

let ref cwd = utils::current_dir()?;
let cwd = utils::current_dir()?;
let installed_toolchains = cfg.list_toolchains()?;
let active_toolchain = cfg.find_override_toolchain_or_default(cwd);
let active_toolchain = cfg.find_override_toolchain_or_default(&cwd);

// active_toolchain will carry the reason we don't have one in its detail.
let active_targets = if let Ok(ref at) = active_toolchain {
Expand DownExpand Up@@ -791,8 +791,8 @@ fn show(cfg: &Cfg) -> Result<()> {
}

fn show_active_toolchain(cfg: &Cfg) -> Result<()> {
let ref cwd = utils::current_dir()?;
if let Some((toolchain, reason)) = cfg.find_override_toolchain_or_default(cwd)? {
let cwd = utils::current_dir()?;
if let Some((toolchain, reason)) = cfg.find_override_toolchain_or_default(&cwd)? {
if reason.is_some() {
println!("{} ({})", toolchain.name(), reason.unwrap());
} else {
Expand DownExpand Up@@ -895,18 +895,20 @@ fn explicit_or_dir_toolchain<'a>(cfg: &'a Cfg, m: &ArgMatches<'_>) -> Result<Too
return Ok(toolchain);
}

let ref cwd = utils::current_dir()?;
let (toolchain, _) = cfg.toolchain_for_dir(cwd)?;
let cwd = utils::current_dir()?;
let (toolchain, _) = cfg.toolchain_for_dir(&cwd)?;

Ok(toolchain)
}

fn toolchain_link(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
let ref toolchain = m.value_of("toolchain").expect("");
let ref path = m.value_of("path").expect("");
let toolchain = m.value_of("toolchain").expect("");
let path = m.value_of("path").expect("");
let toolchain = cfg.get_toolchain(toolchain, true)?;

Ok(toolchain.install_from_dir(Path::new(path), true)?)
toolchain
.install_from_dir(Path::new(path), true)
.map_err(|e| e.into())
}

fn toolchain_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
Expand All@@ -918,7 +920,7 @@ fn toolchain_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
}

fn override_add(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
let ref toolchain = m.value_of("toolchain").expect("");
let toolchain = m.value_of("toolchain").expect("");
let toolchain = cfg.get_toolchain(toolchain, false)?;

let status = if !toolchain.is_custom() {
Expand DownExpand Up@@ -957,12 +959,10 @@ fn override_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
info!("no nonexistent paths detected");
}
list
} else if m.is_present("path") {
vec![m.value_of("path").unwrap().to_string()]
} else {
if m.is_present("path") {
vec![m.value_of("path").unwrap().to_string()]
} else {
vec![utils::current_dir()?.to_str().unwrap().to_string()]
}
vec![utils::current_dir()?.to_str().unwrap().to_string()]
};

for path in paths {
Expand All@@ -984,7 +984,7 @@ fn override_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
Ok(())
}

const DOCS_DATA: &[(&'static str, &'static str, &'static str,)] = &[
const DOCS_DATA: &[(&str, &str, &str,)] = &[
// flags can be used to open specific documents, e.g. `rustup doc --nomicon`
// tuple elements: document name used as flag, help message, document index path
("alloc", "The Rust core allocation and collections library", "alloc/index.html"),
Expand All@@ -1006,21 +1006,19 @@ const DOCS_DATA: &[(&'static str, &'static str, &'static str,)] = &[
fn doc(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
let toolchain = explicit_or_dir_toolchain(cfg, m)?;

let doc_url = if let Some((_, _, path)) = DOCS_DATA
.into_iter()
.find(|(name, _, _)| m.is_present(name))
{
path
} else {
"index.html"
};
let doc_url =
if let Some((_, _, path)) = DOCS_DATA.iter().find(|(name, _, _)| m.is_present(name)) {
path
} else {
"index.html"
};

if m.is_present("path") {
let doc_path = toolchain.doc_path(doc_url)?;
println!("{}", doc_path.display());
Ok(())
} else {
Ok(toolchain.open_docs(doc_url)?)
toolchain.open_docs(doc_url).map_err(Into::into)
}
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Fix most of clippy warnings by tesuji · Pull Request #1754 · rust-lang/rustup · GitHub
Skip to content
Fix most of clippy warnings#1754

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.

 Sign up for GitHub

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

kinnison
merged 1 commit into

from

Apr 14, 2019
 Merged


Fix most of clippy warnings
#1754
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 6 additions & 6 deletions
download/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,7 +266,7 @@ pub mod reqwest_be {

 if !res.status().is_success() {
 let code: u16 = res.status().into();
 return Err(ErrorKind::HttpStatus(code as u32).into());
 return Err(ErrorKind::HttpStatus(u32::from(code)).into());
 }

 let buffer_size = 0x10000;
Expand DownExpand Up@@ -345,13 +345,13 @@ pub mod reqwest_be {
 return Err(ErrorKind::FileNotFound.into());
 }

 let ref mut f = fs::File::open(src).chain_err(|| "unable to open downloaded file")?;
 io::Seek::seek(f, io::SeekFrom::Start(resume_from))?;
 let mut f = fs::File::open(src).chain_err(|| "unable to open downloaded file")?;
 io::Seek::seek(&mut f, io::SeekFrom::Start(resume_from))?;

 let ref mut buffer = vec![0u8; 0x10000];
 let mut buffer = vec![0u8; 0x10000];
 loop {
 let bytes_read =
io::Read::read(f, buffer).chain_err(|| "unable to read downloaded file")?;
 let bytes_read = io::Read::read(&mut f, &mut buffer)
 .chain_err(|| "unable to read downloaded file")?;
 if bytes_read == 0 {
 break;
 }
Expand Down

32 changes: 15 additions & 17 deletions
src/cli/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ pub fn read_line() -> Result<String> {
 lines
 .next()
 .and_then(|l| l.ok())
 .ok_or("unable to read from stdin for confirmation".into())
 .ok_or_else(|| "unable to read from stdin for confirmation".into())
}

pub fn set_globals(verbose: bool) -> Result<Cfg> {
Expand DownExpand Up@@ -146,8 +146,8 @@ fn show_channel_updates(
 toolchains: Vec<(String, rustup::Result<UpdateStatus>)>,
) -> Result<()> {
 let data = toolchains.into_iter().map(|(name, result)| {
 let ref toolchain = cfg.get_toolchain(&name, false).expect("");
 let version = rustc_version(toolchain);
 let toolchain = cfg.get_toolchain(&name, false).expect("");
 let version = rustc_version(&toolchain);

 let banner;
 let color;
Expand DownExpand Up@@ -195,7 +195,7 @@ fn show_channel_updates(
 let _ = t.reset();
 let _ = writeln!(t, " - {}", version);
 }
 let _ = writeln!(t, "");
 let _ = writeln!(t);

 Ok(())
}
Expand DownExpand Up@@ -355,20 +355,18 @@ pub fn list_toolchains(cfg: &Cfg) -> Result<()> {

 if toolchains.is_empty() {
 println!("no installed toolchains");
 } else if let Ok(Some(def_toolchain)) = cfg.find_default() {
 for toolchain in toolchains {
 let if_default = if def_toolchain.name() == &*toolchain {
 " (default)"
 } else {
 ""
 };
 println!("{}{}", &toolchain, if_default);
 }
 } else {
 if let Ok(Some(def_toolchain)) = cfg.find_default() {
 for toolchain in toolchains {
 let if_default = if def_toolchain.name() == &*toolchain {
 " (default)"
 } else {
 ""
 };
 println!("{}{}", &toolchain, if_default);
 }
 } else {
 for toolchain in toolchains {
 println!("{}", &toolchain);
 }
 for toolchain in toolchains {
 println!("{}", &toolchain);
 }
 }
 Ok(())
Expand Down

2 changes: 1 addition & 1 deletion
src/cli/download_tracker.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,7 @@ impl DownloadTracker {
 if self.displayed_progress {
 // Display the finished state
 self.display();
 let _ = writeln!(self.term.as_mut().unwrap(), "");
 let _ = writeln!(self.term.as_mut().unwrap());
 }
 self.prepare_for_new_download();
 }
Expand Down

10 changes: 5 additions & 5 deletions
src/cli/log.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ pub fn warn_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "warning: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn err_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -37,7 +37,7 @@ pub fn err_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "error: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn info_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -46,7 +46,7 @@ pub fn info_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "info: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn verbose_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -56,7 +56,7 @@ pub fn verbose_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "verbose: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn debug_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -67,6 +67,6 @@ pub fn debug_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "verbose: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
 }
}

4 changes: 2 additions & 2 deletions
src/cli/proxy_mode.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ pub fn main() -> Result<()> {
 .as_ref()
 .and_then(|a| a.file_name())
 .and_then(|a| a.to_str());
 let ref arg0 = arg0.ok_or(ErrorKind::NoExeName)?;
 let arg0 = arg0.ok_or(ErrorKind::NoExeName)?;

 // Check for a toolchain specifier.
 let arg1 = args.next();
Expand All@@ -41,7 +41,7 @@ pub fn main() -> Result<()> {

 let cfg = set_globals(false)?;
 cfg.check_metadata_version()?;
 direct_proxy(&cfg, arg0, toolchain, &cmd_args)?
 direct_proxy(&cfg, &arg0, toolchain, &cmd_args)?
 };

 process::exit(c)
Expand Down

70 changes: 34 additions & 36 deletions
src/cli/rustup_mode.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,11 +26,11 @@ fn handle_epipe(res: Result<()>) -> Result<()> {
pub fn main() -> Result<()> {
 crate::self_update::cleanup_self_updater()?;

 let ref matches = cli().get_matches();
 let matches = cli().get_matches();
 let verbose = matches.is_present("verbose");
 let ref cfg = common::set_globals(verbose)?;
 let cfg = &common::set_globals(verbose)?;

 if maybe_upgrade_data(cfg, matches)? {
 if maybe_upgrade_data(cfg, &matches)? {
 return Ok(());
 }

Expand DownExpand Up@@ -408,7 +408,7 @@ pub fn cli() -> App<'static, 'static> {
 )
 .args(
 &DOCS_DATA
 .into_iter()
 .iter()
 .map(|(name, help_msg, _)| Arg::with_name(name).long(name).help(help_msg))
 .collect::<Vec<_>>(),
 )
Expand All@@ -421,7 +421,7 @@ pub fn cli() -> App<'static, 'static> {
 .group(
 ArgGroup::with_name("page").args(
 &DOCS_DATA
 .into_iter()
 .iter()
 .map(|(name, _, _)| *name)
 .collect::<Vec<_>>(),
 ),
Expand DownExpand Up@@ -497,7 +497,7 @@ fn update_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {
 warn!("(partial) target triple specified instead of toolchain name");
 let installed_toolchains = cfg.list_toolchains()?;
 let default = cfg.find_default()?;
 let default_name = default.map(|t| t.name().to_string()).unwrap_or("".into());
 let default_name = default.map(|t| t.name().to_string()).unwrap_or_default();
 let mut candidates = vec![];
 for t in installed_toolchains {
 if t == default_name {
Expand DownExpand Up@@ -545,11 +545,11 @@ fn default_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {
 if let Some(triple) = PartialTargetTriple::from_str(name) {
 warn!("(partial) target triple specified instead of toolchain name");
 let default = cfg.find_default()?;
 let default_name = default.map(|t| t.name().to_string()).unwrap_or("".into());
 let default_name = default.map(|t| t.name().to_string()).unwrap_or_default();
 if let Ok(mut desc) = PartialToolchainDesc::from_str(&default_name) {
 desc.target = triple;
 let maybe_toolchain = format!("{}", desc);
 let ref toolchain = cfg.get_toolchain(maybe_toolchain.as_ref(), false)?;
 let toolchain = cfg.get_toolchain(maybe_toolchain.as_ref(), false)?;
 if toolchain.name() == default_name {
 warn!(
 "(partial) triple '{}' resolves to a toolchain that is already default",
Expand All@@ -569,9 +569,9 @@ fn default_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {

fn default_(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 if m.is_present("toolchain") {
 let ref toolchain = m.value_of("toolchain").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 default_bare_triple_check(cfg, toolchain)?;
 let ref toolchain = cfg.get_toolchain(toolchain, false)?;
 let toolchain = cfg.get_toolchain(toolchain, false)?;

 let status = if !toolchain.is_custom() {
 Some(toolchain.install_from_dist_if_not_installed()?)
Expand DownExpand Up@@ -634,7 +634,7 @@ fn update(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
}

fn run(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let ref toolchain = m.value_of("toolchain").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 let args = m.values_of("command").unwrap();
 let args: Vec<_> = args.collect();
 let cmd = cfg.create_command_for_toolchain(toolchain, m.is_present("install"), args[0])?;
Expand DownExpand Up@@ -669,9 +669,9 @@ fn show(cfg: &Cfg) -> Result<()> {
 writeln!(t)?;
 }

 let ref cwd = utils::current_dir()?;
 let cwd = utils::current_dir()?;
 let installed_toolchains = cfg.list_toolchains()?;
 let active_toolchain = cfg.find_override_toolchain_or_default(cwd);
 let active_toolchain = cfg.find_override_toolchain_or_default(&cwd);

 // active_toolchain will carry the reason we don't have one in its detail.
 let active_targets = if let Ok(ref at) = active_toolchain {
Expand DownExpand Up@@ -791,8 +791,8 @@ fn show(cfg: &Cfg) -> Result<()> {
}

fn show_active_toolchain(cfg: &Cfg) -> Result<()> {
 let ref cwd = utils::current_dir()?;
 if let Some((toolchain, reason)) = cfg.find_override_toolchain_or_default(cwd)? {
 let cwd = utils::current_dir()?;
 if let Some((toolchain, reason)) = cfg.find_override_toolchain_or_default(&cwd)? {
 if reason.is_some() {
 println!("{} ({})", toolchain.name(), reason.unwrap());
 } else {
Expand DownExpand Up@@ -895,18 +895,20 @@ fn explicit_or_dir_toolchain<'a>(cfg: &'a Cfg, m: &ArgMatches<'_>) -> Result<Too
 return Ok(toolchain);
 }

 let ref cwd = utils::current_dir()?;
 let (toolchain, _) = cfg.toolchain_for_dir(cwd)?;
 let cwd = utils::current_dir()?;
 let (toolchain, _) = cfg.toolchain_for_dir(&cwd)?;

 Ok(toolchain)
}

fn toolchain_link(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let ref toolchain = m.value_of("toolchain").expect("");
 let ref path = m.value_of("path").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 let path = m.value_of("path").expect("");
 let toolchain = cfg.get_toolchain(toolchain, true)?;

 Ok(toolchain.install_from_dir(Path::new(path), true)?)
 toolchain
 .install_from_dir(Path::new(path), true)
 .map_err(|e| e.into())
}

fn toolchain_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
Expand All@@ -918,7 +920,7 @@ fn toolchain_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
}

fn override_add(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let ref toolchain = m.value_of("toolchain").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 let toolchain = cfg.get_toolchain(toolchain, false)?;

 let status = if !toolchain.is_custom() {
Expand DownExpand Up@@ -957,12 +959,10 @@ fn override_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 info!("no nonexistent paths detected");
 }
 list
 } else if m.is_present("path") {
 vec![m.value_of("path").unwrap().to_string()]
 } else {
 if m.is_present("path") {
 vec![m.value_of("path").unwrap().to_string()]
 } else {
 vec![utils::current_dir()?.to_str().unwrap().to_string()]
 }
 vec![utils::current_dir()?.to_str().unwrap().to_string()]
 };

 for path in paths {
Expand All@@ -984,7 +984,7 @@ fn override_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 Ok(())
}

const DOCS_DATA: &[(&'static str, &'static str, &'static str,)] = &[
const DOCS_DATA: &[(&str, &str, &str,)] = &[
 // flags can be used to open specific documents, e.g. `rustup doc --nomicon`
 // tuple elements: document name used as flag, help message, document index path
 ("alloc", "The Rust core allocation and collections library", "alloc/index.html"),
Expand All@@ -1006,21 +1006,19 @@ const DOCS_DATA: &[(&'static str, &'static str, &'static str,)] = &[
fn doc(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let toolchain = explicit_or_dir_toolchain(cfg, m)?;

 let doc_url = if let Some((_, _, path)) = DOCS_DATA
 .into_iter()
 .find(|(name, _, _)| m.is_present(name))
 {
 path
 } else {
 "index.html"
 };
 let doc_url =
 if let Some((_, _, path)) = DOCS_DATA.iter().find(|(name, _, _)| m.is_present(name)) {
 path
 } else {
 "index.html"
 };

 if m.is_present("path") {
 let doc_path = toolchain.doc_path(doc_url)?;
 println!("{}", doc_path.display());
 Ok(())
 } else {
Ok(toolchain.open_docs(doc_url)?)
 toolchain.open_docs(doc_url).map_err(Into::into)
 }
}

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Fix most of clippy warnings by tesuji · Pull Request #1754 · rust-lang/rustup · GitHub
Skip to content
Fix most of clippy warnings#1754

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.

 Sign up for GitHub

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

kinnison
merged 1 commit into

from

Apr 14, 2019
 Merged


Fix most of clippy warnings
#1754
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 6 additions & 6 deletions
download/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,7 +266,7 @@ pub mod reqwest_be {

 if !res.status().is_success() {
 let code: u16 = res.status().into();
 return Err(ErrorKind::HttpStatus(code as u32).into());
 return Err(ErrorKind::HttpStatus(u32::from(code)).into());
 }

 let buffer_size = 0x10000;
Expand DownExpand Up@@ -345,13 +345,13 @@ pub mod reqwest_be {
 return Err(ErrorKind::FileNotFound.into());
 }

 let ref mut f = fs::File::open(src).chain_err(|| "unable to open downloaded file")?;
 io::Seek::seek(f, io::SeekFrom::Start(resume_from))?;
 let mut f = fs::File::open(src).chain_err(|| "unable to open downloaded file")?;
 io::Seek::seek(&mut f, io::SeekFrom::Start(resume_from))?;

 let ref mut buffer = vec![0u8; 0x10000];
 let mut buffer = vec![0u8; 0x10000];
 loop {
 let bytes_read =
io::Read::read(f, buffer).chain_err(|| "unable to read downloaded file")?;
 let bytes_read = io::Read::read(&mut f, &mut buffer)
 .chain_err(|| "unable to read downloaded file")?;
 if bytes_read == 0 {
 break;
 }
Expand Down

32 changes: 15 additions & 17 deletions
src/cli/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ pub fn read_line() -> Result<String> {
 lines
 .next()
 .and_then(|l| l.ok())
 .ok_or("unable to read from stdin for confirmation".into())
 .ok_or_else(|| "unable to read from stdin for confirmation".into())
}

pub fn set_globals(verbose: bool) -> Result<Cfg> {
Expand DownExpand Up@@ -146,8 +146,8 @@ fn show_channel_updates(
 toolchains: Vec<(String, rustup::Result<UpdateStatus>)>,
) -> Result<()> {
 let data = toolchains.into_iter().map(|(name, result)| {
 let ref toolchain = cfg.get_toolchain(&name, false).expect("");
 let version = rustc_version(toolchain);
 let toolchain = cfg.get_toolchain(&name, false).expect("");
 let version = rustc_version(&toolchain);

 let banner;
 let color;
Expand DownExpand Up@@ -195,7 +195,7 @@ fn show_channel_updates(
 let _ = t.reset();
 let _ = writeln!(t, " - {}", version);
 }
 let _ = writeln!(t, "");
 let _ = writeln!(t);

 Ok(())
}
Expand DownExpand Up@@ -355,20 +355,18 @@ pub fn list_toolchains(cfg: &Cfg) -> Result<()> {

 if toolchains.is_empty() {
 println!("no installed toolchains");
 } else if let Ok(Some(def_toolchain)) = cfg.find_default() {
 for toolchain in toolchains {
 let if_default = if def_toolchain.name() == &*toolchain {
 " (default)"
 } else {
 ""
 };
 println!("{}{}", &toolchain, if_default);
 }
 } else {
 if let Ok(Some(def_toolchain)) = cfg.find_default() {
 for toolchain in toolchains {
 let if_default = if def_toolchain.name() == &*toolchain {
 " (default)"
 } else {
 ""
 };
 println!("{}{}", &toolchain, if_default);
 }
 } else {
 for toolchain in toolchains {
 println!("{}", &toolchain);
 }
 for toolchain in toolchains {
 println!("{}", &toolchain);
 }
 }
 Ok(())
Expand Down

2 changes: 1 addition & 1 deletion
src/cli/download_tracker.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,7 @@ impl DownloadTracker {
 if self.displayed_progress {
 // Display the finished state
 self.display();
 let _ = writeln!(self.term.as_mut().unwrap(), "");
 let _ = writeln!(self.term.as_mut().unwrap());
 }
 self.prepare_for_new_download();
 }
Expand Down

10 changes: 5 additions & 5 deletions
src/cli/log.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ pub fn warn_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "warning: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn err_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -37,7 +37,7 @@ pub fn err_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "error: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn info_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -46,7 +46,7 @@ pub fn info_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "info: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn verbose_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -56,7 +56,7 @@ pub fn verbose_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "verbose: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn debug_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -67,6 +67,6 @@ pub fn debug_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "verbose: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
 }
}

4 changes: 2 additions & 2 deletions
src/cli/proxy_mode.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ pub fn main() -> Result<()> {
 .as_ref()
 .and_then(|a| a.file_name())
 .and_then(|a| a.to_str());
 let ref arg0 = arg0.ok_or(ErrorKind::NoExeName)?;
 let arg0 = arg0.ok_or(ErrorKind::NoExeName)?;

 // Check for a toolchain specifier.
 let arg1 = args.next();
Expand All@@ -41,7 +41,7 @@ pub fn main() -> Result<()> {

 let cfg = set_globals(false)?;
 cfg.check_metadata_version()?;
 direct_proxy(&cfg, arg0, toolchain, &cmd_args)?
 direct_proxy(&cfg, &arg0, toolchain, &cmd_args)?
 };

 process::exit(c)
Expand Down

70 changes: 34 additions & 36 deletions
src/cli/rustup_mode.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,11 +26,11 @@ fn handle_epipe(res: Result<()>) -> Result<()> {
pub fn main() -> Result<()> {
 crate::self_update::cleanup_self_updater()?;

 let ref matches = cli().get_matches();
 let matches = cli().get_matches();
 let verbose = matches.is_present("verbose");
 let ref cfg = common::set_globals(verbose)?;
 let cfg = &common::set_globals(verbose)?;

 if maybe_upgrade_data(cfg, matches)? {
 if maybe_upgrade_data(cfg, &matches)? {
 return Ok(());
 }

Expand DownExpand Up@@ -408,7 +408,7 @@ pub fn cli() -> App<'static, 'static> {
 )
 .args(
 &DOCS_DATA
 .into_iter()
 .iter()
 .map(|(name, help_msg, _)| Arg::with_name(name).long(name).help(help_msg))
 .collect::<Vec<_>>(),
 )
Expand All@@ -421,7 +421,7 @@ pub fn cli() -> App<'static, 'static> {
 .group(
 ArgGroup::with_name("page").args(
 &DOCS_DATA
 .into_iter()
 .iter()
 .map(|(name, _, _)| *name)
 .collect::<Vec<_>>(),
 ),
Expand DownExpand Up@@ -497,7 +497,7 @@ fn update_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {
 warn!("(partial) target triple specified instead of toolchain name");
 let installed_toolchains = cfg.list_toolchains()?;
 let default = cfg.find_default()?;
 let default_name = default.map(|t| t.name().to_string()).unwrap_or("".into());
 let default_name = default.map(|t| t.name().to_string()).unwrap_or_default();
 let mut candidates = vec![];
 for t in installed_toolchains {
 if t == default_name {
Expand DownExpand Up@@ -545,11 +545,11 @@ fn default_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {
 if let Some(triple) = PartialTargetTriple::from_str(name) {
 warn!("(partial) target triple specified instead of toolchain name");
 let default = cfg.find_default()?;
 let default_name = default.map(|t| t.name().to_string()).unwrap_or("".into());
 let default_name = default.map(|t| t.name().to_string()).unwrap_or_default();
 if let Ok(mut desc) = PartialToolchainDesc::from_str(&default_name) {
 desc.target = triple;
 let maybe_toolchain = format!("{}", desc);
 let ref toolchain = cfg.get_toolchain(maybe_toolchain.as_ref(), false)?;
 let toolchain = cfg.get_toolchain(maybe_toolchain.as_ref(), false)?;
 if toolchain.name() == default_name {
 warn!(
 "(partial) triple '{}' resolves to a toolchain that is already default",
Expand All@@ -569,9 +569,9 @@ fn default_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {

fn default_(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 if m.is_present("toolchain") {
 let ref toolchain = m.value_of("toolchain").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 default_bare_triple_check(cfg, toolchain)?;
 let ref toolchain = cfg.get_toolchain(toolchain, false)?;
 let toolchain = cfg.get_toolchain(toolchain, false)?;

 let status = if !toolchain.is_custom() {
 Some(toolchain.install_from_dist_if_not_installed()?)
Expand DownExpand Up@@ -634,7 +634,7 @@ fn update(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
}

fn run(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let ref toolchain = m.value_of("toolchain").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 let args = m.values_of("command").unwrap();
 let args: Vec<_> = args.collect();
 let cmd = cfg.create_command_for_toolchain(toolchain, m.is_present("install"), args[0])?;
Expand DownExpand Up@@ -669,9 +669,9 @@ fn show(cfg: &Cfg) -> Result<()> {
 writeln!(t)?;
 }

 let ref cwd = utils::current_dir()?;
 let cwd = utils::current_dir()?;
 let installed_toolchains = cfg.list_toolchains()?;
 let active_toolchain = cfg.find_override_toolchain_or_default(cwd);
 let active_toolchain = cfg.find_override_toolchain_or_default(&cwd);

 // active_toolchain will carry the reason we don't have one in its detail.
 let active_targets = if let Ok(ref at) = active_toolchain {
Expand DownExpand Up@@ -791,8 +791,8 @@ fn show(cfg: &Cfg) -> Result<()> {
}

fn show_active_toolchain(cfg: &Cfg) -> Result<()> {
 let ref cwd = utils::current_dir()?;
 if let Some((toolchain, reason)) = cfg.find_override_toolchain_or_default(cwd)? {
 let cwd = utils::current_dir()?;
 if let Some((toolchain, reason)) = cfg.find_override_toolchain_or_default(&cwd)? {
 if reason.is_some() {
 println!("{} ({})", toolchain.name(), reason.unwrap());
 } else {
Expand DownExpand Up@@ -895,18 +895,20 @@ fn explicit_or_dir_toolchain<'a>(cfg: &'a Cfg, m: &ArgMatches<'_>) -> Result<Too
 return Ok(toolchain);
 }

 let ref cwd = utils::current_dir()?;
 let (toolchain, _) = cfg.toolchain_for_dir(cwd)?;
 let cwd = utils::current_dir()?;
 let (toolchain, _) = cfg.toolchain_for_dir(&cwd)?;

 Ok(toolchain)
}

fn toolchain_link(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let ref toolchain = m.value_of("toolchain").expect("");
 let ref path = m.value_of("path").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 let path = m.value_of("path").expect("");
 let toolchain = cfg.get_toolchain(toolchain, true)?;

 Ok(toolchain.install_from_dir(Path::new(path), true)?)
 toolchain
 .install_from_dir(Path::new(path), true)
 .map_err(|e| e.into())
}

fn toolchain_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
Expand All@@ -918,7 +920,7 @@ fn toolchain_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
}

fn override_add(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let ref toolchain = m.value_of("toolchain").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 let toolchain = cfg.get_toolchain(toolchain, false)?;

 let status = if !toolchain.is_custom() {
Expand DownExpand Up@@ -957,12 +959,10 @@ fn override_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 info!("no nonexistent paths detected");
 }
 list
 } else if m.is_present("path") {
 vec![m.value_of("path").unwrap().to_string()]
 } else {
 if m.is_present("path") {
 vec![m.value_of("path").unwrap().to_string()]
 } else {
 vec![utils::current_dir()?.to_str().unwrap().to_string()]
 }
 vec![utils::current_dir()?.to_str().unwrap().to_string()]
 };

 for path in paths {
Expand All@@ -984,7 +984,7 @@ fn override_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 Ok(())
}

const DOCS_DATA: &[(&'static str, &'static str, &'static str,)] = &[
const DOCS_DATA: &[(&str, &str, &str,)] = &[
 // flags can be used to open specific documents, e.g. `rustup doc --nomicon`
 // tuple elements: document name used as flag, help message, document index path
 ("alloc", "The Rust core allocation and collections library", "alloc/index.html"),
Expand All@@ -1006,21 +1006,19 @@ const DOCS_DATA: &[(&'static str, &'static str, &'static str,)] = &[
fn doc(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let toolchain = explicit_or_dir_toolchain(cfg, m)?;

 let doc_url = if let Some((_, _, path)) = DOCS_DATA
 .into_iter()
 .find(|(name, _, _)| m.is_present(name))
 {
 path
 } else {
 "index.html"
 };
 let doc_url =
 if let Some((_, _, path)) = DOCS_DATA.iter().find(|(name, _, _)| m.is_present(name)) {
 path
 } else {
 "index.html"
 };

 if m.is_present("path") {
 let doc_path = toolchain.doc_path(doc_url)?;
 println!("{}", doc_path.display());
 Ok(())
 } else {
Ok(toolchain.open_docs(doc_url)?)
 toolchain.open_docs(doc_url).map_err(Into::into)
 }
}

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Fix most of clippy warnings by tesuji · Pull Request #1754 · rust-lang/rustup · GitHub
Skip to content
Fix most of clippy warnings#1754

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.

 Sign up for GitHub

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

kinnison
merged 1 commit into

from

Apr 14, 2019
 Merged


Fix most of clippy warnings
#1754
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 6 additions & 6 deletions
download/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,7 +266,7 @@ pub mod reqwest_be {

 if !res.status().is_success() {
 let code: u16 = res.status().into();
 return Err(ErrorKind::HttpStatus(code as u32).into());
 return Err(ErrorKind::HttpStatus(u32::from(code)).into());
 }

 let buffer_size = 0x10000;
Expand DownExpand Up@@ -345,13 +345,13 @@ pub mod reqwest_be {
 return Err(ErrorKind::FileNotFound.into());
 }

 let ref mut f = fs::File::open(src).chain_err(|| "unable to open downloaded file")?;
 io::Seek::seek(f, io::SeekFrom::Start(resume_from))?;
 let mut f = fs::File::open(src).chain_err(|| "unable to open downloaded file")?;
 io::Seek::seek(&mut f, io::SeekFrom::Start(resume_from))?;

 let ref mut buffer = vec![0u8; 0x10000];
 let mut buffer = vec![0u8; 0x10000];
 loop {
 let bytes_read =
io::Read::read(f, buffer).chain_err(|| "unable to read downloaded file")?;
 let bytes_read = io::Read::read(&mut f, &mut buffer)
 .chain_err(|| "unable to read downloaded file")?;
 if bytes_read == 0 {
 break;
 }
Expand Down

32 changes: 15 additions & 17 deletions
src/cli/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ pub fn read_line() -> Result<String> {
 lines
 .next()
 .and_then(|l| l.ok())
 .ok_or("unable to read from stdin for confirmation".into())
 .ok_or_else(|| "unable to read from stdin for confirmation".into())
}

pub fn set_globals(verbose: bool) -> Result<Cfg> {
Expand DownExpand Up@@ -146,8 +146,8 @@ fn show_channel_updates(
 toolchains: Vec<(String, rustup::Result<UpdateStatus>)>,
) -> Result<()> {
 let data = toolchains.into_iter().map(|(name, result)| {
 let ref toolchain = cfg.get_toolchain(&name, false).expect("");
 let version = rustc_version(toolchain);
 let toolchain = cfg.get_toolchain(&name, false).expect("");
 let version = rustc_version(&toolchain);

 let banner;
 let color;
Expand DownExpand Up@@ -195,7 +195,7 @@ fn show_channel_updates(
 let _ = t.reset();
 let _ = writeln!(t, " - {}", version);
 }
 let _ = writeln!(t, "");
 let _ = writeln!(t);

 Ok(())
}
Expand DownExpand Up@@ -355,20 +355,18 @@ pub fn list_toolchains(cfg: &Cfg) -> Result<()> {

 if toolchains.is_empty() {
 println!("no installed toolchains");
 } else if let Ok(Some(def_toolchain)) = cfg.find_default() {
 for toolchain in toolchains {
 let if_default = if def_toolchain.name() == &*toolchain {
 " (default)"
 } else {
 ""
 };
 println!("{}{}", &toolchain, if_default);
 }
 } else {
 if let Ok(Some(def_toolchain)) = cfg.find_default() {
 for toolchain in toolchains {
 let if_default = if def_toolchain.name() == &*toolchain {
 " (default)"
 } else {
 ""
 };
 println!("{}{}", &toolchain, if_default);
 }
 } else {
 for toolchain in toolchains {
 println!("{}", &toolchain);
 }
 for toolchain in toolchains {
 println!("{}", &toolchain);
 }
 }
 Ok(())
Expand Down

2 changes: 1 addition & 1 deletion
src/cli/download_tracker.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,7 @@ impl DownloadTracker {
 if self.displayed_progress {
 // Display the finished state
 self.display();
 let _ = writeln!(self.term.as_mut().unwrap(), "");
 let _ = writeln!(self.term.as_mut().unwrap());
 }
 self.prepare_for_new_download();
 }
Expand Down

10 changes: 5 additions & 5 deletions
src/cli/log.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ pub fn warn_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "warning: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn err_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -37,7 +37,7 @@ pub fn err_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "error: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn info_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -46,7 +46,7 @@ pub fn info_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "info: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn verbose_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -56,7 +56,7 @@ pub fn verbose_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "verbose: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn debug_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -67,6 +67,6 @@ pub fn debug_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "verbose: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
 }
}

4 changes: 2 additions & 2 deletions
src/cli/proxy_mode.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ pub fn main() -> Result<()> {
 .as_ref()
 .and_then(|a| a.file_name())
 .and_then(|a| a.to_str());
 let ref arg0 = arg0.ok_or(ErrorKind::NoExeName)?;
 let arg0 = arg0.ok_or(ErrorKind::NoExeName)?;

 // Check for a toolchain specifier.
 let arg1 = args.next();
Expand All@@ -41,7 +41,7 @@ pub fn main() -> Result<()> {

 let cfg = set_globals(false)?;
 cfg.check_metadata_version()?;
 direct_proxy(&cfg, arg0, toolchain, &cmd_args)?
 direct_proxy(&cfg, &arg0, toolchain, &cmd_args)?
 };

 process::exit(c)
Expand Down

70 changes: 34 additions & 36 deletions
src/cli/rustup_mode.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,11 +26,11 @@ fn handle_epipe(res: Result<()>) -> Result<()> {
pub fn main() -> Result<()> {
 crate::self_update::cleanup_self_updater()?;

 let ref matches = cli().get_matches();
 let matches = cli().get_matches();
 let verbose = matches.is_present("verbose");
 let ref cfg = common::set_globals(verbose)?;
 let cfg = &common::set_globals(verbose)?;

 if maybe_upgrade_data(cfg, matches)? {
 if maybe_upgrade_data(cfg, &matches)? {
 return Ok(());
 }

Expand DownExpand Up@@ -408,7 +408,7 @@ pub fn cli() -> App<'static, 'static> {
 )
 .args(
 &DOCS_DATA
 .into_iter()
 .iter()
 .map(|(name, help_msg, _)| Arg::with_name(name).long(name).help(help_msg))
 .collect::<Vec<_>>(),
 )
Expand All@@ -421,7 +421,7 @@ pub fn cli() -> App<'static, 'static> {
 .group(
 ArgGroup::with_name("page").args(
 &DOCS_DATA
 .into_iter()
 .iter()
 .map(|(name, _, _)| *name)
 .collect::<Vec<_>>(),
 ),
Expand DownExpand Up@@ -497,7 +497,7 @@ fn update_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {
 warn!("(partial) target triple specified instead of toolchain name");
 let installed_toolchains = cfg.list_toolchains()?;
 let default = cfg.find_default()?;
 let default_name = default.map(|t| t.name().to_string()).unwrap_or("".into());
 let default_name = default.map(|t| t.name().to_string()).unwrap_or_default();
 let mut candidates = vec![];
 for t in installed_toolchains {
 if t == default_name {
Expand DownExpand Up@@ -545,11 +545,11 @@ fn default_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {
 if let Some(triple) = PartialTargetTriple::from_str(name) {
 warn!("(partial) target triple specified instead of toolchain name");
 let default = cfg.find_default()?;
 let default_name = default.map(|t| t.name().to_string()).unwrap_or("".into());
 let default_name = default.map(|t| t.name().to_string()).unwrap_or_default();
 if let Ok(mut desc) = PartialToolchainDesc::from_str(&default_name) {
 desc.target = triple;
 let maybe_toolchain = format!("{}", desc);
 let ref toolchain = cfg.get_toolchain(maybe_toolchain.as_ref(), false)?;
 let toolchain = cfg.get_toolchain(maybe_toolchain.as_ref(), false)?;
 if toolchain.name() == default_name {
 warn!(
 "(partial) triple '{}' resolves to a toolchain that is already default",
Expand All@@ -569,9 +569,9 @@ fn default_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {

fn default_(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 if m.is_present("toolchain") {
 let ref toolchain = m.value_of("toolchain").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 default_bare_triple_check(cfg, toolchain)?;
 let ref toolchain = cfg.get_toolchain(toolchain, false)?;
 let toolchain = cfg.get_toolchain(toolchain, false)?;

 let status = if !toolchain.is_custom() {
 Some(toolchain.install_from_dist_if_not_installed()?)
Expand DownExpand Up@@ -634,7 +634,7 @@ fn update(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
}

fn run(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let ref toolchain = m.value_of("toolchain").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 let args = m.values_of("command").unwrap();
 let args: Vec<_> = args.collect();
 let cmd = cfg.create_command_for_toolchain(toolchain, m.is_present("install"), args[0])?;
Expand DownExpand Up@@ -669,9 +669,9 @@ fn show(cfg: &Cfg) -> Result<()> {
 writeln!(t)?;
 }

 let ref cwd = utils::current_dir()?;
 let cwd = utils::current_dir()?;
 let installed_toolchains = cfg.list_toolchains()?;
 let active_toolchain = cfg.find_override_toolchain_or_default(cwd);
 let active_toolchain = cfg.find_override_toolchain_or_default(&cwd);

 // active_toolchain will carry the reason we don't have one in its detail.
 let active_targets = if let Ok(ref at) = active_toolchain {
Expand DownExpand Up@@ -791,8 +791,8 @@ fn show(cfg: &Cfg) -> Result<()> {
}

fn show_active_toolchain(cfg: &Cfg) -> Result<()> {
 let ref cwd = utils::current_dir()?;
 if let Some((toolchain, reason)) = cfg.find_override_toolchain_or_default(cwd)? {
 let cwd = utils::current_dir()?;
 if let Some((toolchain, reason)) = cfg.find_override_toolchain_or_default(&cwd)? {
 if reason.is_some() {
 println!("{} ({})", toolchain.name(), reason.unwrap());
 } else {
Expand DownExpand Up@@ -895,18 +895,20 @@ fn explicit_or_dir_toolchain<'a>(cfg: &'a Cfg, m: &ArgMatches<'_>) -> Result<Too
 return Ok(toolchain);
 }

 let ref cwd = utils::current_dir()?;
 let (toolchain, _) = cfg.toolchain_for_dir(cwd)?;
 let cwd = utils::current_dir()?;
 let (toolchain, _) = cfg.toolchain_for_dir(&cwd)?;

 Ok(toolchain)
}

fn toolchain_link(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let ref toolchain = m.value_of("toolchain").expect("");
 let ref path = m.value_of("path").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 let path = m.value_of("path").expect("");
 let toolchain = cfg.get_toolchain(toolchain, true)?;

 Ok(toolchain.install_from_dir(Path::new(path), true)?)
 toolchain
 .install_from_dir(Path::new(path), true)
 .map_err(|e| e.into())
}

fn toolchain_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
Expand All@@ -918,7 +920,7 @@ fn toolchain_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
}

fn override_add(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let ref toolchain = m.value_of("toolchain").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 let toolchain = cfg.get_toolchain(toolchain, false)?;

 let status = if !toolchain.is_custom() {
Expand DownExpand Up@@ -957,12 +959,10 @@ fn override_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 info!("no nonexistent paths detected");
 }
 list
 } else if m.is_present("path") {
 vec![m.value_of("path").unwrap().to_string()]
 } else {
 if m.is_present("path") {
 vec![m.value_of("path").unwrap().to_string()]
 } else {
 vec![utils::current_dir()?.to_str().unwrap().to_string()]
 }
 vec![utils::current_dir()?.to_str().unwrap().to_string()]
 };

 for path in paths {
Expand All@@ -984,7 +984,7 @@ fn override_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 Ok(())
}

const DOCS_DATA: &[(&'static str, &'static str, &'static str,)] = &[
const DOCS_DATA: &[(&str, &str, &str,)] = &[
 // flags can be used to open specific documents, e.g. `rustup doc --nomicon`
 // tuple elements: document name used as flag, help message, document index path
 ("alloc", "The Rust core allocation and collections library", "alloc/index.html"),
Expand All@@ -1006,21 +1006,19 @@ const DOCS_DATA: &[(&'static str, &'static str, &'static str,)] = &[
fn doc(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let toolchain = explicit_or_dir_toolchain(cfg, m)?;

 let doc_url = if let Some((_, _, path)) = DOCS_DATA
 .into_iter()
 .find(|(name, _, _)| m.is_present(name))
 {
 path
 } else {
 "index.html"
 };
 let doc_url =
 if let Some((_, _, path)) = DOCS_DATA.iter().find(|(name, _, _)| m.is_present(name)) {
 path
 } else {
 "index.html"
 };

 if m.is_present("path") {
 let doc_path = toolchain.doc_path(doc_url)?;
 println!("{}", doc_path.display());
 Ok(())
 } else {
Ok(toolchain.open_docs(doc_url)?)
 toolchain.open_docs(doc_url).map_err(Into::into)
 }
}

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Fix most of clippy warnings by tesuji · Pull Request #1754 · rust-lang/rustup · GitHub
Skip to content
Fix most of clippy warnings#1754

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.

 Sign up for GitHub

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

kinnison
merged 1 commit into

from

Apr 14, 2019
 Merged


Fix most of clippy warnings
#1754
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 6 additions & 6 deletions
download/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,7 +266,7 @@ pub mod reqwest_be {

 if !res.status().is_success() {
 let code: u16 = res.status().into();
 return Err(ErrorKind::HttpStatus(code as u32).into());
 return Err(ErrorKind::HttpStatus(u32::from(code)).into());
 }

 let buffer_size = 0x10000;
Expand DownExpand Up@@ -345,13 +345,13 @@ pub mod reqwest_be {
 return Err(ErrorKind::FileNotFound.into());
 }

 let ref mut f = fs::File::open(src).chain_err(|| "unable to open downloaded file")?;
 io::Seek::seek(f, io::SeekFrom::Start(resume_from))?;
 let mut f = fs::File::open(src).chain_err(|| "unable to open downloaded file")?;
 io::Seek::seek(&mut f, io::SeekFrom::Start(resume_from))?;

 let ref mut buffer = vec![0u8; 0x10000];
 let mut buffer = vec![0u8; 0x10000];
 loop {
 let bytes_read =
io::Read::read(f, buffer).chain_err(|| "unable to read downloaded file")?;
 let bytes_read = io::Read::read(&mut f, &mut buffer)
 .chain_err(|| "unable to read downloaded file")?;
 if bytes_read == 0 {
 break;
 }
Expand Down

32 changes: 15 additions & 17 deletions
src/cli/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ pub fn read_line() -> Result<String> {
 lines
 .next()
 .and_then(|l| l.ok())
 .ok_or("unable to read from stdin for confirmation".into())
 .ok_or_else(|| "unable to read from stdin for confirmation".into())
}

pub fn set_globals(verbose: bool) -> Result<Cfg> {
Expand DownExpand Up@@ -146,8 +146,8 @@ fn show_channel_updates(
 toolchains: Vec<(String, rustup::Result<UpdateStatus>)>,
) -> Result<()> {
 let data = toolchains.into_iter().map(|(name, result)| {
 let ref toolchain = cfg.get_toolchain(&name, false).expect("");
 let version = rustc_version(toolchain);
 let toolchain = cfg.get_toolchain(&name, false).expect("");
 let version = rustc_version(&toolchain);

 let banner;
 let color;
Expand DownExpand Up@@ -195,7 +195,7 @@ fn show_channel_updates(
 let _ = t.reset();
 let _ = writeln!(t, " - {}", version);
 }
 let _ = writeln!(t, "");
 let _ = writeln!(t);

 Ok(())
}
Expand DownExpand Up@@ -355,20 +355,18 @@ pub fn list_toolchains(cfg: &Cfg) -> Result<()> {

 if toolchains.is_empty() {
 println!("no installed toolchains");
 } else if let Ok(Some(def_toolchain)) = cfg.find_default() {
 for toolchain in toolchains {
 let if_default = if def_toolchain.name() == &*toolchain {
 " (default)"
 } else {
 ""
 };
 println!("{}{}", &toolchain, if_default);
 }
 } else {
 if let Ok(Some(def_toolchain)) = cfg.find_default() {
 for toolchain in toolchains {
 let if_default = if def_toolchain.name() == &*toolchain {
 " (default)"
 } else {
 ""
 };
 println!("{}{}", &toolchain, if_default);
 }
 } else {
 for toolchain in toolchains {
 println!("{}", &toolchain);
 }
 for toolchain in toolchains {
 println!("{}", &toolchain);
 }
 }
 Ok(())
Expand Down

2 changes: 1 addition & 1 deletion
src/cli/download_tracker.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,7 @@ impl DownloadTracker {
 if self.displayed_progress {
 // Display the finished state
 self.display();
 let _ = writeln!(self.term.as_mut().unwrap(), "");
 let _ = writeln!(self.term.as_mut().unwrap());
 }
 self.prepare_for_new_download();
 }
Expand Down

10 changes: 5 additions & 5 deletions
src/cli/log.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ pub fn warn_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "warning: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn err_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -37,7 +37,7 @@ pub fn err_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "error: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn info_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -46,7 +46,7 @@ pub fn info_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "info: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn verbose_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -56,7 +56,7 @@ pub fn verbose_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "verbose: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn debug_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -67,6 +67,6 @@ pub fn debug_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "verbose: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
 }
}

4 changes: 2 additions & 2 deletions
src/cli/proxy_mode.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ pub fn main() -> Result<()> {
 .as_ref()
 .and_then(|a| a.file_name())
 .and_then(|a| a.to_str());
 let ref arg0 = arg0.ok_or(ErrorKind::NoExeName)?;
 let arg0 = arg0.ok_or(ErrorKind::NoExeName)?;

 // Check for a toolchain specifier.
 let arg1 = args.next();
Expand All@@ -41,7 +41,7 @@ pub fn main() -> Result<()> {

 let cfg = set_globals(false)?;
 cfg.check_metadata_version()?;
 direct_proxy(&cfg, arg0, toolchain, &cmd_args)?
 direct_proxy(&cfg, &arg0, toolchain, &cmd_args)?
 };

 process::exit(c)
Expand Down

70 changes: 34 additions & 36 deletions
src/cli/rustup_mode.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,11 +26,11 @@ fn handle_epipe(res: Result<()>) -> Result<()> {
pub fn main() -> Result<()> {
 crate::self_update::cleanup_self_updater()?;

 let ref matches = cli().get_matches();
 let matches = cli().get_matches();
 let verbose = matches.is_present("verbose");
 let ref cfg = common::set_globals(verbose)?;
 let cfg = &common::set_globals(verbose)?;

 if maybe_upgrade_data(cfg, matches)? {
 if maybe_upgrade_data(cfg, &matches)? {
 return Ok(());
 }

Expand DownExpand Up@@ -408,7 +408,7 @@ pub fn cli() -> App<'static, 'static> {
 )
 .args(
 &DOCS_DATA
 .into_iter()
 .iter()
 .map(|(name, help_msg, _)| Arg::with_name(name).long(name).help(help_msg))
 .collect::<Vec<_>>(),
 )
Expand All@@ -421,7 +421,7 @@ pub fn cli() -> App<'static, 'static> {
 .group(
 ArgGroup::with_name("page").args(
 &DOCS_DATA
 .into_iter()
 .iter()
 .map(|(name, _, _)| *name)
 .collect::<Vec<_>>(),
 ),
Expand DownExpand Up@@ -497,7 +497,7 @@ fn update_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {
 warn!("(partial) target triple specified instead of toolchain name");
 let installed_toolchains = cfg.list_toolchains()?;
 let default = cfg.find_default()?;
 let default_name = default.map(|t| t.name().to_string()).unwrap_or("".into());
 let default_name = default.map(|t| t.name().to_string()).unwrap_or_default();
 let mut candidates = vec![];
 for t in installed_toolchains {
 if t == default_name {
Expand DownExpand Up@@ -545,11 +545,11 @@ fn default_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {
 if let Some(triple) = PartialTargetTriple::from_str(name) {
 warn!("(partial) target triple specified instead of toolchain name");
 let default = cfg.find_default()?;
 let default_name = default.map(|t| t.name().to_string()).unwrap_or("".into());
 let default_name = default.map(|t| t.name().to_string()).unwrap_or_default();
 if let Ok(mut desc) = PartialToolchainDesc::from_str(&default_name) {
 desc.target = triple;
 let maybe_toolchain = format!("{}", desc);
 let ref toolchain = cfg.get_toolchain(maybe_toolchain.as_ref(), false)?;
 let toolchain = cfg.get_toolchain(maybe_toolchain.as_ref(), false)?;
 if toolchain.name() == default_name {
 warn!(
 "(partial) triple '{}' resolves to a toolchain that is already default",
Expand All@@ -569,9 +569,9 @@ fn default_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {

fn default_(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 if m.is_present("toolchain") {
 let ref toolchain = m.value_of("toolchain").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 default_bare_triple_check(cfg, toolchain)?;
 let ref toolchain = cfg.get_toolchain(toolchain, false)?;
 let toolchain = cfg.get_toolchain(toolchain, false)?;

 let status = if !toolchain.is_custom() {
 Some(toolchain.install_from_dist_if_not_installed()?)
Expand DownExpand Up@@ -634,7 +634,7 @@ fn update(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
}

fn run(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let ref toolchain = m.value_of("toolchain").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 let args = m.values_of("command").unwrap();
 let args: Vec<_> = args.collect();
 let cmd = cfg.create_command_for_toolchain(toolchain, m.is_present("install"), args[0])?;
Expand DownExpand Up@@ -669,9 +669,9 @@ fn show(cfg: &Cfg) -> Result<()> {
 writeln!(t)?;
 }

 let ref cwd = utils::current_dir()?;
 let cwd = utils::current_dir()?;
 let installed_toolchains = cfg.list_toolchains()?;
 let active_toolchain = cfg.find_override_toolchain_or_default(cwd);
 let active_toolchain = cfg.find_override_toolchain_or_default(&cwd);

 // active_toolchain will carry the reason we don't have one in its detail.
 let active_targets = if let Ok(ref at) = active_toolchain {
Expand DownExpand Up@@ -791,8 +791,8 @@ fn show(cfg: &Cfg) -> Result<()> {
}

fn show_active_toolchain(cfg: &Cfg) -> Result<()> {
 let ref cwd = utils::current_dir()?;
 if let Some((toolchain, reason)) = cfg.find_override_toolchain_or_default(cwd)? {
 let cwd = utils::current_dir()?;
 if let Some((toolchain, reason)) = cfg.find_override_toolchain_or_default(&cwd)? {
 if reason.is_some() {
 println!("{} ({})", toolchain.name(), reason.unwrap());
 } else {
Expand DownExpand Up@@ -895,18 +895,20 @@ fn explicit_or_dir_toolchain<'a>(cfg: &'a Cfg, m: &ArgMatches<'_>) -> Result<Too
 return Ok(toolchain);
 }

 let ref cwd = utils::current_dir()?;
 let (toolchain, _) = cfg.toolchain_for_dir(cwd)?;
 let cwd = utils::current_dir()?;
 let (toolchain, _) = cfg.toolchain_for_dir(&cwd)?;

 Ok(toolchain)
}

fn toolchain_link(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let ref toolchain = m.value_of("toolchain").expect("");
 let ref path = m.value_of("path").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 let path = m.value_of("path").expect("");
 let toolchain = cfg.get_toolchain(toolchain, true)?;

 Ok(toolchain.install_from_dir(Path::new(path), true)?)
 toolchain
 .install_from_dir(Path::new(path), true)
 .map_err(|e| e.into())
}

fn toolchain_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
Expand All@@ -918,7 +920,7 @@ fn toolchain_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
}

fn override_add(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let ref toolchain = m.value_of("toolchain").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 let toolchain = cfg.get_toolchain(toolchain, false)?;

 let status = if !toolchain.is_custom() {
Expand DownExpand Up@@ -957,12 +959,10 @@ fn override_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 info!("no nonexistent paths detected");
 }
 list
 } else if m.is_present("path") {
 vec![m.value_of("path").unwrap().to_string()]
 } else {
 if m.is_present("path") {
 vec![m.value_of("path").unwrap().to_string()]
 } else {
 vec![utils::current_dir()?.to_str().unwrap().to_string()]
 }
 vec![utils::current_dir()?.to_str().unwrap().to_string()]
 };

 for path in paths {
Expand All@@ -984,7 +984,7 @@ fn override_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 Ok(())
}

const DOCS_DATA: &[(&'static str, &'static str, &'static str,)] = &[
const DOCS_DATA: &[(&str, &str, &str,)] = &[
 // flags can be used to open specific documents, e.g. `rustup doc --nomicon`
 // tuple elements: document name used as flag, help message, document index path
 ("alloc", "The Rust core allocation and collections library", "alloc/index.html"),
Expand All@@ -1006,21 +1006,19 @@ const DOCS_DATA: &[(&'static str, &'static str, &'static str,)] = &[
fn doc(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let toolchain = explicit_or_dir_toolchain(cfg, m)?;

 let doc_url = if let Some((_, _, path)) = DOCS_DATA
 .into_iter()
 .find(|(name, _, _)| m.is_present(name))
 {
 path
 } else {
 "index.html"
 };
 let doc_url =
 if let Some((_, _, path)) = DOCS_DATA.iter().find(|(name, _, _)| m.is_present(name)) {
 path
 } else {
 "index.html"
 };

 if m.is_present("path") {
 let doc_path = toolchain.doc_path(doc_url)?;
 println!("{}", doc_path.display());
 Ok(())
 } else {
Ok(toolchain.open_docs(doc_url)?)
 toolchain.open_docs(doc_url).map_err(Into::into)
 }
}

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Fix most of clippy warnings by tesuji · Pull Request #1754 · rust-lang/rustup · GitHub
Skip to content
Fix most of clippy warnings#1754

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.

 Sign up for GitHub

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

kinnison
merged 1 commit into

from

Apr 14, 2019
 Merged


Fix most of clippy warnings
#1754
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 6 additions & 6 deletions
download/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,7 +266,7 @@ pub mod reqwest_be {

 if !res.status().is_success() {
 let code: u16 = res.status().into();
 return Err(ErrorKind::HttpStatus(code as u32).into());
 return Err(ErrorKind::HttpStatus(u32::from(code)).into());
 }

 let buffer_size = 0x10000;
Expand DownExpand Up@@ -345,13 +345,13 @@ pub mod reqwest_be {
 return Err(ErrorKind::FileNotFound.into());
 }

 let ref mut f = fs::File::open(src).chain_err(|| "unable to open downloaded file")?;
 io::Seek::seek(f, io::SeekFrom::Start(resume_from))?;
 let mut f = fs::File::open(src).chain_err(|| "unable to open downloaded file")?;
 io::Seek::seek(&mut f, io::SeekFrom::Start(resume_from))?;

 let ref mut buffer = vec![0u8; 0x10000];
 let mut buffer = vec![0u8; 0x10000];
 loop {
 let bytes_read =
io::Read::read(f, buffer).chain_err(|| "unable to read downloaded file")?;
 let bytes_read = io::Read::read(&mut f, &mut buffer)
 .chain_err(|| "unable to read downloaded file")?;
 if bytes_read == 0 {
 break;
 }
Expand Down

32 changes: 15 additions & 17 deletions
src/cli/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ pub fn read_line() -> Result<String> {
 lines
 .next()
 .and_then(|l| l.ok())
 .ok_or("unable to read from stdin for confirmation".into())
 .ok_or_else(|| "unable to read from stdin for confirmation".into())
}

pub fn set_globals(verbose: bool) -> Result<Cfg> {
Expand DownExpand Up@@ -146,8 +146,8 @@ fn show_channel_updates(
 toolchains: Vec<(String, rustup::Result<UpdateStatus>)>,
) -> Result<()> {
 let data = toolchains.into_iter().map(|(name, result)| {
 let ref toolchain = cfg.get_toolchain(&name, false).expect("");
 let version = rustc_version(toolchain);
 let toolchain = cfg.get_toolchain(&name, false).expect("");
 let version = rustc_version(&toolchain);

 let banner;
 let color;
Expand DownExpand Up@@ -195,7 +195,7 @@ fn show_channel_updates(
 let _ = t.reset();
 let _ = writeln!(t, " - {}", version);
 }
 let _ = writeln!(t, "");
 let _ = writeln!(t);

 Ok(())
}
Expand DownExpand Up@@ -355,20 +355,18 @@ pub fn list_toolchains(cfg: &Cfg) -> Result<()> {

 if toolchains.is_empty() {
 println!("no installed toolchains");
 } else if let Ok(Some(def_toolchain)) = cfg.find_default() {
 for toolchain in toolchains {
 let if_default = if def_toolchain.name() == &*toolchain {
 " (default)"
 } else {
 ""
 };
 println!("{}{}", &toolchain, if_default);
 }
 } else {
 if let Ok(Some(def_toolchain)) = cfg.find_default() {
 for toolchain in toolchains {
 let if_default = if def_toolchain.name() == &*toolchain {
 " (default)"
 } else {
 ""
 };
 println!("{}{}", &toolchain, if_default);
 }
 } else {
 for toolchain in toolchains {
 println!("{}", &toolchain);
 }
 for toolchain in toolchains {
 println!("{}", &toolchain);
 }
 }
 Ok(())
Expand Down

2 changes: 1 addition & 1 deletion
src/cli/download_tracker.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,7 @@ impl DownloadTracker {
 if self.displayed_progress {
 // Display the finished state
 self.display();
 let _ = writeln!(self.term.as_mut().unwrap(), "");
 let _ = writeln!(self.term.as_mut().unwrap());
 }
 self.prepare_for_new_download();
 }
Expand Down

10 changes: 5 additions & 5 deletions
src/cli/log.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ pub fn warn_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "warning: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn err_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -37,7 +37,7 @@ pub fn err_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "error: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn info_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -46,7 +46,7 @@ pub fn info_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "info: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn verbose_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -56,7 +56,7 @@ pub fn verbose_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "verbose: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn debug_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -67,6 +67,6 @@ pub fn debug_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "verbose: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
 }
}

4 changes: 2 additions & 2 deletions
src/cli/proxy_mode.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ pub fn main() -> Result<()> {
 .as_ref()
 .and_then(|a| a.file_name())
 .and_then(|a| a.to_str());
 let ref arg0 = arg0.ok_or(ErrorKind::NoExeName)?;
 let arg0 = arg0.ok_or(ErrorKind::NoExeName)?;

 // Check for a toolchain specifier.
 let arg1 = args.next();
Expand All@@ -41,7 +41,7 @@ pub fn main() -> Result<()> {

 let cfg = set_globals(false)?;
 cfg.check_metadata_version()?;
 direct_proxy(&cfg, arg0, toolchain, &cmd_args)?
 direct_proxy(&cfg, &arg0, toolchain, &cmd_args)?
 };

 process::exit(c)
Expand Down

70 changes: 34 additions & 36 deletions
src/cli/rustup_mode.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,11 +26,11 @@ fn handle_epipe(res: Result<()>) -> Result<()> {
pub fn main() -> Result<()> {
 crate::self_update::cleanup_self_updater()?;

 let ref matches = cli().get_matches();
 let matches = cli().get_matches();
 let verbose = matches.is_present("verbose");
 let ref cfg = common::set_globals(verbose)?;
 let cfg = &common::set_globals(verbose)?;

 if maybe_upgrade_data(cfg, matches)? {
 if maybe_upgrade_data(cfg, &matches)? {
 return Ok(());
 }

Expand DownExpand Up@@ -408,7 +408,7 @@ pub fn cli() -> App<'static, 'static> {
 )
 .args(
 &DOCS_DATA
 .into_iter()
 .iter()
 .map(|(name, help_msg, _)| Arg::with_name(name).long(name).help(help_msg))
 .collect::<Vec<_>>(),
 )
Expand All@@ -421,7 +421,7 @@ pub fn cli() -> App<'static, 'static> {
 .group(
 ArgGroup::with_name("page").args(
 &DOCS_DATA
 .into_iter()
 .iter()
 .map(|(name, _, _)| *name)
 .collect::<Vec<_>>(),
 ),
Expand DownExpand Up@@ -497,7 +497,7 @@ fn update_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {
 warn!("(partial) target triple specified instead of toolchain name");
 let installed_toolchains = cfg.list_toolchains()?;
 let default = cfg.find_default()?;
 let default_name = default.map(|t| t.name().to_string()).unwrap_or("".into());
 let default_name = default.map(|t| t.name().to_string()).unwrap_or_default();
 let mut candidates = vec![];
 for t in installed_toolchains {
 if t == default_name {
Expand DownExpand Up@@ -545,11 +545,11 @@ fn default_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {
 if let Some(triple) = PartialTargetTriple::from_str(name) {
 warn!("(partial) target triple specified instead of toolchain name");
 let default = cfg.find_default()?;
 let default_name = default.map(|t| t.name().to_string()).unwrap_or("".into());
 let default_name = default.map(|t| t.name().to_string()).unwrap_or_default();
 if let Ok(mut desc) = PartialToolchainDesc::from_str(&default_name) {
 desc.target = triple;
 let maybe_toolchain = format!("{}", desc);
 let ref toolchain = cfg.get_toolchain(maybe_toolchain.as_ref(), false)?;
 let toolchain = cfg.get_toolchain(maybe_toolchain.as_ref(), false)?;
 if toolchain.name() == default_name {
 warn!(
 "(partial) triple '{}' resolves to a toolchain that is already default",
Expand All@@ -569,9 +569,9 @@ fn default_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {

fn default_(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 if m.is_present("toolchain") {
 let ref toolchain = m.value_of("toolchain").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 default_bare_triple_check(cfg, toolchain)?;
 let ref toolchain = cfg.get_toolchain(toolchain, false)?;
 let toolchain = cfg.get_toolchain(toolchain, false)?;

 let status = if !toolchain.is_custom() {
 Some(toolchain.install_from_dist_if_not_installed()?)
Expand DownExpand Up@@ -634,7 +634,7 @@ fn update(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
}

fn run(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let ref toolchain = m.value_of("toolchain").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 let args = m.values_of("command").unwrap();
 let args: Vec<_> = args.collect();
 let cmd = cfg.create_command_for_toolchain(toolchain, m.is_present("install"), args[0])?;
Expand DownExpand Up@@ -669,9 +669,9 @@ fn show(cfg: &Cfg) -> Result<()> {
 writeln!(t)?;
 }

 let ref cwd = utils::current_dir()?;
 let cwd = utils::current_dir()?;
 let installed_toolchains = cfg.list_toolchains()?;
 let active_toolchain = cfg.find_override_toolchain_or_default(cwd);
 let active_toolchain = cfg.find_override_toolchain_or_default(&cwd);

 // active_toolchain will carry the reason we don't have one in its detail.
 let active_targets = if let Ok(ref at) = active_toolchain {
Expand DownExpand Up@@ -791,8 +791,8 @@ fn show(cfg: &Cfg) -> Result<()> {
}

fn show_active_toolchain(cfg: &Cfg) -> Result<()> {
 let ref cwd = utils::current_dir()?;
 if let Some((toolchain, reason)) = cfg.find_override_toolchain_or_default(cwd)? {
 let cwd = utils::current_dir()?;
 if let Some((toolchain, reason)) = cfg.find_override_toolchain_or_default(&cwd)? {
 if reason.is_some() {
 println!("{} ({})", toolchain.name(), reason.unwrap());
 } else {
Expand DownExpand Up@@ -895,18 +895,20 @@ fn explicit_or_dir_toolchain<'a>(cfg: &'a Cfg, m: &ArgMatches<'_>) -> Result<Too
 return Ok(toolchain);
 }

 let ref cwd = utils::current_dir()?;
 let (toolchain, _) = cfg.toolchain_for_dir(cwd)?;
 let cwd = utils::current_dir()?;
 let (toolchain, _) = cfg.toolchain_for_dir(&cwd)?;

 Ok(toolchain)
}

fn toolchain_link(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let ref toolchain = m.value_of("toolchain").expect("");
 let ref path = m.value_of("path").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 let path = m.value_of("path").expect("");
 let toolchain = cfg.get_toolchain(toolchain, true)?;

 Ok(toolchain.install_from_dir(Path::new(path), true)?)
 toolchain
 .install_from_dir(Path::new(path), true)
 .map_err(|e| e.into())
}

fn toolchain_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
Expand All@@ -918,7 +920,7 @@ fn toolchain_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
}

fn override_add(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let ref toolchain = m.value_of("toolchain").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 let toolchain = cfg.get_toolchain(toolchain, false)?;

 let status = if !toolchain.is_custom() {
Expand DownExpand Up@@ -957,12 +959,10 @@ fn override_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 info!("no nonexistent paths detected");
 }
 list
 } else if m.is_present("path") {
 vec![m.value_of("path").unwrap().to_string()]
 } else {
 if m.is_present("path") {
 vec![m.value_of("path").unwrap().to_string()]
 } else {
 vec![utils::current_dir()?.to_str().unwrap().to_string()]
 }
 vec![utils::current_dir()?.to_str().unwrap().to_string()]
 };

 for path in paths {
Expand All@@ -984,7 +984,7 @@ fn override_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 Ok(())
}

const DOCS_DATA: &[(&'static str, &'static str, &'static str,)] = &[
const DOCS_DATA: &[(&str, &str, &str,)] = &[
 // flags can be used to open specific documents, e.g. `rustup doc --nomicon`
 // tuple elements: document name used as flag, help message, document index path
 ("alloc", "The Rust core allocation and collections library", "alloc/index.html"),
Expand All@@ -1006,21 +1006,19 @@ const DOCS_DATA: &[(&'static str, &'static str, &'static str,)] = &[
fn doc(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let toolchain = explicit_or_dir_toolchain(cfg, m)?;

 let doc_url = if let Some((_, _, path)) = DOCS_DATA
 .into_iter()
 .find(|(name, _, _)| m.is_present(name))
 {
 path
 } else {
 "index.html"
 };
 let doc_url =
 if let Some((_, _, path)) = DOCS_DATA.iter().find(|(name, _, _)| m.is_present(name)) {
 path
 } else {
 "index.html"
 };

 if m.is_present("path") {
 let doc_path = toolchain.doc_path(doc_url)?;
 println!("{}", doc_path.display());
 Ok(())
 } else {
Ok(toolchain.open_docs(doc_url)?)
 toolchain.open_docs(doc_url).map_err(Into::into)
 }
}

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Fix most of clippy warnings by tesuji · Pull Request #1754 · rust-lang/rustup · GitHub
Skip to content
Fix most of clippy warnings#1754

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.

 Sign up for GitHub

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

kinnison
merged 1 commit into

from

Apr 14, 2019
 Merged


Fix most of clippy warnings
#1754
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 6 additions & 6 deletions
download/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,7 +266,7 @@ pub mod reqwest_be {

 if !res.status().is_success() {
 let code: u16 = res.status().into();
 return Err(ErrorKind::HttpStatus(code as u32).into());
 return Err(ErrorKind::HttpStatus(u32::from(code)).into());
 }

 let buffer_size = 0x10000;
Expand DownExpand Up@@ -345,13 +345,13 @@ pub mod reqwest_be {
 return Err(ErrorKind::FileNotFound.into());
 }

 let ref mut f = fs::File::open(src).chain_err(|| "unable to open downloaded file")?;
 io::Seek::seek(f, io::SeekFrom::Start(resume_from))?;
 let mut f = fs::File::open(src).chain_err(|| "unable to open downloaded file")?;
 io::Seek::seek(&mut f, io::SeekFrom::Start(resume_from))?;

 let ref mut buffer = vec![0u8; 0x10000];
 let mut buffer = vec![0u8; 0x10000];
 loop {
 let bytes_read =
io::Read::read(f, buffer).chain_err(|| "unable to read downloaded file")?;
 let bytes_read = io::Read::read(&mut f, &mut buffer)
 .chain_err(|| "unable to read downloaded file")?;
 if bytes_read == 0 {
 break;
 }
Expand Down

32 changes: 15 additions & 17 deletions
src/cli/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ pub fn read_line() -> Result<String> {
 lines
 .next()
 .and_then(|l| l.ok())
 .ok_or("unable to read from stdin for confirmation".into())
 .ok_or_else(|| "unable to read from stdin for confirmation".into())
}

pub fn set_globals(verbose: bool) -> Result<Cfg> {
Expand DownExpand Up@@ -146,8 +146,8 @@ fn show_channel_updates(
 toolchains: Vec<(String, rustup::Result<UpdateStatus>)>,
) -> Result<()> {
 let data = toolchains.into_iter().map(|(name, result)| {
 let ref toolchain = cfg.get_toolchain(&name, false).expect("");
 let version = rustc_version(toolchain);
 let toolchain = cfg.get_toolchain(&name, false).expect("");
 let version = rustc_version(&toolchain);

 let banner;
 let color;
Expand DownExpand Up@@ -195,7 +195,7 @@ fn show_channel_updates(
 let _ = t.reset();
 let _ = writeln!(t, " - {}", version);
 }
 let _ = writeln!(t, "");
 let _ = writeln!(t);

 Ok(())
}
Expand DownExpand Up@@ -355,20 +355,18 @@ pub fn list_toolchains(cfg: &Cfg) -> Result<()> {

 if toolchains.is_empty() {
 println!("no installed toolchains");
 } else if let Ok(Some(def_toolchain)) = cfg.find_default() {
 for toolchain in toolchains {
 let if_default = if def_toolchain.name() == &*toolchain {
 " (default)"
 } else {
 ""
 };
 println!("{}{}", &toolchain, if_default);
 }
 } else {
 if let Ok(Some(def_toolchain)) = cfg.find_default() {
 for toolchain in toolchains {
 let if_default = if def_toolchain.name() == &*toolchain {
 " (default)"
 } else {
 ""
 };
 println!("{}{}", &toolchain, if_default);
 }
 } else {
 for toolchain in toolchains {
 println!("{}", &toolchain);
 }
 for toolchain in toolchains {
 println!("{}", &toolchain);
 }
 }
 Ok(())
Expand Down

2 changes: 1 addition & 1 deletion
src/cli/download_tracker.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,7 @@ impl DownloadTracker {
 if self.displayed_progress {
 // Display the finished state
 self.display();
 let _ = writeln!(self.term.as_mut().unwrap(), "");
 let _ = writeln!(self.term.as_mut().unwrap());
 }
 self.prepare_for_new_download();
 }
Expand Down

10 changes: 5 additions & 5 deletions
src/cli/log.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ pub fn warn_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "warning: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn err_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -37,7 +37,7 @@ pub fn err_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "error: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn info_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -46,7 +46,7 @@ pub fn info_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "info: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn verbose_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -56,7 +56,7 @@ pub fn verbose_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "verbose: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn debug_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -67,6 +67,6 @@ pub fn debug_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "verbose: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
 }
}

4 changes: 2 additions & 2 deletions
src/cli/proxy_mode.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ pub fn main() -> Result<()> {
 .as_ref()
 .and_then(|a| a.file_name())
 .and_then(|a| a.to_str());
 let ref arg0 = arg0.ok_or(ErrorKind::NoExeName)?;
 let arg0 = arg0.ok_or(ErrorKind::NoExeName)?;

 // Check for a toolchain specifier.
 let arg1 = args.next();
Expand All@@ -41,7 +41,7 @@ pub fn main() -> Result<()> {

 let cfg = set_globals(false)?;
 cfg.check_metadata_version()?;
 direct_proxy(&cfg, arg0, toolchain, &cmd_args)?
 direct_proxy(&cfg, &arg0, toolchain, &cmd_args)?
 };

 process::exit(c)
Expand Down

70 changes: 34 additions & 36 deletions
src/cli/rustup_mode.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,11 +26,11 @@ fn handle_epipe(res: Result<()>) -> Result<()> {
pub fn main() -> Result<()> {
 crate::self_update::cleanup_self_updater()?;

 let ref matches = cli().get_matches();
 let matches = cli().get_matches();
 let verbose = matches.is_present("verbose");
 let ref cfg = common::set_globals(verbose)?;
 let cfg = &common::set_globals(verbose)?;

 if maybe_upgrade_data(cfg, matches)? {
 if maybe_upgrade_data(cfg, &matches)? {
 return Ok(());
 }

Expand DownExpand Up@@ -408,7 +408,7 @@ pub fn cli() -> App<'static, 'static> {
 )
 .args(
 &DOCS_DATA
 .into_iter()
 .iter()
 .map(|(name, help_msg, _)| Arg::with_name(name).long(name).help(help_msg))
 .collect::<Vec<_>>(),
 )
Expand All@@ -421,7 +421,7 @@ pub fn cli() -> App<'static, 'static> {
 .group(
 ArgGroup::with_name("page").args(
 &DOCS_DATA
 .into_iter()
 .iter()
 .map(|(name, _, _)| *name)
 .collect::<Vec<_>>(),
 ),
Expand DownExpand Up@@ -497,7 +497,7 @@ fn update_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {
 warn!("(partial) target triple specified instead of toolchain name");
 let installed_toolchains = cfg.list_toolchains()?;
 let default = cfg.find_default()?;
 let default_name = default.map(|t| t.name().to_string()).unwrap_or("".into());
 let default_name = default.map(|t| t.name().to_string()).unwrap_or_default();
 let mut candidates = vec![];
 for t in installed_toolchains {
 if t == default_name {
Expand DownExpand Up@@ -545,11 +545,11 @@ fn default_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {
 if let Some(triple) = PartialTargetTriple::from_str(name) {
 warn!("(partial) target triple specified instead of toolchain name");
 let default = cfg.find_default()?;
 let default_name = default.map(|t| t.name().to_string()).unwrap_or("".into());
 let default_name = default.map(|t| t.name().to_string()).unwrap_or_default();
 if let Ok(mut desc) = PartialToolchainDesc::from_str(&default_name) {
 desc.target = triple;
 let maybe_toolchain = format!("{}", desc);
 let ref toolchain = cfg.get_toolchain(maybe_toolchain.as_ref(), false)?;
 let toolchain = cfg.get_toolchain(maybe_toolchain.as_ref(), false)?;
 if toolchain.name() == default_name {
 warn!(
 "(partial) triple '{}' resolves to a toolchain that is already default",
Expand All@@ -569,9 +569,9 @@ fn default_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {

fn default_(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 if m.is_present("toolchain") {
 let ref toolchain = m.value_of("toolchain").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 default_bare_triple_check(cfg, toolchain)?;
 let ref toolchain = cfg.get_toolchain(toolchain, false)?;
 let toolchain = cfg.get_toolchain(toolchain, false)?;

 let status = if !toolchain.is_custom() {
 Some(toolchain.install_from_dist_if_not_installed()?)
Expand DownExpand Up@@ -634,7 +634,7 @@ fn update(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
}

fn run(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let ref toolchain = m.value_of("toolchain").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 let args = m.values_of("command").unwrap();
 let args: Vec<_> = args.collect();
 let cmd = cfg.create_command_for_toolchain(toolchain, m.is_present("install"), args[0])?;
Expand DownExpand Up@@ -669,9 +669,9 @@ fn show(cfg: &Cfg) -> Result<()> {
 writeln!(t)?;
 }

 let ref cwd = utils::current_dir()?;
 let cwd = utils::current_dir()?;
 let installed_toolchains = cfg.list_toolchains()?;
 let active_toolchain = cfg.find_override_toolchain_or_default(cwd);
 let active_toolchain = cfg.find_override_toolchain_or_default(&cwd);

 // active_toolchain will carry the reason we don't have one in its detail.
 let active_targets = if let Ok(ref at) = active_toolchain {
Expand DownExpand Up@@ -791,8 +791,8 @@ fn show(cfg: &Cfg) -> Result<()> {
}

fn show_active_toolchain(cfg: &Cfg) -> Result<()> {
 let ref cwd = utils::current_dir()?;
 if let Some((toolchain, reason)) = cfg.find_override_toolchain_or_default(cwd)? {
 let cwd = utils::current_dir()?;
 if let Some((toolchain, reason)) = cfg.find_override_toolchain_or_default(&cwd)? {
 if reason.is_some() {
 println!("{} ({})", toolchain.name(), reason.unwrap());
 } else {
Expand DownExpand Up@@ -895,18 +895,20 @@ fn explicit_or_dir_toolchain<'a>(cfg: &'a Cfg, m: &ArgMatches<'_>) -> Result<Too
 return Ok(toolchain);
 }

 let ref cwd = utils::current_dir()?;
 let (toolchain, _) = cfg.toolchain_for_dir(cwd)?;
 let cwd = utils::current_dir()?;
 let (toolchain, _) = cfg.toolchain_for_dir(&cwd)?;

 Ok(toolchain)
}

fn toolchain_link(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let ref toolchain = m.value_of("toolchain").expect("");
 let ref path = m.value_of("path").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 let path = m.value_of("path").expect("");
 let toolchain = cfg.get_toolchain(toolchain, true)?;

 Ok(toolchain.install_from_dir(Path::new(path), true)?)
 toolchain
 .install_from_dir(Path::new(path), true)
 .map_err(|e| e.into())
}

fn toolchain_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
Expand All@@ -918,7 +920,7 @@ fn toolchain_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
}

fn override_add(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let ref toolchain = m.value_of("toolchain").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 let toolchain = cfg.get_toolchain(toolchain, false)?;

 let status = if !toolchain.is_custom() {
Expand DownExpand Up@@ -957,12 +959,10 @@ fn override_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 info!("no nonexistent paths detected");
 }
 list
 } else if m.is_present("path") {
 vec![m.value_of("path").unwrap().to_string()]
 } else {
 if m.is_present("path") {
 vec![m.value_of("path").unwrap().to_string()]
 } else {
 vec![utils::current_dir()?.to_str().unwrap().to_string()]
 }
 vec![utils::current_dir()?.to_str().unwrap().to_string()]
 };

 for path in paths {
Expand All@@ -984,7 +984,7 @@ fn override_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 Ok(())
}

const DOCS_DATA: &[(&'static str, &'static str, &'static str,)] = &[
const DOCS_DATA: &[(&str, &str, &str,)] = &[
 // flags can be used to open specific documents, e.g. `rustup doc --nomicon`
 // tuple elements: document name used as flag, help message, document index path
 ("alloc", "The Rust core allocation and collections library", "alloc/index.html"),
Expand All@@ -1006,21 +1006,19 @@ const DOCS_DATA: &[(&'static str, &'static str, &'static str,)] = &[
fn doc(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let toolchain = explicit_or_dir_toolchain(cfg, m)?;

 let doc_url = if let Some((_, _, path)) = DOCS_DATA
 .into_iter()
 .find(|(name, _, _)| m.is_present(name))
 {
 path
 } else {
 "index.html"
 };
 let doc_url =
 if let Some((_, _, path)) = DOCS_DATA.iter().find(|(name, _, _)| m.is_present(name)) {
 path
 } else {
 "index.html"
 };

 if m.is_present("path") {
 let doc_path = toolchain.doc_path(doc_url)?;
 println!("{}", doc_path.display());
 Ok(())
 } else {
Ok(toolchain.open_docs(doc_url)?)
 toolchain.open_docs(doc_url).map_err(Into::into)
 }
}

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Fix most of clippy warnings by tesuji · Pull Request #1754 · rust-lang/rustup · GitHub
Skip to content
Fix most of clippy warnings#1754

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.

 Sign up for GitHub

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

kinnison
merged 1 commit into

from

Apr 14, 2019
 Merged


Fix most of clippy warnings
#1754
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 6 additions & 6 deletions
download/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,7 +266,7 @@ pub mod reqwest_be {

 if !res.status().is_success() {
 let code: u16 = res.status().into();
 return Err(ErrorKind::HttpStatus(code as u32).into());
 return Err(ErrorKind::HttpStatus(u32::from(code)).into());
 }

 let buffer_size = 0x10000;
Expand DownExpand Up@@ -345,13 +345,13 @@ pub mod reqwest_be {
 return Err(ErrorKind::FileNotFound.into());
 }

 let ref mut f = fs::File::open(src).chain_err(|| "unable to open downloaded file")?;
 io::Seek::seek(f, io::SeekFrom::Start(resume_from))?;
 let mut f = fs::File::open(src).chain_err(|| "unable to open downloaded file")?;
 io::Seek::seek(&mut f, io::SeekFrom::Start(resume_from))?;

 let ref mut buffer = vec![0u8; 0x10000];
 let mut buffer = vec![0u8; 0x10000];
 loop {
 let bytes_read =
io::Read::read(f, buffer).chain_err(|| "unable to read downloaded file")?;
 let bytes_read = io::Read::read(&mut f, &mut buffer)
 .chain_err(|| "unable to read downloaded file")?;
 if bytes_read == 0 {
 break;
 }
Expand Down

32 changes: 15 additions & 17 deletions
src/cli/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ pub fn read_line() -> Result<String> {
 lines
 .next()
 .and_then(|l| l.ok())
 .ok_or("unable to read from stdin for confirmation".into())
 .ok_or_else(|| "unable to read from stdin for confirmation".into())
}

pub fn set_globals(verbose: bool) -> Result<Cfg> {
Expand DownExpand Up@@ -146,8 +146,8 @@ fn show_channel_updates(
 toolchains: Vec<(String, rustup::Result<UpdateStatus>)>,
) -> Result<()> {
 let data = toolchains.into_iter().map(|(name, result)| {
 let ref toolchain = cfg.get_toolchain(&name, false).expect("");
 let version = rustc_version(toolchain);
 let toolchain = cfg.get_toolchain(&name, false).expect("");
 let version = rustc_version(&toolchain);

 let banner;
 let color;
Expand DownExpand Up@@ -195,7 +195,7 @@ fn show_channel_updates(
 let _ = t.reset();
 let _ = writeln!(t, " - {}", version);
 }
 let _ = writeln!(t, "");
 let _ = writeln!(t);

 Ok(())
}
Expand DownExpand Up@@ -355,20 +355,18 @@ pub fn list_toolchains(cfg: &Cfg) -> Result<()> {

 if toolchains.is_empty() {
 println!("no installed toolchains");
 } else if let Ok(Some(def_toolchain)) = cfg.find_default() {
 for toolchain in toolchains {
 let if_default = if def_toolchain.name() == &*toolchain {
 " (default)"
 } else {
 ""
 };
 println!("{}{}", &toolchain, if_default);
 }
 } else {
 if let Ok(Some(def_toolchain)) = cfg.find_default() {
 for toolchain in toolchains {
 let if_default = if def_toolchain.name() == &*toolchain {
 " (default)"
 } else {
 ""
 };
 println!("{}{}", &toolchain, if_default);
 }
 } else {
 for toolchain in toolchains {
 println!("{}", &toolchain);
 }
 for toolchain in toolchains {
 println!("{}", &toolchain);
 }
 }
 Ok(())
Expand Down

2 changes: 1 addition & 1 deletion
src/cli/download_tracker.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -105,7 +105,7 @@ impl DownloadTracker {
 if self.displayed_progress {
 // Display the finished state
 self.display();
 let _ = writeln!(self.term.as_mut().unwrap(), "");
 let _ = writeln!(self.term.as_mut().unwrap());
 }
 self.prepare_for_new_download();
 }
Expand Down

10 changes: 5 additions & 5 deletions
src/cli/log.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ pub fn warn_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "warning: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn err_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -37,7 +37,7 @@ pub fn err_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "error: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn info_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -46,7 +46,7 @@ pub fn info_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "info: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn verbose_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -56,7 +56,7 @@ pub fn verbose_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "verbose: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
}

pub fn debug_fmt(args: fmt::Arguments<'_>) {
Expand All@@ -67,6 +67,6 @@ pub fn debug_fmt(args: fmt::Arguments<'_>) {
 let _ = write!(t, "verbose: ");
 let _ = t.reset();
 let _ = t.write_fmt(args);
 let _ = write!(t, "\n");
 let _ = writeln!(t);
 }
}

4 changes: 2 additions & 2 deletions
src/cli/proxy_mode.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ pub fn main() -> Result<()> {
 .as_ref()
 .and_then(|a| a.file_name())
 .and_then(|a| a.to_str());
 let ref arg0 = arg0.ok_or(ErrorKind::NoExeName)?;
 let arg0 = arg0.ok_or(ErrorKind::NoExeName)?;

 // Check for a toolchain specifier.
 let arg1 = args.next();
Expand All@@ -41,7 +41,7 @@ pub fn main() -> Result<()> {

 let cfg = set_globals(false)?;
 cfg.check_metadata_version()?;
 direct_proxy(&cfg, arg0, toolchain, &cmd_args)?
 direct_proxy(&cfg, &arg0, toolchain, &cmd_args)?
 };

 process::exit(c)
Expand Down

70 changes: 34 additions & 36 deletions
src/cli/rustup_mode.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,11 +26,11 @@ fn handle_epipe(res: Result<()>) -> Result<()> {
pub fn main() -> Result<()> {
 crate::self_update::cleanup_self_updater()?;

 let ref matches = cli().get_matches();
 let matches = cli().get_matches();
 let verbose = matches.is_present("verbose");
 let ref cfg = common::set_globals(verbose)?;
 let cfg = &common::set_globals(verbose)?;

 if maybe_upgrade_data(cfg, matches)? {
 if maybe_upgrade_data(cfg, &matches)? {
 return Ok(());
 }

Expand DownExpand Up@@ -408,7 +408,7 @@ pub fn cli() -> App<'static, 'static> {
 )
 .args(
 &DOCS_DATA
 .into_iter()
 .iter()
 .map(|(name, help_msg, _)| Arg::with_name(name).long(name).help(help_msg))
 .collect::<Vec<_>>(),
 )
Expand All@@ -421,7 +421,7 @@ pub fn cli() -> App<'static, 'static> {
 .group(
 ArgGroup::with_name("page").args(
 &DOCS_DATA
 .into_iter()
 .iter()
 .map(|(name, _, _)| *name)
 .collect::<Vec<_>>(),
 ),
Expand DownExpand Up@@ -497,7 +497,7 @@ fn update_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {
 warn!("(partial) target triple specified instead of toolchain name");
 let installed_toolchains = cfg.list_toolchains()?;
 let default = cfg.find_default()?;
 let default_name = default.map(|t| t.name().to_string()).unwrap_or("".into());
 let default_name = default.map(|t| t.name().to_string()).unwrap_or_default();
 let mut candidates = vec![];
 for t in installed_toolchains {
 if t == default_name {
Expand DownExpand Up@@ -545,11 +545,11 @@ fn default_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {
 if let Some(triple) = PartialTargetTriple::from_str(name) {
 warn!("(partial) target triple specified instead of toolchain name");
 let default = cfg.find_default()?;
 let default_name = default.map(|t| t.name().to_string()).unwrap_or("".into());
 let default_name = default.map(|t| t.name().to_string()).unwrap_or_default();
 if let Ok(mut desc) = PartialToolchainDesc::from_str(&default_name) {
 desc.target = triple;
 let maybe_toolchain = format!("{}", desc);
 let ref toolchain = cfg.get_toolchain(maybe_toolchain.as_ref(), false)?;
 let toolchain = cfg.get_toolchain(maybe_toolchain.as_ref(), false)?;
 if toolchain.name() == default_name {
 warn!(
 "(partial) triple '{}' resolves to a toolchain that is already default",
Expand All@@ -569,9 +569,9 @@ fn default_bare_triple_check(cfg: &Cfg, name: &str) -> Result<()> {

fn default_(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 if m.is_present("toolchain") {
 let ref toolchain = m.value_of("toolchain").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 default_bare_triple_check(cfg, toolchain)?;
 let ref toolchain = cfg.get_toolchain(toolchain, false)?;
 let toolchain = cfg.get_toolchain(toolchain, false)?;

 let status = if !toolchain.is_custom() {
 Some(toolchain.install_from_dist_if_not_installed()?)
Expand DownExpand Up@@ -634,7 +634,7 @@ fn update(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
}

fn run(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let ref toolchain = m.value_of("toolchain").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 let args = m.values_of("command").unwrap();
 let args: Vec<_> = args.collect();
 let cmd = cfg.create_command_for_toolchain(toolchain, m.is_present("install"), args[0])?;
Expand DownExpand Up@@ -669,9 +669,9 @@ fn show(cfg: &Cfg) -> Result<()> {
 writeln!(t)?;
 }

 let ref cwd = utils::current_dir()?;
 let cwd = utils::current_dir()?;
 let installed_toolchains = cfg.list_toolchains()?;
 let active_toolchain = cfg.find_override_toolchain_or_default(cwd);
 let active_toolchain = cfg.find_override_toolchain_or_default(&cwd);

 // active_toolchain will carry the reason we don't have one in its detail.
 let active_targets = if let Ok(ref at) = active_toolchain {
Expand DownExpand Up@@ -791,8 +791,8 @@ fn show(cfg: &Cfg) -> Result<()> {
}

fn show_active_toolchain(cfg: &Cfg) -> Result<()> {
 let ref cwd = utils::current_dir()?;
 if let Some((toolchain, reason)) = cfg.find_override_toolchain_or_default(cwd)? {
 let cwd = utils::current_dir()?;
 if let Some((toolchain, reason)) = cfg.find_override_toolchain_or_default(&cwd)? {
 if reason.is_some() {
 println!("{} ({})", toolchain.name(), reason.unwrap());
 } else {
Expand DownExpand Up@@ -895,18 +895,20 @@ fn explicit_or_dir_toolchain<'a>(cfg: &'a Cfg, m: &ArgMatches<'_>) -> Result<Too
 return Ok(toolchain);
 }

 let ref cwd = utils::current_dir()?;
 let (toolchain, _) = cfg.toolchain_for_dir(cwd)?;
 let cwd = utils::current_dir()?;
 let (toolchain, _) = cfg.toolchain_for_dir(&cwd)?;

 Ok(toolchain)
}

fn toolchain_link(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let ref toolchain = m.value_of("toolchain").expect("");
 let ref path = m.value_of("path").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 let path = m.value_of("path").expect("");
 let toolchain = cfg.get_toolchain(toolchain, true)?;

 Ok(toolchain.install_from_dir(Path::new(path), true)?)
 toolchain
 .install_from_dir(Path::new(path), true)
 .map_err(|e| e.into())
}

fn toolchain_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
Expand All@@ -918,7 +920,7 @@ fn toolchain_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
}

fn override_add(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let ref toolchain = m.value_of("toolchain").expect("");
 let toolchain = m.value_of("toolchain").expect("");
 let toolchain = cfg.get_toolchain(toolchain, false)?;

 let status = if !toolchain.is_custom() {
Expand DownExpand Up@@ -957,12 +959,10 @@ fn override_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 info!("no nonexistent paths detected");
 }
 list
 } else if m.is_present("path") {
 vec![m.value_of("path").unwrap().to_string()]
 } else {
 if m.is_present("path") {
 vec![m.value_of("path").unwrap().to_string()]
 } else {
 vec![utils::current_dir()?.to_str().unwrap().to_string()]
 }
 vec![utils::current_dir()?.to_str().unwrap().to_string()]
 };

 for path in paths {
Expand All@@ -984,7 +984,7 @@ fn override_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 Ok(())
}

const DOCS_DATA: &[(&'static str, &'static str, &'static str,)] = &[
const DOCS_DATA: &[(&str, &str, &str,)] = &[
 // flags can be used to open specific documents, e.g. `rustup doc --nomicon`
 // tuple elements: document name used as flag, help message, document index path
 ("alloc", "The Rust core allocation and collections library", "alloc/index.html"),
Expand All@@ -1006,21 +1006,19 @@ const DOCS_DATA: &[(&'static str, &'static str, &'static str,)] = &[
fn doc(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 let toolchain = explicit_or_dir_toolchain(cfg, m)?;

 let doc_url = if let Some((_, _, path)) = DOCS_DATA
 .into_iter()
 .find(|(name, _, _)| m.is_present(name))
 {
 path
 } else {
 "index.html"
 };
 let doc_url =
 if let Some((_, _, path)) = DOCS_DATA.iter().find(|(name, _, _)| m.is_present(name)) {
 path
 } else {
 "index.html"
 };

 if m.is_present("path") {
 let doc_path = toolchain.doc_path(doc_url)?;
 println!("{}", doc_path.display());
 Ok(())
 } else {
Ok(toolchain.open_docs(doc_url)?)
 toolchain.open_docs(doc_url).map_err(Into::into)
 }
}

Expand Down
Loading