Skip to content

Commit

Permalink
Auto merge of #28938 - GlenDC:master, r=Manishearth
Browse files Browse the repository at this point in the history
Here is my attempt to resolve issue #28822, @Manishearth.
Please let me know if it's fine. And if not, what should I do instead?

This issue felt like quite a good start for some rust contributions. It allows me to get used to the workflow  and codebase of rust in an easy-to-swallow manner. Are there any other issues you would recommend me to look at? :) Would love to do some more stuff!
  • Loading branch information
bors committed Oct 10, 2015
2 parents 8091cb1 + 5554636 commit e6abcbc
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/librustc/middle/check_const.rs
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ impl<'a, 'tcx> CheckCrateVisitor<'a, 'tcx> {
for arg in &fd.inputs {
match arg.pat.node {
hir::PatIdent(hir::BindByValue(hir::MutImmutable), _, None) => {}
hir::PatWild(_) => {}
_ => {
span_err!(self.tcx.sess, arg.pat.span, E0022,
"arguments of constant functions can only \
Expand Down
16 changes: 16 additions & 0 deletions src/test/run-pass/issue-28822.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(const_fn)]

fn main() {}

const fn size_ofs(_: usize) {}
const fn size_ofs2(_foo: usize) {}

0 comments on commit e6abcbc

Please sign in to comment.